Merge remote-tracking branch 'remotes/origin/feature/15_配送信息remark' into develop

call-back-service/pom.xml

@@ -81,7 +81,7 @@
         <dependency>
             <groupId>com.freemud.sdk.api.assortment</groupId>
             <artifactId>assortment-dynamic-queue</artifactId>
-            <version>1.4.RELEASE</version>
+            <version>1.6.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>cn.freemud</groupId>

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

@@ -29,6 +29,9 @@ public class OrderCallBackConfig {
     public static final String OPEN_PLATFORM_ORDER_STATUS_CHANGE_PUSH_ROUTING_KEY = "open-platform-order-status-change-routing-key";
 
     public static final String WECHAT_REPORT_QUEUE_ROUTING_KEY="wechat-report-queue-routing-key";
+    //微信订单上传
+    public static final String WECHAT_ORDER_REPORT_QUEUE_ROUTING_KEY="wechat-order-report-queue-routing-key";
+    public static final String WECHAT_ORDER_REPORT_QUEUE="wechat-order-report-queue";
 
     /**
      * 定义基于Fanout 的Exchange。
@@ -78,6 +81,16 @@ public class OrderCallBackConfig {
         return BindingBuilder.bind(orderStatusChangeQueue).to(topicExchange).with(OPEN_PLATFORM_ORDER_STATUS_CHANGE_PUSH_ROUTING_KEY).noargs();
     }
 
+    @Bean(name = "wechatOrderReportQueue")
+    public Queue wechatOrderReportQueue() {
+        return QueueBuilder.durable(WECHAT_ORDER_REPORT_QUEUE).build();
+    }
+
+    @Bean
+    Binding bindingWechatOrderReportQueue(@Qualifier("wechatOrderReportQueue") Queue wechatOrderReportQueue, @Qualifier("topicExchange") Exchange topicExchange) {
+        return BindingBuilder.bind(wechatOrderReportQueue).to(topicExchange).with(WECHAT_ORDER_REPORT_QUEUE_ROUTING_KEY).noargs();
+    }
+
     @Bean
     public OrderCallBackMQService orderMQService() {
         return new OrderCallBackMQService();

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

@@ -88,7 +88,7 @@ public class OrderCallBackMQService {
                 Header header = new Header(MQAction.UPDATE.getAction(), "call-back-service-api",
                         OrderCallBackConfig.QUEUE_ROUTING_KEY, OrderCallBackConfig.QUEUE_NAME);
                 MQMessage<WechatReportOrderDto> message = new MQMessage<>(header, wechatReportOrderDto);
-                mqService.convertAndSend(OrderCallBackConfig.TOPIC_EXCHANGE_NAME, OrderCallBackConfig.WECHAT_REPORT_QUEUE_ROUTING_KEY, message);
+                mqService.convertAndSend(OrderCallBackConfig.TOPIC_EXCHANGE_NAME, OrderCallBackConfig.WECHAT_ORDER_REPORT_QUEUE_ROUTING_KEY, message);
                 logger.info("orderCode:{} queue:{} content:{}", new Object[]{orderInfoReqs.getOrderCode(), "wechat-report-queue", JSONObject.toJSONString(message)});
             }
         } catch (Exception ex) {

order-application-service/src/main/java/cn/freemud/service/delivery/ThirdDeliveryServiceImpl.java

@@ -89,6 +89,7 @@ public class ThirdDeliveryServiceImpl implements ThirdDeliveryService {
         requestDto.setExpressChannelName(request.getChannelName());
         requestDto.setExpressNo(request.getChannelDeliveryId());
         requestDto.setOrderSubState(deliveryStatus);
+        requestDto.setRemark("配送:"+request.getRemark());
         OrderBaseResponse orderBaseResponseDto = orderCenterSdkService.updateDeliveryInfoById(requestDto);
         //订单服务修改配送单信息失败
         if (!SUCCESS_RESPONSE_CODE.equals(orderBaseResponseDto.getErrcode())) {