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

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/framework/mq/TradeMqReceiver.java

@@ -3,6 +3,7 @@ package com.yc.ship.module.trade.framework.mq;
 
 import cn.hutool.core.map.MapUtil;
 import com.rabbitmq.client.Channel;
+import com.yc.ship.framework.tenant.core.aop.TenantIgnore;
 import com.yc.ship.module.trade.dal.dataobject.order.TradeOrderDO;
 import com.yc.ship.module.trade.service.order.TradeOrderBizService;
 import com.yc.ship.module.trade.service.order.TradeOrderRepositoryService;
@@ -56,6 +57,7 @@ public class TradeMqReceiver {
      * @throws IOException
      */
     @RabbitListener(queues = TradeMqConfig.QUEUE_CREATE_SUCCESS, concurrency = "3")
+    @TenantIgnore
     public void processOrderCreateSuccess(String data, Message message, Channel channel) throws IOException {
         log.debug("收到下单创建成功消息：" + data);
         try {
@@ -76,6 +78,7 @@ public class TradeMqReceiver {
      * @throws IOException
      */
     @RabbitListener(queues = TradeMqConfig.QUEUE_CREATE_FAIL, concurrency = "3")
+    @TenantIgnore
     public void processOrderCreateFail(String data, Message message, Channel channel) throws IOException {
         log.debug("收到下单创建失败消息：" + data);
         try {
@@ -118,6 +121,7 @@ public class TradeMqReceiver {
      * @throws IOException
      */
     @RabbitListener(queues = TradeMqConfig.QUEUE_PROCESS_SUCCESS, concurrency = "5")
+    @TenantIgnore
     public void processOrderProcessSuccess(String data, Message message, Channel channel) throws IOException {
         log.debug("收到出票成功消息：" + data);
         try {
@@ -138,6 +142,7 @@ public class TradeMqReceiver {
      * @throws IOException
      */
     @RabbitListener(queues = TradeMqConfig.QUEUE_PROCESS_FAIL, concurrency = "3")
+    @TenantIgnore
     public void processOrderProcessFail(String data, Message message, Channel channel) throws IOException {
         log.debug("收到出票失败消息：" + data);
         try {
@@ -158,6 +163,7 @@ public class TradeMqReceiver {
      * @throws IOException
      */
     @RabbitListener(queues = TradeMqConfig.DL_QUEUE_ORDER_PAY, concurrency = "3")
+    @TenantIgnore
     public void processOrderPayDelay(String data, Message message, Channel channel) throws IOException {
         log.debug("收到支付延迟消息：" + data);
         try {
@@ -171,6 +177,7 @@ public class TradeMqReceiver {
     }
 
     @RabbitListener(queues = TradeMqConfig.QUEUE_SUPPLIER_REFUND_SUCCESS, concurrency = "2")
+    @TenantIgnore
     public void processSupplierRefundSuccess(String data, Message message, Channel channel) throws IOException {
         log.error("收到供应商退款成功消息：" + data);
         try {
@@ -190,6 +197,7 @@ public class TradeMqReceiver {
     }
 
     @RabbitListener(queues = TradeMqConfig.QUEUE_REFUND_AUDIT, concurrency = "2")
+    @TenantIgnore
     public void processRefundAuditResult(String data, Message message, Channel channel) throws IOException {
         log.debug("收到退款审核结果消息：" + data);
         try {
@@ -209,6 +217,7 @@ public class TradeMqReceiver {
      * @throws IOException
      */
     @RabbitListener(queues = TradeMqConfig.DL_QUEUE_ORDER_CONFIRM, concurrency = "2")
+    @TenantIgnore
     public void processConfirmOrderDelay(String data, Message message, Channel channel) throws IOException {
         log.info("收到二次确认订单延迟消息：" + data);
         try {
@@ -222,6 +231,7 @@ public class TradeMqReceiver {
     }
 
     @RabbitListener(queues = TradeMqConfig.QUEUE_CHECK_ORDER_SUCCESS, concurrency = "2")
+    @TenantIgnore
     public void processCheckOrderSuccess(String data, Message message, Channel channel) throws IOException {
         log.debug("收到订单核销成功结果消息：" + data);
         try {
@@ -236,6 +246,7 @@ public class TradeMqReceiver {
 
 
     @RabbitListener(queues = TradeMqConfig.QUEUE_CHECK_VOUCHER_SUCCESS, concurrency = "2")
+    @TenantIgnore
     public void processCheckVoucherSuccess(String data, Message message, Channel channel) throws IOException {
         log.debug("收到票券核销成功结果消息：" + data);
         try {
@@ -249,6 +260,7 @@ public class TradeMqReceiver {
     }
 
     @RabbitListener(queues = TradeMqConfig.QUEUE_CHECK_VOUCHER_BASE_SUCCESS, concurrency = "2")
+    @TenantIgnore
     public void processCheckVoucherBaseSuccess(String data, Message message, Channel channel) throws IOException {
         log.debug("收到子票核销成功结果消息：" + data);
         try {
@@ -261,6 +273,7 @@ public class TradeMqReceiver {
         }
     }
     @RabbitListener(queues = TradeMqConfig.DL_QUEUE_UPDATE_ORDER_STATUS, concurrency = "2")
+    @TenantIgnore
     public void processCheckUpdateOrderStatus(String data, Message message, Channel channel) throws IOException {
         log.error("收到订单/门票核销成功结果消息 orderId：" + data);
         try {
@@ -286,6 +299,7 @@ public class TradeMqReceiver {
     }
 
     @RabbitListener(queues = TradeMqConfig.DL_QUEUE_CHECK_NOTIFY, concurrency = "2")
+    @TenantIgnore
     public void processCheckDead(String data, Message message, Channel channel) throws IOException {
         log.debug("延迟核销MQ通知{}：", data);
         try {
@@ -305,6 +319,7 @@ public class TradeMqReceiver {
      * @throws IOException
      */
     @RabbitListener(queues = TradeMqConfig.ORDER_MARKETING_AUDIT, concurrency = "2")
+    @TenantIgnore
     public void marketingAudit(String data, Message message, Channel channel) throws IOException {
         log.info("政策审核MQ通知{}：", data);
         try {
@@ -327,6 +342,7 @@ public class TradeMqReceiver {
      * @throws IOException
      */
     @RabbitListener(queues = TradeMqConfig.DL_QUEUE_OTA_NOTIFY, concurrency = "2")
+    @TenantIgnore
     public void processOtaProductPriceStock(String data, Message message, Channel channel) throws IOException {
         log.error("收到推送Ota产品价格库存结果消息 ：" + data);
         try {

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/service/order/handler/SmsHandler.java

@@ -64,15 +64,7 @@ public class SmsHandler implements TradeOrderHandler{
             }
             for (SmsSendconfigQueryRespVO smsSendconfigQueryRespVO : list) {
                 if(smsSendconfigQueryRespVO.getMobile()!=null) {
-                    if(StringUtils.isNotBlank(smsSendconfigQueryRespVO.getChannelCode()) && StringUtils.equals("UNICOM",smsSendconfigQueryRespVO.getChannelCode())) {
-                        log.error("==================================================联通====================================================");
-                        sendMsg2(smsSendconfigQueryRespVO);
-                    }else if(StringUtils.isNotBlank(smsSendconfigQueryRespVO.getChannelCode()) && StringUtils.equals("CMCC",smsSendconfigQueryRespVO.getChannelCode())){
-                        sendMsg(smsSendconfigQueryRespVO);
-                    }else{
-                        log.error("==================================================测试====================================================");
-                        sendMsg3(smsSendconfigQueryRespVO);
-                    }
+                    sendMsg(smsSendconfigQueryRespVO);
                 }
             }
         }catch (Exception e){