Merge branch 'dev' of http://gitlab.zhengzai.tv/dongjingwei/liquidnet-bus-v1 into dev

liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/dao/PerformanceRecommendAdminDao.java

@@ -31,9 +31,12 @@ public class PerformanceRecommendAdminDao {
                 this.statusName="已下架";
                 break;
             case 8:
-                this.statusName="演出结束";
+                this.statusName="售罄";
                 break;
             case 9:
+                this.statusName="演出结束";
+                break;
+            case 10:
                 this.statusName="演出未开始";
                 break;
             default:

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

@@ -89,7 +89,7 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
     private OrderUtils orderUtils;
     @Autowired
     private OtherUtils otherUtils;
-        @Autowired
+    @Autowired
     private RedisLockUtil redisLockUtil;
     @Autowired
     private MongoVoUtils mongoVoUtils;
@@ -108,7 +108,7 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
     @Autowired
     private KylinOrderTicketEntitiesMapper entitiesMapper;
 
-    ArrayList<Integer> canBuyStatus = new ArrayList(){{
+    ArrayList<Integer> canBuyStatus = new ArrayList() {{
         add(6);
         add(8);
         add(9);
@@ -200,11 +200,11 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
             int performanceMemberLimit = performanceData.getLimitCountMember();//会员演出限购
             int isTrueName = ticketData.getIsTrueName();//是否演出实名
 
-            if(!canBuyStatus.contains(performanceData.getAppStatus())){
+            if (!canBuyStatus.contains(performanceData.getAppStatus())) {
                 return ResponseDto.failure("当前不可购买");//没有会员权限
             }
 
-            if(!canBuyStatus.contains(performanceData.getAppStatus())){
+            if (!canBuyStatus.contains(performanceData.getAppStatus())) {
                 return ResponseDto.failure("当前不可购买");//没有会员权限
             }
 
@@ -250,10 +250,10 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
 
             int surplusGeneral = -1;
 //            if(redisLockUtil.tryLock("locak:"+ticketData.getTicketsId(),10,1)) {
-                currentTime = System.currentTimeMillis();
-                surplusGeneral = dataUtils.changeSurplusGeneral(payOrderParam.getTicketId(), -payOrderParam.getNumber());
-                currentTime = System.currentTimeMillis() - currentTime;
-                log.debug("redis 获取库存 -> time:" + (currentTime) + "毫秒");
+            currentTime = System.currentTimeMillis();
+            surplusGeneral = dataUtils.changeSurplusGeneral(payOrderParam.getTicketId(), -payOrderParam.getNumber());
+            currentTime = System.currentTimeMillis() - currentTime;
+            log.debug("redis 获取库存 -> time:" + (currentTime) + "毫秒");
 //                redisLockUtil.unlock("locak:"+ticketData.getTicketsId());
 //            }else{
 //                redisLockUtil.unlock("locak:"+ticketData.getTicketsId());
@@ -562,7 +562,7 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
         String returnData = HttpUtil.post(payUrl + payOrderParam.getDeviceFrom() + "/" + payOrderParam.getPayType(), httpData);
         currentTime = System.currentTimeMillis() - currentTime;
         log.debug("调用 PHP 支付 -> time:" + (currentTime) + "毫秒");
-        PayResultVo payResultVo =  JsonUtils.fromJson(returnData, PayResultVo.class);
+        PayResultVo payResultVo = JsonUtils.fromJson(returnData, PayResultVo.class);
 //        PayResultVo payResultVo = null;
 //        try {
 //            payResultVo = JsonUtils.fromJson("{\n" +
@@ -624,7 +624,7 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
         log.debug("mongo  添加 订单 -> time:" + (currentTime) + "毫秒");
 
         currentTime = System.currentTimeMillis();
-        mongoVoUtils.resetOrderListVo(uid, 1, orderTicketVo.getOrderTicketsId(),orderTicketVo);
+        mongoVoUtils.resetOrderListVo(uid, 1, orderTicketVo.getOrderTicketsId(), orderTicketVo);
         currentTime = System.currentTimeMillis() - currentTime;
         log.debug("redis 修改订单列表 -> time:" + (currentTime) + "毫秒");
 
@@ -846,7 +846,7 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
 
         //生成vo redis
         dataUtils.delOrderTicketRedis(orderTickets.getOrderTicketsId());
-        mongoVoUtils.resetOrderListVo(orderTicketData.getUserId(), 2, orderTicketData.getOrderTicketsId(),null);
+        mongoVoUtils.resetOrderListVo(orderTicketData.getUserId(), 2, orderTicketData.getOrderTicketsId(), null);
 
         // 发短信
         KylinPerformanceVo performanceData = dataUtils.getPerformanceVo(orderTicketData.getPerformanceId());
@@ -1017,7 +1017,11 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
     public boolean checkOrderTime(String userId) {
         List<OrderScriptDto> dtoData = orderTicketsMapper.orderScriptDto(userId);
         HashMap<String, Integer> map2 = new HashMap<>();
+        Integer count = 0;
+        Integer mqCount = 0;
+        Integer Acount = 0;
         for (OrderScriptDto item : dtoData) {
+            count += 1;
             LinkedList<String> sqls = new LinkedList<>();
             String lock = "order_lock:" + item.getOrderCode();
 //            if (!redisLockUtil.tryLock(lock, 30, 240)) {
@@ -1028,9 +1032,9 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
                 try {
 
                     KylinOrderTicketVo vo = dataUtils.getOrderTicketVo(item.getOrderTicketsId());
-//                    if (vo.getStatus() != 0) {
-//                        continue;
-//                    }
+                    if (vo.getStatus() != 0) {
+                        continue;
+                    }
 
                     //mysql
                     KylinOrderTickets orderTickets = new KylinOrderTickets();
@@ -1057,10 +1061,11 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
                     vo.setChangeDate(now);
                     vo.setStatus(KylinTableStatusConst.ORDER_STATUS2);
                     vo.setUpdatedAt(DateUtil.Formatter.yyyyMMddHHmmssSSS.format(now));
-                    redisUtil.set(KylinRedisConst.ORDER+vo.getOrderTicketsId(),vo);
+                    redisUtil.set(KylinRedisConst.ORDER + vo.getOrderTicketsId(), vo);
 
                     map2.put(vo.getTicketId(), map2.get(vo.getTicketId()) == null ? vo.getNumber() : map2.get(vo.getTicketId()) + vo.getNumber());
-                    mongoVoUtils.resetOrderListVo(item.getUserId(), 2, item.getOrderTicketsId(),vo);
+                    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();
@@ -1083,10 +1088,10 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
                     sqlsDataC.add(new Object[]{orderTickets.getUpdatedAt(), orderTickets.getOrderTicketsId(), strTime, strTime});
 
                     rabbitTemplate.convertAndSend(MQConst.EXCHANGES_LIQUIDNET_SQL_ORDER_CLOSE, MQConst.ROUTING_KEY_SQL_ORDER_CLOSE, SqlMapping.gets(sqls, sqlsDataA, sqlsDataB, sqlsDataC));
-
+                    mqCount += 1;
                 } catch (Exception e) {
                     //redisLockUtil.unlock(lock);
-                    log.debug("CHECK TIME SYNC = "+e.getMessage());
+                    log.debug("CHECK TIME SYNC = " + e.getMessage());
                     e.printStackTrace();
                     return false;
                 }
@@ -1095,6 +1100,9 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
             }
         }
 
+        log.debug("COUNT 1 = " + count);
+        log.debug("COUNT 2 = " + mqCount);
+        log.debug("COUNT 3 = " + Acount);
 
         for (Map.Entry<String, Integer> entry : map2.entrySet()) {
             dataUtils.changeSurplusGeneral(entry.getKey(), entry.getValue());