Merge remote-tracking branch 'origin/dev' into dev

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

@@ -314,12 +314,12 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
                 return resultData;
             }
         } catch (Exception e) {
-            if (isDownGeneral) {
-                currentTime = System.currentTimeMillis();
-                dataUtils.changeSurplusGeneral(payOrderParam.getTicketId(), payOrderParam.getNumber());
-                currentTime = System.currentTimeMillis() - currentTime;
-                log.debug("redis 修改库存 异常 -> time:" + (currentTime) + "毫秒");
-            }
+//            if (isDownGeneral) {
+//                currentTime = System.currentTimeMillis();
+//                dataUtils.changeSurplusGeneral(payOrderParam.getTicketId(), payOrderParam.getNumber());
+//                currentTime = System.currentTimeMillis() - currentTime;
+//                log.debug("redis 修改库存 异常 -> time:" + (currentTime) + "毫秒");
+//            }
             e.printStackTrace();
             log.error("Kylin Order Pay Error = " + e.getMessage());
 //            redisLockUtil.unlock(lock);
@@ -328,6 +328,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
     }
 
     private ResponseDto<PayResultVo> order(PayOrderParam payOrderParam, String uid, boolean isMember, int isTrueName, KylinPerformanceVo performanceData, KylinTicketVo ticketData, List<AdamEntersVo> entersVoList, Integer isStudent, KylinTicketTimesVo ticketTimesData, Long currentTime) {
+        try {
             LinkedList<String> sqls = new LinkedList<>();
             String source = CurrentUtil.getCliSource() == null ? "" : CurrentUtil.getCliSource();
             String version = CurrentUtil.getCliVersion() == null ? "" : CurrentUtil.getCliVersion();
@@ -621,6 +622,14 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
             log.debug("MQ 发送 -> time:" + (currentTime) + "毫秒");
             log.info(UserPathDto.setData("下单(唤起支付)", payOrderParam, payResultVo));
             return ResponseDto.success(payResultVo);
+        }catch (Exception e){
+            currentTime = System.currentTimeMillis();
+            dataUtils.changeSurplusGeneral(payOrderParam.getTicketId(), payOrderParam.getNumber());
+            currentTime = System.currentTimeMillis() - currentTime;
+            log.debug("redis 修改库存 异常 -> time:" + (currentTime) + "毫秒");
+            log.error("Kylin Order Inner Pay Error = " + e.getMessage());
+            return ResponseDto.failure(ErrorMapping.get("20018"));//乱七八糟异常
+        }
     }
 
     @Override