Merge branch 'dev' into test

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

@@ -118,6 +118,7 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
 //            return ResponseDto.failure("请求频繁");//参数错误
 //        }
         try {
+            currentTime = System.currentTimeMillis();
             KylinPerformanceVo performanceData = dataUtils.getPerformanceVo(payOrderParam.getPerformanceId());
             currentTime=System.currentTimeMillis()-currentTime;
             log.debug("redis 获取演出详情 -> time:"+currentTime+"毫秒");
@@ -158,6 +159,7 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
             String timeStart = ticketData.getTimeStart(); // 普通开售时间
             String timeEnd = ticketData.getTimeEnd(); // 购票停售时间
             String timeExpressEnd = ticketData.getTimeEndExpress(); // 快递停售时间
+            currentTime = System.currentTimeMillis();
             boolean isMember = feignAdamBaseClient.isMember(uid).getData();//获取是否是会员
             currentTime=System.currentTimeMillis()-currentTime;
             log.debug("fegin 会员 -> time:"+(currentTime)+"毫秒");
@@ -229,10 +231,12 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
             }
 
             // 判断库存
+            currentTime = System.currentTimeMillis();
             int surplusGeneral = dataUtils.changeSurplusGeneral(payOrderParam.getTicketId(), -payOrderParam.getNumber());
             currentTime=System.currentTimeMillis()-currentTime;
             log.debug("redis 获取库存 -> time:"+(currentTime)+"毫秒");
             if (surplusGeneral < 0) {//库存回滚
+                currentTime = System.currentTimeMillis();
                 dataUtils.changeSurplusGeneral(payOrderParam.getTicketId(), payOrderParam.getNumber());
                 currentTime=System.currentTimeMillis()-currentTime;
                 log.debug("redis 修改库存 售罄 -> time:"+(currentTime)+"毫秒");
@@ -244,6 +248,7 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
                 //学生票 判断
                 List<AdamEntersVo> entersVoList = new ArrayList<>();
                 if (isTrueName == 1) {
+                    currentTime = System.currentTimeMillis();
                     for (String enterId : payOrderParam.getEnterIdList()) {
                         AdamEntersVo adamEnters = feignAdamBaseClient.queryEnters(enterId, uid).getData();
                         entersVoList.add(adamEnters);
@@ -267,29 +272,37 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
 
 
                 if (entersVoList.size() > 0) {
+                    currentTime = System.currentTimeMillis();
                     for (int i = 0; i < entersVoList.size(); i++) {
                         String res1 = orderUtils.judgeOrderLimit(performanceData.getType(), uid, entersVoList.get(i).getIdCard(), payOrderParam.getPerformanceId(), payOrderParam.getTicketId(), performanceLimit, performanceMemberLimit, ticketLimit, ticketMemberLimit, 1, 1, memberType, isTrueName);
-                        currentTime=System.currentTimeMillis()-currentTime;
                         log.debug("redis 判断库存 -> time:"+(currentTime)+"毫秒");
                         if (!res1.equals("")) {
                             //redisLockUtil.unlock(lock);
                             return ResponseDto.failure(res1);//乱七八糟异常
                         }
                     }
+                    currentTime=System.currentTimeMillis()-currentTime;
+
                 } else {
+                    log.debug("redis 判断库存 -> time:"+(currentTime)+"毫秒");
+                    currentTime = System.currentTimeMillis();
                     String res1 = orderUtils.judgeOrderLimit(performanceData.getType(), uid, "", payOrderParam.getPerformanceId(), payOrderParam.getTicketId(), performanceLimit, performanceMemberLimit, ticketLimit, ticketMemberLimit, payOrderParam.getNumber(), payOrderParam.getNumber(), memberType, isTrueName);
                     currentTime=System.currentTimeMillis()-currentTime;
-                    log.debug("redis 判断库存 -> time:"+(currentTime)+"毫秒");
                     if (!res1.equals("")) {
                         //redisLockUtil.unlock(lock);
                         return ResponseDto.failure(res1);//乱七八糟异常
                     }
+                    currentTime=System.currentTimeMillis()-currentTime;
+
                 }
+
                 //redisLockUtil.unlock(lock);
                 return order(payOrderParam, uid, isMember, isTrueName, performanceData, ticketData, entersVoList, isStudent, ticketTimesData,currentTime);
             }
         } catch (Exception e) {
             if (isDownGeneral) {
+                currentTime = System.currentTimeMillis();
+                currentTime = System.currentTimeMillis();
                 dataUtils.changeSurplusGeneral(payOrderParam.getTicketId(), payOrderParam.getNumber());
                 currentTime=System.currentTimeMillis()-currentTime;
                 log.debug("redis 修改库存 异常 -> time:"+(currentTime)+"毫秒");
@@ -345,6 +358,7 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
         orderTickets.setPaymentType(null);
         orderTickets.setTimePay(null);
         if (payOrderParam.getIsExpress() == 1) {
+            currentTime = System.currentTimeMillis();
             AdamAddressesVo addressesVo = feignAdamBaseClient.queryAddresses(payOrderParam.getAddressId(), uid).getData();
             orderTickets.setExpressContacts(addressesVo.getName());
             orderTickets.setExpressAddress(addressesVo.getAddress());
@@ -439,9 +453,11 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
                 orderTicketEntitiesVo.setCreatedAt(orderTicketEntities.getCreatedAt().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
                 orderTicketEntitiesVo.setUpdatedAt(null);
                 orderTicketEntitiesVo.setChangeDate(orderTicketEntities.getCreatedAt());
+                currentTime = System.currentTimeMillis();
                 mongoTemplate.insert(orderTicketEntitiesVo, KylinOrderTicketEntitiesVo.class.getSimpleName());
                 currentTime=System.currentTimeMillis()-currentTime;
                 log.debug("mongo 添加入场人 -> time:"+(currentTime)+"毫秒");
+                currentTime = System.currentTimeMillis();
                 dataUtils.changeBuyInfo(orderTicketEntitiesVo.getUserId(), orderTicketEntitiesVo.getEnterIdCode(), orderTicketEntitiesVo.getPerformanceId(), orderTicketEntitiesVo.getTicketId(), 1);
                 currentTime=System.currentTimeMillis()-currentTime;
                 log.debug("redis 修改 限购 -> time:"+(currentTime)+"毫秒");
@@ -479,9 +495,11 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
                 orderTicketEntitiesVo.setCreatedAt(orderTicketEntities.getCreatedAt().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
                 orderTicketEntitiesVo.setUpdatedAt(null);
                 orderTicketEntitiesVo.setChangeDate(orderTicketEntities.getCreatedAt());
+                currentTime = System.currentTimeMillis();
                 mongoTemplate.insert(orderTicketEntitiesVo, KylinOrderTicketEntitiesVo.class.getSimpleName());
                 currentTime=System.currentTimeMillis()-currentTime;
                 log.debug("mongo 添加入场人 -> time:"+(currentTime)+"毫秒");
+                currentTime = System.currentTimeMillis();
                 dataUtils.changeBuyInfo(orderTicketEntitiesVo.getUserId(), orderTicketEntitiesVo.getEnterIdCode(), orderTicketEntitiesVo.getPerformanceId(), orderTicketEntitiesVo.getTicketId(), 1);
                 currentTime=System.currentTimeMillis()-currentTime;
                 log.debug("redis 修改限购 -> time:"+(currentTime)+"毫秒");
@@ -516,6 +534,7 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
             httpData.add("return_url", payOrderParam.getReturnUrl() + orderTicketId);
         }
 
+        currentTime = System.currentTimeMillis();
         String returnData = HttpUtil.post(payUrl + payOrderParam.getDeviceFrom() + "/" + payOrderParam.getPayType(), httpData);
         currentTime=System.currentTimeMillis()-currentTime;
         log.debug("调用 PHP 支付 -> time:"+(currentTime)+"毫秒");
@@ -543,16 +562,19 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
         orderTicketVo.setOverdueAt(orderTickets.getCreatedAt().plusMinutes(performanceData.getPayCountdownMinute()).plusSeconds(15).format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
         orderTicketVo.setCreatedAt(orderTickets.getCreatedAt().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
         orderTicketVo.setChangeDate(orderTickets.getCreatedAt());
+        currentTime = System.currentTimeMillis();
         mongoTemplate.insert(orderTicketVo, KylinOrderTicketVo.class.getSimpleName());
         currentTime=System.currentTimeMillis()-currentTime;
         log.debug("mongo  添加 订单 -> time:"+(currentTime)+"毫秒");
 
+        currentTime = System.currentTimeMillis();
         mongoVoUtils.resetOrderListVo(uid, 1, orderTicketVo.getOrderTicketsId());
         currentTime=System.currentTimeMillis()-currentTime;
         log.debug("redis 修改订单列表 -> time:"+(currentTime)+"毫秒");
 
         // 执行sql
         String sqlData = SqlMapping.gets(sqls, sqlsDataB, sqlsDataC, sqlsDataD, sqlsDataA);
+        currentTime = System.currentTimeMillis();
         rabbitTemplate.convertAndSend(MQConst.EXCHANGES_LIQUIDNET_SQL_ORDER_CREADE, MQConst.ROUTING_KEY_SQL_ORDER_CREATE,
                 sqlData);
         currentTime=System.currentTimeMillis()-currentTime;