订单 锁 添加

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

@@ -750,31 +750,31 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
         //支付时间
         LocalDateTime now = LocalDateTime.now();
         String lock = "order_lock:" + syncOrderParam.getOrder_code();
-//        if (!redisLockUtil.tryLock(lock, 240, 240)) {
-//            return "fail";//参数错误
-//        }
+        if (!redisLockUtil.tryLock(lock, 1, 5)) {
+            return "fail";//参数错误
+        }
 
         String timePay = DateUtil.Formatter.yyyyMMddHHmmss.format(now);
         KylinOrderTicketVo orderTicketData = mongoTemplate.findOne(Query.query(Criteria.where("orderCode").is(syncOrderParam.getOrder_code())), KylinOrderTicketVo.class, KylinOrderTicketVo.class.getSimpleName());
         if (orderTicketData == null) {
-            //redisLockUtil.unlock(lock);
+            redisLockUtil.unlock(lock);
             return "fail";//订单不存在
         }
 
         if (orderTicketData.getStatus() != KylinTableStatusConst.ORDER_STATUS0) {
             if (orderTicketData.getPayCode().equals(syncOrderParam.getCode()) && orderTicketData.getStatus() == KylinTableStatusConst.ORDER_STATUS1) {
-                //redisLockUtil.unlock(lock);
+                redisLockUtil.unlock(lock);
                 return "success";//已经支付
             }
 
             if (!orderTicketData.getPayCode().equals(syncOrderParam.getCode())) {
-                //redisLockUtil.unlock(lock);
+                redisLockUtil.unlock(lock);
                 return "fail";//重复支付
             }
         }
 
         if (orderTicketData.getPriceActual().compareTo(syncOrderParam.getPrice()) != 0) {
-            //redisLockUtil.unlock(lock);
+            redisLockUtil.unlock(lock);
             return "fail";//价格不符
         }
 
@@ -883,7 +883,7 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
 
         // 大麦回调
         sycDamaiOrder(orderTickets.getOrderTicketsId());
-        //redisLockUtil.unlock(lock);
+        redisLockUtil.unlock(lock);
         return "success";
     }