Merge remote-tracking branch 'origin/dev_member_voucher_social' into dev_member_voucher_social

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

@@ -121,7 +121,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
                 return ResponseDto.failure("票种类型错误");//参数错误
             } else if (payOrderParam.getIsElectronic().equals(1) && ticketData.getIsElectronic().equals(0)) {
                 return ResponseDto.failure("票种类型错误");//参数错误
-            }else if(payOrderParam.getIsExpress().equals(0) && payOrderParam.getIsElectronic().equals(0)){
+            } else if (payOrderParam.getIsExpress().equals(0) && payOrderParam.getIsElectronic().equals(0)) {
                 return ResponseDto.failure("票种类型错误");//参数错误
             }
 
@@ -763,32 +763,28 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
             //支付时间
             LocalDateTime now = LocalDateTime.now();
             String lock = "order_lock:" + syncOrderParam.getOrderCode();
-//            if (!redisLockUtil.tryLock(lock, 1, 5)) {
-//                log.error("参数错误");
-//                return "fail";//参数错误
-//            }
 
             String timePay = syncOrderParam.getPaymentAt();
             KylinOrderTicketVo orderTicketData = mongoTemplate.findOne(Query.query(Criteria.where("orderCode").is(syncOrderParam.getOrderCode())), KylinOrderTicketVo.class, KylinOrderTicketVo.class.getSimpleName());
             if (orderTicketData == null) {
-                log.error("订单不存在");
+                log.error("订单号：" + syncOrderParam.getOrderCode() + " 订单不存在");
                 return "fail";//订单不存在
             }
 
             if (orderTicketData.getStatus() != KylinTableStatusConst.ORDER_STATUS0) {
                 if (orderTicketData.getPayCode().equals(syncOrderParam.getCode()) && orderTicketData.getStatus() == KylinTableStatusConst.ORDER_STATUS1) {
-                    log.error("已经支付");
+                    log.error("订单号：" + syncOrderParam.getOrderCode() + " 已经支付");
                     return "success";//已经支付
                 }
 
                 if (!orderTicketData.getPayCode().equals(syncOrderParam.getCode())) {
-                    log.error("重复支付");
+                    log.error("订单号：" + syncOrderParam.getOrderCode() + " 重复支付");
                     return "fail";//重复支付
                 }
             }
 
             if (orderTicketData.getPriceActual().compareTo(syncOrderParam.getPrice()) != 0) {
-                log.error("价格不符");
+                log.error("订单号：" + syncOrderParam.getOrderCode() + " 价格不符");
                 return "fail";//价格不符
             }
 
@@ -798,7 +794,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
             LinkedList<Object[]> sqlsDataC = ObjectUtil.cloneLinkedListObj();
             LinkedList<Object[]> sqlsDataD = ObjectUtil.cloneLinkedListObj();
 
-            LocalDateTime strTime = LocalDateTime.now();
+            LocalDateTime strTime = LocalDateTime.now().plusSeconds(10);
 
             KylinOrderTickets orderTickets = KylinOrderTickets.getNew();
             KylinOrderTicketStatus orderTicketStatus = KylinOrderTicketStatus.getNew();