脚本增加锁逻辑

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

@@ -1016,17 +1016,18 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
     @Override
     public boolean checkOrderTime(String userId) {
         String lock = "order_lock:checkOrderTime:" + userId;
-        try {
-            if (redisLockUtil.tryLock(lock, 1, 3600)) {
+        if (redisLockUtil.tryLock(lock, 1, 3600)) {
+            try {
                 List<OrderScriptDto> dtoData = orderTicketsMapper.orderScriptDto(userId);
                 HashMap<String, Integer> map2 = new HashMap<>();
                 Integer count = 0;
                 Integer mqCount = 0;
                 Integer Acount = 0;
+                Integer Ecount = 0;
                 for (OrderScriptDto item : dtoData) {
                     count += 1;
                     LinkedList<String> sqls = new LinkedList<>();
-                    if (item.getStatus() == KylinTableStatusConst.ORDER_STATUS0) {
+                    if (item.getStatus().equals(KylinTableStatusConst.ORDER_STATUS0)) {
                         LocalDateTime now = LocalDateTime.now();
                         try {
                             KylinOrderTicketVo vo = dataUtils.getOrderTicketVo(item.getOrderTicketsId());
@@ -1065,9 +1066,7 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
                             mongoVoUtils.resetOrderListVo(item.getUserId(), 2, item.getOrderTicketsId(), vo);
                             Acount += 1;
 
-//                    List<KylinOrderTicketEntities> entities = entitiesMapper.selectList(new UpdateWrapper<KylinOrderTicketEntities>().eq("order_id", item.getOrderTicketsId()));
                             List<KylinOrderTicketEntitiesVo> entities = vo.getEntitiesVoList();
-//                            entitiesMapper.selectList(new UpdateWrapper<KylinOrderTicketEntities>().eq("order_id", item.getOrderTicketsId()));
                             for (int i = 0; i < entities.size(); i++) {
                                 KylinOrderTicketEntitiesVo items = entities.get(i);
                                 dataUtils.changeBuyInfo(items.getUserId(), items.getEnterIdCode(), items.getPerformanceId(), items.getTicketId(), -1);
@@ -1092,22 +1091,24 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
                             e.printStackTrace();
                             return false;
                         }
+                    }else{
+                        Ecount+=1;
                     }
                 }
                 log.debug("COUNT 1 = " + count);
                 log.debug("COUNT 2 = " + mqCount);
                 log.debug("COUNT 3 = " + Acount);
+                log.debug("COUNT 4 = " + Ecount);
                 for (Map.Entry<String, Integer> entry : map2.entrySet()) {
                     dataUtils.changeSurplusGeneral(entry.getKey(), entry.getValue());
                 }
-            } else {
-                log.debug("WARNING     LOCKING" );
+            } catch (Exception e) {
+                e.printStackTrace();
+            } finally {
+                redisLockUtil.unlock(lock);
             }
-        } catch (Exception e) {
-            redisLockUtil.unlock(lock);
-            return false;
-        } finally {
-            redisLockUtil.unlock(lock);
+        } else {
+            log.debug("WARNING     LOCKING");
         }
         return true;
     }