Merge branch 'pre' into 'master'

Pre

See merge request !45

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/service/IKylinOrderTicketsService.java

@@ -37,6 +37,9 @@ public interface IKylinOrderTicketsService {
     //退款详情
     ResponseDto<OrderRefundVo> orderRefundDetails(String orderId, String orderRefundId);
 
+    //补充入场人
+    ResponseDto<Boolean> supplementEnter(String orderId, String enterList);
+
     /**
      * 发起退款
      *

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

@@ -86,6 +86,14 @@ public class KylinOrderTicketsController {
         }
     }
 
+    @GetMapping("supplementEnter")
+    @ApiOperation("补充入场人")
+    @ApiResponse(code = 200, message = "接口返回对象参数")
+    public ResponseDto<Boolean> supplementEnter(@RequestParam(value = "orderId", required = true) @NotNull(message = "订单ID不能为空") String orderId,
+                                                @RequestParam(value = "enterList", required = true) @NotNull(message = "入场人id(逗号隔开)") String enterList) {
+        return orderTicketsService.supplementEnter(orderId, enterList);
+    }
+
     @GetMapping("toOrderRefundDetails")
     @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

@@ -258,15 +258,20 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
                     vo.setIsCanTransfer(0);
                 }
                 //是否可回退
-                if (null != performanceVo.getIsCanRefund() && performanceVo.getIsCanRefund() == 1) {
-                    LocalDateTime refundOpenDate = DateUtil.Formatter.yyyyMMddHHmmss.parse(performanceVo.getRefundOpenTime());
-                    LocalDateTime refundCloseDate = DateUtil.Formatter.yyyyMMddHHmmss.parse(performanceVo.getRefundCloseTime());
-                    if (LocalDateTime.now().isAfter(refundOpenDate) && LocalDateTime.now().isBefore(refundCloseDate)
-                            && orderTicketVo.getTransferStatus().equals(3)) {
-                        vo.setIsCanBack(1);
-                    } else {
-                        vo.setIsCanBack(0);
-                    }
+//                if (null != performanceVo.getIsCanRefund() && performanceVo.getIsCanRefund() == 1) {
+//                    LocalDateTime refundOpenDate = DateUtil.Formatter.yyyyMMddHHmmss.parse(performanceVo.getRefundOpenTime());
+//                    LocalDateTime refundCloseDate = DateUtil.Formatter.yyyyMMddHHmmss.parse(performanceVo.getRefundCloseTime());
+//                    if (LocalDateTime.now().isAfter(refundOpenDate) && LocalDateTime.now().isBefore(refundCloseDate)
+//                            && orderTicketVo.getTransferStatus().equals(3)) {
+//                        vo.setIsCanBack(1);
+//                    } else {
+//                        vo.setIsCanBack(0);
+//                    }
+//                } else {
+//                    vo.setIsCanBack(0);
+//                }
+                if (orderTicketVo.getTransferStatus().equals(3) && LocalDateTime.now().isBefore(DateUtil.Formatter.yyyyMMddHHmmss.parse(orderTicketVo.getUseStart()))) {
+                    vo.setIsCanBack(1);
                 } else {
                     vo.setIsCanBack(0);
                 }
@@ -386,6 +391,74 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
         }
     }
 
+    @Override
+    public ResponseDto<Boolean> supplementEnter(String orderId, String enterList) {
+        String uid = CurrentUtil.getCurrentUid();
+        KylinOrderTicketVo orderTicketVo = dataUtils.getOrderTicketVo(orderId);
+        if (uid.equals("809406") || uid.equals("773650")) {
+        } else {
+            if (!orderTicketVo.getUserId().equals(uid)) {
+                return ResponseDto.failure(ErrorMapping.get("20003"));
+            }
+        }
+        KylinPerformanceVo performanceVo = dataUtils.getPerformanceVo(orderTicketVo.getPerformanceId());
+        List<KylinOrderTicketEntitiesVo> kylinOrderTicketEntitiesVoList = orderTicketVo.getEntitiesVoList();
+        KylinTicketVo ticketVo = null;
+
+        //获取购票数据
+        for (int x = 0; x < performanceVo.getTicketTimeList().size(); x++) {
+            KylinTicketTimesVo timeItem = performanceVo.getTicketTimeList().get(x);
+            for (int y = 0; y < timeItem.getTicketList().size(); y++) {
+                KylinTicketVo ticketItem = timeItem.getTicketList().get(y);
+                if (ticketItem.getTicketsId().equals(orderTicketVo.getTicketId())) {
+                    ticketVo = ticketItem;
+                    break;
+                }
+            }
+        }
+        if (ticketVo == null || ticketVo.getIsTrueName() == 0) {
+            return ResponseDto.failure("错误请求");
+        }
+
+        List<AdamEntersVo> adamEnters = orderUtils.getEnters(enterList, uid);
+        if (adamEnters == null) {
+            return ResponseDto.failure("入场人数据异常");//乱七八糟异常
+        }
+        if (adamEnters.size() != kylinOrderTicketEntitiesVoList.size()) {
+            return ResponseDto.failure("入场人数量错误");
+        }
+
+        LinkedList<String> sqls = CollectionUtil.linkedListString();
+        LinkedList<Object[]> sqlsData = CollectionUtil.linkedListObjectArr();
+        sqls.add(SqlMapping.get("kylin_order_refund_entities.supplementEnter"));
+
+        for (int i = 0; i < kylinOrderTicketEntitiesVoList.size(); i++) {
+            KylinOrderTicketEntitiesVo data = kylinOrderTicketEntitiesVoList.get(i);
+            String orderTicketEntitiesId = data.getOrderTicketEntitiesId();
+            if(data.getEnterName().trim().length()>0){
+                return ResponseDto.failure("订单已实名不可更改");
+            }
+            AdamEntersVo adamEntersData = adamEnters.get(i);
+            mongoTemplate.getCollection(KylinOrderTicketEntitiesVo.class.getSimpleName()).updateOne(
+                    Query.query(Criteria.where("orderTicketEntitiesId").is(orderTicketEntitiesId)).getQueryObject(),
+                    new Document("$set", new Document("enterType", adamEntersData.getType())
+                            .append("enterName", adamEntersData.getName())
+                            .append("enterMobile", adamEntersData.getMobile())
+                            .append("enterIdCode", adamEntersData.getIdCard())
+                            .append("updatedAt", DateUtil.Formatter.yyyyMMddHHmmss.format(LocalDateTime.now())))
+            );
+
+            sqlsData.add(new Object[]{
+                    adamEntersData.getType(), adamEntersData.getName(), adamEntersData.getMobile(), adamEntersData.getIdCard(), LocalDateTime.now(), orderTicketEntitiesId
+            });
+        }
+        //入库
+        queueUtils.sendMsgByRedis(MQConst.KylinQueue.SQL_PERFORMANCE_LACK.getKey(),
+                SqlMapping.gets(sqls, sqlsData));
+        dataUtils.delOrderTicketRedis(orderId);
+        return ResponseDto.success();
+    }
+
     @Override
     public String sendOrderRefund(String orderId, String orderTicketEntitiesId, String reason, String picList) {
         KylinOrderTicketEntitiesVo orderTicketEntitiesVo = null;
@@ -832,7 +905,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
                 for (AdamEntersVo item : adamEnters) {
                     entersVoList.add(item);
                     if (ticketData.getIsStudent() == 1) {
-                        if(!item.getType().equals(1)){
+                        if (!item.getType().equals(1)) {
                             return ResponseDto.failure("学生票优惠核验失败，无法转票");
                         }
                         int age = IDCard.getAgeByIdCard(item.getIdCard());
@@ -1100,11 +1173,11 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
         //必须开启退款
         String performanceId = vo.getPerformanceId();
         KylinPerformanceVo performanceVo = dataUtils.getPerformanceVo(performanceId);
-        LocalDateTime refundOpenDate = DateUtil.Formatter.yyyyMMddHHmmss.parse(performanceVo.getRefundOpenTime());
-        LocalDateTime refundCloseDate = DateUtil.Formatter.yyyyMMddHHmmss.parse(performanceVo.getRefundCloseTime());
-        if (!(performanceVo.getIsCanRefund().equals(1) && LocalDateTime.now().isAfter(refundOpenDate) && LocalDateTime.now().isBefore(refundCloseDate))) {
-            return ResponseDto.failure("未开启退款，不支持回退");
-        }
+//        LocalDateTime refundOpenDate = DateUtil.Formatter.yyyyMMddHHmmss.parse(performanceVo.getRefundOpenTime());
+//        LocalDateTime refundCloseDate = DateUtil.Formatter.yyyyMMddHHmmss.parse(performanceVo.getRefundCloseTime());
+//        if (!(performanceVo.getIsCanRefund().equals(1) && LocalDateTime.now().isAfter(refundOpenDate) && LocalDateTime.now().isBefore(refundCloseDate))) {
+//            return ResponseDto.failure("未开启退款，不支持回退");
+//        }
         if (!vo.getTransferStatus().equals(3)) {
             return ResponseDto.failure("无法退回");
         }

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

@@ -184,7 +184,7 @@ public class OrderUtils {
     public List<AdamEntersVo> getEnters(String entersIds, String uid) {
         MultiValueMap<String, String> headers = CollectionUtil.linkedMultiValueMapStringString();
         headers.add("Accept", "application/json;charset=UTF-8");
-        String returnVo = HttpUtil.get(adamUrl + "/adam/rsc/inquire/enters?entersIds=" + entersIds + "&uid=" + uid, null, headers);
+        String returnVo = HttpUtil.get( "http://testadam.zhengzai.tv"+ "/adam/rsc/inquire/enters?entersIds=" + entersIds + "&uid=" + uid, null, headers);
         ResponseDto<List<AdamEntersVo>> ResponseVo = JsonUtils.fromJson(returnVo, new TypeReference<ResponseDto<List<AdamEntersVo>>>() {
         });
         return ResponseVo.getData();

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

@@ -50,3 +50,5 @@ kylin_order_task.delete = DELETE FROM kylin_order_task WHERE order_id = ?;
 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)
 
+# ------------------------ 订单补充入场人 ----------------------------
+kylin_order_refund_entities.supplementEnter = UPDATE kylin_order_ticket_entities SET enter_type = ?,enter_name = ?,enter_mobile = ?,enter_id_code = ?,updated_at = ? WHERE order_ticket_entities_id = ?