转赠 除了定时任务 测试完成

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/mongo/KylinPerformanceVo.java

@@ -116,6 +116,10 @@ public class KylinPerformanceVo {
     private String transferStartTime;
     private String transferEndTime;
 
+    private Integer isRefundPoundage;
+    private Integer isRefundVoucher;
+    private Integer isRefundExpress;
+
     public void setPerformance(KylinPerformances performance) {
         this.mid = performance.getMid();
         this.performancesId = performance.getPerformancesId();

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

@@ -79,17 +79,13 @@ public class KylinOrderListVo implements Serializable, Cloneable {
         this.restTime = 0L;
         if (vo.getTransferStatus().equals(1)) {
             this.status = 11;
-        }
-        if (vo.getTransferStatus().equals(2)) {
+        } else if (vo.getTransferStatus().equals(2)) {
             this.status = 12;
-        }
-        if (vo.getTransferStatus().equals(3)) {
+        } else if (vo.getTransferStatus().equals(3)) {
             this.status = 13;
-        }
-        if (vo.getTransferStatus().equals(4)) {
+        } else if (vo.getTransferStatus().equals(4)) {
             this.status = 14;
-        }
-        if (vo.getTransferStatus().equals(5)) {
+        } else if (vo.getTransferStatus().equals(5)) {
             this.status = 15;
         } else if (vo.getTransferStatus().equals(6)) {
             this.status = 16;

liquidnet-bus-config/liquidnet-config/liquidnet-service-kylin-dev.yml

@@ -25,4 +25,4 @@ liquidnet:
     check: ${liquidnet.service.kylin.url-pay.check}
     localUrl: ${liquidnet.service.kylin.url-pay.localUrl}
   adam:
-    url:${liquidnet.service.adam.url}
+    url: ${liquidnet.service.adam.url}

liquidnet-bus-config/liquidnet-config/liquidnet-service-kylin-test.yml

@@ -25,4 +25,4 @@ liquidnet:
     check: ${liquidnet.service.kylin.url-pay.check}
     localUrl: ${liquidnet.service.kylin.url-pay.localUrl}
   adam:
-    url:${liquidnet.service.adam.url}
+    url: ${liquidnet.service.adam.url}
\ No newline at end of file

liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-kylin/src/main/java/com/liquidnet/service/consumer/kylin/receiver/AbstractOptOrderTransferOverTimeRedisReceiver.java

@@ -52,15 +52,19 @@ public abstract class AbstractOptOrderTransferOverTimeRedisReceiver implements S
         boolean aBoolean = false;
         try {
             OrderCloseMapping.orderCloseMessage mqMessage = JsonUtils.fromJson(msg, OrderCloseMapping.orderCloseMessage.class);
-            for (int x = 0; x < mqMessage.getOrderTicketIds().size(); x++) {
-                String orderTicketId = mqMessage.getOrderTicketIds().get(x);
-                KylinOrderTicketVo vo = kylinUtils.getOrderTicketVo(orderTicketId);
-                String uid = vo.getUserId();
-                vo.setTransferUid("");
-                vo.setTransferStatus(0);
-                redisUtil.del(KylinRedisConst.ORDER_TRANSFER.concat(uid));
-                redisUtil.set("kylin:order:id:" + orderTicketId, vo);
-                kylinUtils.resetOrderListVo(uid, 2, orderTicketId, vo);
+            if (mqMessage == null) {
+
+            } else {
+                for (int x = 0; x < mqMessage.getOrderTicketIds().size(); x++) {
+                    String orderTicketId = mqMessage.getOrderTicketIds().get(x);
+                    KylinOrderTicketVo vo = kylinUtils.getOrderTicketVo(orderTicketId);
+                    String uid = vo.getUserId();
+                    vo.setTransferUid("");
+                    vo.setTransferStatus(0);
+                    redisUtil.del(KylinRedisConst.ORDER_TRANSFER.concat(uid));
+                    redisUtil.set("kylin:order:id:" + orderTicketId, vo);
+                    kylinUtils.resetOrderListVo(uid, 2, orderTicketId, vo);
+                }
             }
             aBoolean = true;
         } catch (Exception e) {

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

@@ -161,6 +161,16 @@ public class KylinOrderTicketsController {
         return orderTicketsService.orderTransferWithdraw(orderId);
     }
 
+    @PostMapping("transferAccept")
+    @ApiOperation("转赠订单接收")
+    @ApiResponse(code = 200, message = "接口返回对象参数")
+    @ApiImplicitParams({
+            @ApiImplicitParam(type = "form", required = false, dataType = "String", name = "enterIdList", value = "逗号隔开的入场人id"),
+    })
+    public ResponseDto<String> orderTransferAccept(@RequestParam(required = false) String enterIdList) {
+        return orderTicketsService.orderTransferAccept(enterIdList);
+    }
+
     @PostMapping("transferReject")
     @ApiOperation("转赠订单拒收")
     @ApiResponse(code = 200, message = "接口返回对象参数")

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

@@ -98,7 +98,9 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
             }
 
             KylinOrderTicketVo orderTicketVo = dataUtils.getTransferOrder(uid);
-            voList.add(0, KylinOrderListVo.getNew().copy(orderTicketVo));
+            if (orderTicketVo != null) {
+                voList.add(0, KylinOrderListVo.getNew().copy(orderTicketVo));
+            }
 
             mPageInfo = new PageInfo(voList);
             mPageInfo.setTotal(voList.size());
@@ -194,7 +196,6 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
                 } else {
                     vo.setRestTime(0L);
                 }
-                currentTime = System.currentTimeMillis() - currentTime;
 
                 Integer orderExpressStatus = dataUtils.getOrderExpressInfo(orderTicketVo.getOrderTicketsId());
                 vo.setExpressStatus(orderExpressStatus);
@@ -726,7 +727,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
 
             //生成被转赠订单独立redis
             orderTicketVo.setOrderTicketsId(IDGenerator.nextSnowId());
-            orderTicketVo.setTransferId(orderTicketVo.getOrderTicketsId());
+            orderTicketVo.setTransferId(orderId);
             orderTicketVo.setTransferStatus(4);
             orderTicketVo.setUserId(transferUid);
             orderTicketVo.setUserMobile(transferMobile);
@@ -792,7 +793,13 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
     @Override
     public ResponseDto<String> orderTransferAccept(String enterIdList) {
         String uid = CurrentUtil.getCurrentUid();
-        Integer enterSize = enterIdList.split(",").length;
+        Integer enterSize;
+        if (enterIdList == null || enterIdList.equals("")) {
+            enterSize = 0;
+            enterIdList="";
+        } else {
+            enterSize = enterIdList.split(",").length;
+        }
         KylinOrderTicketVo orderTicketVo = dataUtils.getTransferOrder(uid);
         LocalDateTime now = LocalDateTime.now();
         if (orderTicketVo != null) {
@@ -888,7 +895,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
             orderTickets.setPrice(orderTicketVo.getPrice());
             orderTickets.setPriceMember(orderTicketVo.getPriceMember());
             orderTickets.setPriceTotal(orderTicketVo.getPriceTotal());
-            orderTickets.setPriceActual(orderTickets.getPriceActual());
+            orderTickets.setPriceActual(orderTickets.getPriceActual()==null?BigDecimal.ZERO:orderTickets.getPriceActual());
             orderTickets.setPriceVoucher(orderTicketVo.getPriceVoucher());
             orderTickets.setPriceExpress(orderTicketVo.getPriceExpress());
             orderTickets.setPriceRefund(orderTicketVo.getPriceRefund());
@@ -996,6 +1003,9 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
             mongoTemplate.insert(orderTicketVo, KylinOrderTicketVo.class.getSimpleName());
             orderUtils.resetOrderListVo(uid, 1, orderTicketVo.getOrderTicketsId(), orderTicketVo);
 
+            //删除被转赠订单独立redis
+            dataUtils.delTransferOrder(uid);
+
             // 执行sql
             String sqlData = SqlMapping.gets(sqls, sqlsDataE, sqlsDataB, sqlsDataC, sqlsDataD, sqlsDataA);
             queueUtils.sendMsgByRedis(MQConst.KylinQueue.SQL_TRANSFER_RESULT.getKey(),
@@ -1075,25 +1085,24 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
 
         //修改 自己的订单 vo
         //redis
-        vo.setOrderTicketsId(IDGenerator.nextSnowId());
         vo.setTransferStatus(6);
-        dataUtils.setTransferOrder(vo.getUserId(), vo);
-        orderUtils.resetOrderListVo(vo.getUserId(), 2, vo.getOrderTicketsId(), vo);
+        dataUtils.setOrderTicketVo(orderId, vo);
+        orderUtils.resetOrderListVo(vo.getUserId(), 2,orderId, vo);
         //mongo
         mongoTemplate.getCollection(KylinOrderTicketVo.class.getSimpleName()).updateOne(
-                Query.query(Criteria.where("orderTicketsId").is(vo.getOrderTicketsId())).getQueryObject(),
+                Query.query(Criteria.where("orderTicketsId").is(orderId)).getQueryObject(),
                 new Document("$set", new Document("transferStatus", vo.getTransferStatus()).append("updatedAt", now))
         );
         //mysql
         sqls.add(SqlMapping.get("kylin_order_ticket_status.transfer.update"));
         LinkedList<Object[]> sqlsDataA = CollectionUtil.linkedListObjectArr();
         sqlsDataA.add(new Object[]{
-                vo.getTransferStatus(), now, vo.getOrderTicketsId(), now, now
+                vo.getTransferStatus(), now, orderId, now, now
         });
         sqls.add(SqlMapping.get("kylin_order_ticket_relation.transfer.update"));
         LinkedList<Object[]> sqlsDataB = CollectionUtil.linkedListObjectArr();
         sqlsDataB.add(new Object[]{
-                vo.getTransferUid(), vo.getTransferId(), now, vo.getOrderTicketsId(), now, now
+                vo.getTransferUid(), vo.getTransferId(), now, orderId, now, now
         });
 
         //修改 回退订单 vo2

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

@@ -24,7 +24,7 @@ public class OrderUtils {
     @Autowired
     private DataUtils dataUtils;
     @Value("${liquidnet.adam.url}")
-    private DataUtils adamUrl;
+    private String adamUrl;
 
 
     public String judgeOrderLimit(

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/resources/sqlmap.properties

@@ -47,6 +47,6 @@ kylin_order_refund_entities.overtimeRefund=INSERT INTO kylin_order_refund_entiti
 # ------------------------用户转赠相关接口----------------------------
 kylin_order_task.insert = INSERT INTO `kylin_order_task`(`order_id` , `status` , `created_at`) VALUES (? ,? ,?);
 kylin_order_task.delete = DELETE FROM kylin_order_task WHERE order_id = ?;
-kylin_order_ticket_status.transfer.update = UPDATE kylin_order_tickets SET transfer_status = ? ,updated_at = ?  WHERE order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
-kylin_order_ticket_relation.transfer.update = UPDATE kylin_order_tickets SET transfer_uid = ?, transfer_id = ? ,updated_at = ?  WHERE order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
+kylin_order_ticket_status.transfer.update = UPDATE kylin_order_ticket_status SET transfer_status = ? ,updated_at = ?  WHERE order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
+kylin_order_ticket_relation.transfer.update = UPDATE kylin_order_ticket_relations SET transfer_uid = ?, transfer_id = ? ,updated_at = ?  WHERE order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)