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

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

@@ -251,17 +251,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());
+            int 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());
-//                return ResponseDto.failure("下单超时");//乱七八糟异常
-//            }
 
             if (surplusGeneral < 0) {//库存回滚
                 currentTime = System.currentTimeMillis();
@@ -318,8 +311,9 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
 
                 }
 
+                ResponseDto<PayResultVo> resultData = order(payOrderParam, uid, isMember, isTrueName, performanceData, ticketData, entersVoList, isStudent, ticketTimesData, currentTime);
                 redisLockUtil.unlock(lock);
-                return order(payOrderParam, uid, isMember, isTrueName, performanceData, ticketData, entersVoList, isStudent, ticketTimesData, currentTime);
+                return resultData;
             }
         } catch (Exception e) {
             if (isDownGeneral) {

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

@@ -2,8 +2,10 @@ package com.liquidnet.service.kylin.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.liquidnet.commons.lang.CommonConst;
+import com.liquidnet.commons.lang.util.CurrentUtil;
 import com.liquidnet.commons.lang.util.DateUtil;
 import com.liquidnet.commons.lang.util.DistanceUtil;
+import com.liquidnet.commons.lang.util.ServletUtils;
 import com.liquidnet.service.kylin.constant.KylinPerformanceStatusEnum;
 import com.liquidnet.service.kylin.dao.PerformanceOrderStatisticalDao;
 import com.liquidnet.service.kylin.dto.vo.middle.KylinTicketTimesVo;
@@ -149,6 +151,9 @@ public class KylinPerformancesServiceImpl extends ServiceImpl<KylinPerformancesM
             performancesInfo.setMessage(KylinPerformanceStatusEnum.getName(performancesInfo.getAppStatus()));
         } catch (Exception e) {
             e.printStackTrace();
+
+            log.debug(" ERROR PERFORMANCE DETAILS AGENT : " +  ServletUtils.getRequest().getHeader("User-Agent"));
+            log.debug(" ERROR PERFORMANCE DETAILS HOST : " +  ServletUtils.getRequest().getHeader("Host"));
             log.debug(" ERROR PERFORMANCE DETAILS PERFORMANCE_ID : " + performancesId);
         }