修改 redis锁

liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/mapper/KylinCheckUserMapper.java

@@ -4,6 +4,7 @@ import com.liquidnet.service.kylin.dao.ChildDetailsDao;
 import com.liquidnet.service.kylin.dao.ChildListDao;
 import com.liquidnet.service.kylin.entity.KylinCheckUser;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -17,7 +18,7 @@ import java.util.List;
  */
 public interface KylinCheckUserMapper extends BaseMapper<KylinCheckUser> {
 
-    List<ChildListDao> childSimpleList(String merchantId,String mobile);
+    List<ChildListDao> childSimpleList(@Param("merchantId") String merchantId, @Param("mobile") String mobile);
 
     ChildDetailsDao childDetails(String merchantId, String checkUserId);
 }

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

@@ -792,8 +792,11 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
         OrderDetailsVo vo = new OrderDetailsVo();
         try {
             String uid = CurrentUtil.getCurrentUid();
+            System.out.println(System.currentTimeMillis());
             checkOrderTime(uid);
+            System.out.println(System.currentTimeMillis());
             KylinOrderTicketVo orderTicketVo = dataUtils.getOrderTicketVo(orderId);
+            System.out.println(System.currentTimeMillis());
             if (null != orderTicketVo) {
                 //TODO 顺丰快递
                 Object expresses = null;
@@ -844,10 +847,10 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
         LinkedList<String> sqls = new LinkedList<>();
 
         for (OrderScriptDto item : dtoData) {
-            if (!RedisLockUtil.tryLock("order_lock:" + item.getOrderCode(), 30, 240)) {
-                continue;
-            }
-            RLock lock = redisLockUtil.lock("order_lock:" + item.getOrderCode(), 240);
+//            if (!RedisLockUtil.tryLock("order_lock:" + item.getOrderCode(), 30, 240)) {
+//                continue;
+//            }
+//            RLock lock = redisLockUtil.lock("order_lock:" + item.getOrderCode(), 240);
             if (item.getStatus() == KylinTableStatusConst.ORDER_STATUS0) {
                 LocalDateTime now = LocalDateTime.now();
                 try {
@@ -890,12 +893,12 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
                     rabbitTemplate.convertAndSend(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL, SqlMapping.gets(sqls, sqlsDataA, sqlsDataB));
 
                 } catch (Exception e) {
-                    lock.unlock();
+//                    lock.unlock();
                     e.printStackTrace();
                     return false;
                 }
             } else {
-                lock.unlock();
+//                lock.unlock();
             }
         }
         return true;