修改 sql

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

@@ -101,6 +101,9 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
         String uid = CurrentUtil.getCurrentUid();
         HashMap<String, Object> advanceMap = null;
         try {
+            String orderTicketId = IDGenerator.nextSnowId();
+            String orderCode = IDGenerator.ticketOrderCode(orderTicketId);
+            queueUtils.pushPvUv(uid, KylinTableStatusConst.PvUv.TK_PAY.getKey(), payOrderParam.getPerformanceId(), orderTicketId, orderCode, CurrentUtil.getCliIpAddr());
             if (payOrderParam.getVoucherType() != null && payOrderParam.getVoucherType().equals(3)) {
                 isPay = false;
                 if (payOrderParam.getNumber() > 1) {
@@ -125,8 +128,6 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
                 }
             }
 
-            queueUtils.pushPvUv(uid,KylinTableStatusConst.PvUv.TK_PAY.getKey(),performanceData.getPerformancesId(),null,null,CurrentUtil.getCliIpAddr());
-
             if (performanceData == null || ticketTimesData == null || ticketData == null) {
                 return ResponseDto.failure(ErrorMapping.get("20004"));//参数错误
             }
@@ -345,7 +346,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
                     }
                 }
 
-                ResponseDto<PayInnerResultVo> resultData = order(payOrderParam, uid, isMember, isTrueName, performanceData, ticketData, entersVoList, isStudent, content, useTime, advanceMap, addressesVo);
+                ResponseDto<PayInnerResultVo> resultData = order(payOrderParam, uid, isMember, isTrueName, performanceData, ticketData, entersVoList, isStudent, content, useTime, advanceMap, addressesVo, orderTicketId, orderCode);
                 isDownGeneral = false;
                 return resultData;
             }
@@ -374,7 +375,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
         }
     }
 
-    private ResponseDto<PayInnerResultVo> order(PayOrderParam payOrderParam, String uid, boolean isMember, int isTrueName, KylinPerformanceVo performanceData, KylinTicketVo ticketData, List<AdamEntersVo> entersVoList, Integer isStudent, String content, String useTime, HashMap<String, Object> advanceMap, AdamAddressesVo addressesVo) throws Exception {
+    private ResponseDto<PayInnerResultVo> order(PayOrderParam payOrderParam, String uid, boolean isMember, int isTrueName, KylinPerformanceVo performanceData, KylinTicketVo ticketData, List<AdamEntersVo> entersVoList, Integer isStudent, String content, String useTime, HashMap<String, Object> advanceMap, AdamAddressesVo addressesVo, String orderTicketId, String orderCode) throws Exception {
         LinkedList<String> sqls = ObjectUtil.cloneLinkedListStr();
         String headerCliSource = CurrentUtil.getHeaderCliSource(), headerCliVersion = CurrentUtil.getHeaderCliVersion();
         String source = headerCliSource == null ? "" : headerCliSource;
@@ -382,14 +383,13 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
         LocalDateTime now = LocalDateTime.now();
         //生成订单 order_ticket
         KylinOrderTickets orderTickets = KylinOrderTickets.getNew();
-        String orderTicketId = IDGenerator.nextSnowId();
         orderTickets.setOrderTicketsId(orderTicketId);
         orderTickets.setUserId(uid);
         Map token = CurrentUtil.getTokenClaims();
         orderTickets.setUserName(StringUtils.defaultString(((String) token.get("nickname")), ""));
         orderTickets.setUserMobile(StringUtils.defaultString(((String) token.get("mobile")), ""));
         orderTickets.setPerformanceTitle(performanceData.getTitle());
-        orderTickets.setOrderCode(IDGenerator.ticketOrderCode(orderTicketId));
+        orderTickets.setOrderCode(orderCode);
         orderTickets.setPayCode("");
         orderTickets.setQrCode("");
         orderTickets.setOrderType(source);
@@ -646,7 +646,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
         KylinIpAreaVo vo = dataUtils.getKylinIpAreaVo(CurrentUtil.getCliIpAddr());
         sqls.add(SqlMapping.get("kylin_order_ticket.add"));
         LinkedList<Object[]> sqlsDataA = ObjectUtil.cloneLinkedListObj();
-        sqlsDataA.add(orderTickets.getAddObject(CurrentUtil.getCliIpAddr(),vo.getArea(),vo.getProvince(),vo.getCity(),vo.getCounty()));
+        sqlsDataA.add(orderTickets.getAddObject(CurrentUtil.getCliIpAddr(), vo.getArea(), vo.getProvince(), vo.getCity(), vo.getCounty()));
         // 生成vo
         KylinOrderTicketVo orderTicketVo = KylinOrderTicketVo.getNew();
         orderTicketVo.setOrderTicket(orderTickets);