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

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

@@ -725,10 +725,10 @@ 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";//参数错误
-            }
+//            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());