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/KylinLackRegistersServiceImpl.java

@@ -36,7 +36,7 @@ public class KylinLackRegistersServiceImpl extends ServiceImpl<KylinLackRegister
             lackRegisters.setUserMobile(StringUtils.defaultString(((String) token.get("mobile")), ""));
             lackRegisters.setIpAddress(CurrentUtil.getCliIpAddr());
             lackRegisters.setCreatedAt(LocalDateTime.now());
-            rabbitTemplate.convertAndSend(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL,
+            rabbitTemplate.convertAndSend(MQConst.EXCHANGES_LIQUIDNET_SQL_PERFORMANCE_LACK, MQConst.ROUTING_KEY_SQL_PERFORMANCE_LACK,
                     SqlMapping.get("kylin_lack_register.insert", lackRegisters.getInsertObj()));
             return ResponseDto.success("登记成功");
         }catch (Exception e){

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

@@ -322,7 +322,7 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
         orderTickets.setPayType(payOrderParam.getPayType());
         orderTickets.setPaymentType(null);
         orderTickets.setTimePay(null);
-        if (ticketData.getIsExpress() == 1) {
+        if (payOrderParam.getIsExpress() == 1) {
             AdamAddressesVo addressesVo = feignAdamBaseClient.queryAddresses(payOrderParam.getAddressId(), uid).getData();
             orderTickets.setExpressContacts(addressesVo.getName());
             orderTickets.setExpressAddress(addressesVo.getAddress());
@@ -879,7 +879,6 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
                         dataUtils.changeBuyInfo(items.getUserId(), items.getEnterIdCode(), items.getPerformanceId(), items.getTicketId(), -1);
                     }
 
-                    //TODO MQ代操作
                     sqls.add(SqlMapping.get("kylin_order_ticket.close"));
                     LinkedList<Object[]> sqlsDataA = new LinkedList<>();
                     sqlsDataA.add(orderTickets.getCloseOrderObject());