修改接收方法

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/returns/KylinOrderListVo.java

@@ -45,6 +45,8 @@ public class KylinOrderListVo implements Serializable, Cloneable {
     private Integer expressStatus;
     @ApiModelProperty(value = "取票方式", example = "")
     private String getTicketType;
+    @ApiModelProperty(value = "转赠状态")
+    private Integer transferStatus;
     @ApiModelProperty(value = "创建时间", example = "")
     private String createdAt;
 
@@ -58,6 +60,28 @@ public class KylinOrderListVo implements Serializable, Cloneable {
         }
     }
 
+    public void setStatus(Integer status) {
+        if(status.equals(1) && transferStatus!=null) {
+            if (this.transferStatus.equals(1)) {
+                this.status = 11;
+            } else if (this.transferStatus.equals(2)) {
+                this.status = 12;
+            } else if (this.transferStatus.equals(3)) {
+                this.status = 13;
+            } else if (this.transferStatus.equals(4)) {
+                this.status = 14;
+            } else if (this.transferStatus.equals(5)) {
+                this.status = 15;
+            } else if (this.transferStatus.equals(6)) {
+                this.status = 16;
+            } else {
+                this.status = status;
+            }
+        }else{
+            this.status = status;
+        }
+    }
+
     public KylinOrderListVo copy(KylinOrderTicketVo vo) {
         if (null == vo) return this;
 

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/utils/DataUtils.java

@@ -120,6 +120,9 @@ public class DataUtils {
             List<KylinOrderListVo> voList = mongoTemplate.find(Query.query(Criteria.where("userId").is(userId))
                             .with(Sort.by(Sort.Direction.DESC, "createdAt")).limit(40),
                     KylinOrderListVo.class, KylinOrderTicketVo.class.getSimpleName());
+            for (KylinOrderListVo item : voList){
+                item.setStatus(item.getStatus());
+            }
             redisUtil.set(KylinRedisConst.ORDER_LIST + userId, voList);
         }
         return (List<KylinOrderListVo>) redisUtil.get(KylinRedisConst.ORDER_LIST + userId);

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/KylinOrderTicketsServiceImpl.java

@@ -73,7 +73,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
             List<KylinOrderListVo> voList = dataUtils.getOrderList(uid);
             for (int i = 0; i < voList.size(); i++) {
                 KylinOrderListVo item = voList.get(i);
-
+                item.setStatus(item.getStatus());
                 Integer orderExpressStatus = dataUtils.getOrderExpressInfo(item.getOrderTicketsId());
                 item.setExpressStatus(orderExpressStatus);
 
@@ -727,7 +727,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
             mongoTemplate.getCollection(KylinOrderTicketVo.class.getSimpleName()).updateOne(
                     Query.query(Criteria.where("orderTicketsId").is(orderTicketVo.getOrderTicketsId())).getQueryObject(),
                     new Document("$set", new Document("transferStatus", orderTicketVo.getTransferStatus())
-                            .append("transferUid", transferUid).append("transferTime", transferTime).append("updatedAt", now))
+                            .append("transferUid", transferUid).append("transferTime", transferTime).append("updatedAt", DateUtil.Formatter.yyyyMMddHHmmss.format(now)))
             );
             //修改被转赠订单 mysql
             sqls.add(SqlMapping.get("kylin_order_ticket_status.transfer.update"));
@@ -782,7 +782,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
             //修改被转赠订单 mongo
             mongoTemplate.getCollection(KylinOrderTicketVo.class.getSimpleName()).updateOne(
                     Query.query(Criteria.where("orderTicketsId").is(orderTicketVo.getOrderTicketsId())).getQueryObject(),
-                    new Document("$set", new Document("transferStatus", orderTicketVo.getTransferStatus()).append("updatedAt", now))
+                    new Document("$set", new Document("transferStatus", orderTicketVo.getTransferStatus()).append("updatedAt", DateUtil.Formatter.yyyyMMddHHmmss.format(now)))
             );
             //修改被转赠订单 mysql
             sqls.add(SqlMapping.get("kylin_order_ticket_status.transfer.update"));
@@ -1016,17 +1016,36 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
             sqls.add(SqlMapping.get("kylin_order_ticket.add"));
             LinkedList<Object[]> sqlsDataA = CollectionUtil.linkedListObjectArr();
             sqlsDataA.add(orderTickets.getAddObject());
+            //删除被转赠订单独立redis
+            dataUtils.delTransferOrder(uid);
             // 生成vo
+            orderTicketVo.setTransferStatus(3);
             orderTicketVo.setCreatedAt(orderTickets.getCreatedAt().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
             orderTicketVo.setChangeDate(orderTickets.getCreatedAt());
-            mongoTemplate.insert(orderTicketVo, KylinOrderTicketVo.class.getSimpleName());
             orderUtils.resetOrderListVo(uid, 1, orderTicketVo.getOrderTicketsId(), orderTicketVo);
+            mongoTemplate.insert(orderTicketVo, KylinOrderTicketVo.class.getSimpleName());
 
-            //删除被转赠订单独立redis
-            dataUtils.delTransferOrder(uid);
+            //原来vo
+            KylinOrderTicketVo orderTicketVoTransfer = dataUtils.getOrderTicketVo(orderTicketVo.getTransferId());
+            orderTicketVoTransfer.setTransferStatus(2);
+            orderTicketVoTransfer.setChangeDate(now);
+            orderTicketVoTransfer.setUpdatedAt(DateUtil.Formatter.yyyyMMddHHmmss.format(now));
+            dataUtils.setOrderTicketVo(orderTicketVoTransfer.getOrderTicketsId(), orderTicketVoTransfer);
+            orderUtils.resetOrderListVo(orderTicketVoTransfer.getTransferUid(), 2, orderTicketVoTransfer.getOrderTicketsId(), orderTicketVoTransfer);
+            //原订单mongo
+            mongoTemplate.getCollection(KylinOrderTicketVo.class.getSimpleName()).updateOne(
+                    Query.query(Criteria.where("orderTicketsId").is(orderTicketVoTransfer.getOrderTicketsId())).getQueryObject(),
+                    new Document("$set", new Document("transferStatus", orderTicketVoTransfer.getTransferStatus()).append("updatedAt", DateUtil.Formatter.yyyyMMddHHmmss.format(now)))
+            );
+            //sql
+            sqls.add(SqlMapping.get("kylin_order_ticket_status.transfer.update"));
+            LinkedList<Object[]> sqlsDataA2 = CollectionUtil.linkedListObjectArr();
+            sqlsDataA2.add(new Object[]{
+                    orderTicketVoTransfer.getTransferStatus(), now, orderTicketVoTransfer.getOrderTicketsId(), now, now
+            });
 
             // 执行sql
-            String sqlData = SqlMapping.gets(sqls, sqlsDataE, sqlsDataB, sqlsDataC, sqlsDataD, sqlsDataA);
+            String sqlData = SqlMapping.gets(sqls, sqlsDataE, sqlsDataB, sqlsDataC, sqlsDataD, sqlsDataA, sqlsDataA2);
             queueUtils.sendMsgByRedis(MQConst.KylinQueue.SQL_TRANSFER_RESULT.getKey(),
                     sqlData);
             log.info(UserPathDto.setData("接收转赠订单", enterIdList, "SUCCESS"));
@@ -1062,7 +1081,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
             //修改被转赠订单 mongo
             mongoTemplate.getCollection(KylinOrderTicketVo.class.getSimpleName()).updateOne(
                     Query.query(Criteria.where("orderTicketsId").is(orderTicketVoTransfer.getOrderTicketsId())).getQueryObject(),
-                    new Document("$set", new Document("transferStatus", orderTicketVoTransfer.getTransferStatus()).append("updatedAt", now))
+                    new Document("$set", new Document("transferStatus", orderTicketVoTransfer.getTransferStatus()).append("updatedAt", DateUtil.Formatter.yyyyMMddHHmmss.format(now)))
             );
             //修改被转赠订单 mysql
             sqls.add(SqlMapping.get("kylin_order_ticket_status.transfer.update"));
@@ -1110,7 +1129,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
         //mongo
         mongoTemplate.getCollection(KylinOrderTicketVo.class.getSimpleName()).updateOne(
                 Query.query(Criteria.where("orderTicketsId").is(orderId)).getQueryObject(),
-                new Document("$set", new Document("transferStatus", vo.getTransferStatus()).append("updatedAt", now))
+                new Document("$set", new Document("transferStatus", vo.getTransferStatus()).append("updatedAt", DateUtil.Formatter.yyyyMMddHHmmss.format(now)))
         );
         //mysql
         sqls.add(SqlMapping.get("kylin_order_ticket_status.transfer.update"));
@@ -1132,7 +1151,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
         //mongo
         mongoTemplate.getCollection(KylinOrderTicketVo.class.getSimpleName()).updateOne(
                 Query.query(Criteria.where("orderTicketsId").is(vo2.getOrderTicketsId())).getQueryObject(),
-                new Document("$set", new Document("transferStatus", vo2.getTransferStatus()).append("updatedAt", now))
+                new Document("$set", new Document("transferStatus", vo2.getTransferStatus()).append("updatedAt", DateUtil.Formatter.yyyyMMddHHmmss.format(now)))
         );
         //mysql
         sqls.add(SqlMapping.get("kylin_order_ticket_status.transfer.update"));

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/utils/DataUtils.java

@@ -111,13 +111,15 @@ public class DataUtils {
 
     public List<KylinOrderListVo> getOrderList(String userId) {
         Object obj = redisUtil.get(KylinRedisConst.ORDER_LIST + userId);
-        ;
         if (obj != null) {
             return (List<KylinOrderListVo>) obj;
         } else {
             List<KylinOrderListVo> voList = mongoTemplate.find(Query.query(Criteria.where("userId").is(userId))
                             .with(Sort.by(Sort.Direction.DESC, "createdAt")).limit(40),
                     KylinOrderListVo.class, KylinOrderTicketVo.class.getSimpleName());
+            for (KylinOrderListVo item : voList){
+                item.setStatus(item.getStatus());
+            }
             redisUtil.set(KylinRedisConst.ORDER_LIST + userId, voList);
             return voList;
         }

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/utils/OrderUtils.java

@@ -179,7 +179,7 @@ public class OrderUtils {
 
 
     public List<AdamEntersVo> getEnters(String entersIds, String uid){
-        String returnVo = HttpUtil.get(adamUrl+"/adam/rsc/inquire/enters?entersIds="+entersIds+"&uid="+uid,null);
+        String returnVo = HttpUtil.get("https://testadam.zhengzai.tv"+"/adam/rsc/inquire/enters?entersIds="+entersIds+"&uid="+uid,null);
         ResponseDto<List<AdamEntersVo>> ResponseVo = JsonUtils.fromJson(returnVo, new TypeReference<ResponseDto<List<AdamEntersVo>>>() {
         });
         return ResponseVo.getData();

liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/utils/DataUtils.java

@@ -60,6 +60,9 @@ public class DataUtils {
             List<KylinOrderListVo> voList = mongoTemplate.find(Query.query(Criteria.where("userId").is(userId))
                             .with(Sort.by(Sort.Direction.DESC, "createdAt")).limit(40),
                     KylinOrderListVo.class, KylinOrderTicketVo.class.getSimpleName());
+            for (KylinOrderListVo item : voList){
+                item.setStatus(item.getStatus());
+            }
             redisUtil.set(KylinRedisConst.ORDER_LIST + userId, voList);
             return voList;
         }

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/utils/DataUtils.java

@@ -149,6 +149,9 @@ public class DataUtils {
             List<KylinOrderListVo> voList = mongoTemplate.find(Query.query(Criteria.where("userId").is(userId))
                             .with(Sort.by(Sort.Direction.DESC, "createdAt")).limit(40),
                     KylinOrderListVo.class, KylinOrderTicketVo.class.getSimpleName());
+            for (KylinOrderListVo item : voList){
+                item.setStatus(item.getStatus());
+            }
             redisUtil.set(KylinRedisConst.ORDER_LIST + userId, voList);
             return voList;
         }