Merge branches 'feature/20210712_支付宝订单状态推送_wuping' and 'master' of…

Merge branches 'feature/20210712_支付宝订单状态推送_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group

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

@@ -40,6 +40,10 @@ public class OrderCallBackConfig {
     public static final String SEND_YOUSHU_REPORT_QUEUE_ROUTING_KEY="send-youshu-report-queue-routing-key";
     public static final String SEND_YOUSHU_REPORT_QUEUE="send-youshu-report-queue";
 
+    // 支付宝订单状态推送　tapd需求id 1032865
+    public static final String ZFB_ORDER_SEND_QUEUE_ROUTING_KEY="zfb-order-send-queue-routing-key";
+    public static final String ZFB_ORDER_SEND_QUEUE="zfb-order-send-queue";
+
     /**
      * 定义基于Fanout 的Exchange。
      * 基于这个代码，也可以非常方便的定义其他的Exchange类型。

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

@@ -23,6 +23,7 @@ import cn.freemud.entities.dto.OrderStatusChangeRequestDto;
 import cn.freemud.entities.dto.UserLoginInfoDto;
 import cn.freemud.entities.dto.WechatReportOrderDto;
 import cn.freemud.entities.vo.OrderCallBackRequestVo;
+import cn.freemud.entities.vo.OrderInfo;
 import cn.freemud.redis.RedisCache;
 import cn.freemud.utils.LogUtil;
 import com.alibaba.fastjson.JSON;
@@ -95,6 +96,9 @@ public class OrderCallBackMQService {
         }
         // 有数订单数据上报 & 每日下单门店统计
         sendYoushuReportMQ(body);
+
+        //支付宝订单状态变更上报
+        sendzfbOrderMQ(body);
     }
 
     /**
@@ -358,4 +362,26 @@ public class OrderCallBackMQService {
             logUtil.error("send youshu report MQ 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());
+        }
+    }
 }

call-back-service/src/main/resources/application.properties

@@ -7,6 +7,7 @@ spring.apollo.enable=true
 app.id=SHOP_OPEN_STORE
 apollo.meta=http://212.129.229.203
 env=dev
+apollo.cluster=local
 apollo.bootstrap.enabled=true
 apollo.bootstrap.namespaces=i_callback_service,micro_progeram_commons
 spring.main.allow-bean-definition-overriding=true