Merge branch 'feature/20230726_支付宝数据上报_wuping' of…

Merge branch 'feature/20230726_支付宝数据上报_wuping' of https://gitlab.freemud.com/order-group-application/order-group

call-back-service/src/main/java/cn/freemud/amp/service/OrderCallBackMQService.java

@@ -104,7 +104,7 @@ public class OrderCallBackMQService {
         this.sendOrderStatusProcessCenterMQ(body);
 
         //支付宝订单状态变更上报
-        sendzfbOrderMQ(body);
+//        sendzfbOrderMQ(body);
     }
 
     /**
@@ -410,25 +410,25 @@ public class OrderCallBackMQService {
         }
     }
 
-    private void sendzfbOrderMQ(OrderCallBackRequestVo body) {
-        try {
-            if (Objects.isNull(body) || StringUtils.isEmpty(body.getContent())) {
-                return;
-            }
-            if (OrderClientType.ALIPAY.getIndex() != body.getOrderClient()) {
-                return;
-            }
-            logUtil.info("sendzfbOrderMQ orderCode:{} ", body.getOrderCode());
-
-            // 支付宝订单状态推送　tapd需求id 1032865
-            if ("1".equals(body.getMsgType())) {
-                Header header = new Header(MQAction.UPDATE.getAction(), "call-back-service-api",
-                        null, OrderCallBackConfig.ZFB_ORDER_SEND_QUEUE);
-                MQMessage<OrderCallBackRequestVo> message = new MQMessage<>(header, body);
-                mqService.convertAndSend(OrderCallBackConfig.TOPIC_EXCHANGE_NAME, OrderCallBackConfig.ZFB_ORDER_SEND_QUEUE_ROUTING_KEY, message);
-            }
-        } catch (Exception e) {
-            logUtil.error("", "sendzfbOrderMQ orderCode:{} ", e, body.getOrderCode());
-        }
-    }
+//    private void sendzfbOrderMQ(OrderCallBackRequestVo body) {
+//        try {
+//            if (Objects.isNull(body) || StringUtils.isEmpty(body.getContent())) {
+//                return;
+//            }
+//            if (OrderClientType.ALIPAY.getIndex() != body.getOrderClient()) {
+//                return;
+//            }
+//            logUtil.info("sendzfbOrderMQ orderCode:{} ", body.getOrderCode());
+//
+//            // 支付宝订单状态推送　tapd需求id 1032865
+//            if ("1".equals(body.getMsgType())) {
+//                Header header = new Header(MQAction.UPDATE.getAction(), "call-back-service-api",
+//                        null, OrderCallBackConfig.ZFB_ORDER_SEND_QUEUE);
+//                MQMessage<OrderCallBackRequestVo> message = new MQMessage<>(header, body);
+//                mqService.convertAndSend(OrderCallBackConfig.TOPIC_EXCHANGE_NAME, OrderCallBackConfig.ZFB_ORDER_SEND_QUEUE_ROUTING_KEY, message);
+//            }
+//        } catch (Exception e) {
+//            logUtil.error("", "sendzfbOrderMQ orderCode:{} ", e, body.getOrderCode());
+//        }
+//    }
 }