Merge branch 'KA-订单MQ功能迁移-zxh'

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

@@ -28,21 +28,28 @@ public class OrderCallBackConfig {
     public static final String OPEN_PLATFORM_ORDER_STATUS_CHANGE_PUSH_QUEUE_NAME = "open-platform-order-status-change-push-queue";
     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_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";
+    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";
 
     public static final String INVOICE_QUEUE = "invoice-report-queue";
     public static final String INVOICE_ROUTE_KEY = "invoice-report-queue-routing-key";
 
     // 腾讯有数上报 & 门店营业开店记录  发送到 ordercenter-order组的 mq中
-    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";
+    @Deprecated
+    public static final String SEND_YOUSHU_REPORT_QUEUE_ROUTING_KEY = "send-youshu-report-queue-routing-key";
+    @Deprecated
+    public static final String SEND_YOUSHU_REPORT_QUEUE = "send-youshu-report-queue";
+
+
+    // task-center-order-consumer服务 订单状态处理中心queue
+    public static final String ORDER_STATUS_PROCESS_CENTER_QUEUE_ROUTING_KEY = "order_status_process_center_queue-routing-key";
+    public static final String ORDER_STATUS_PROCESS_CENTER_QUEUE = "order_status_process_center_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";
+    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。
@@ -109,23 +116,27 @@ public class OrderCallBackConfig {
 
     /**
      * 发票queue绑定设置
+     *
      * @return
      */
     @Bean(name = "invoiceExchange")
     public Exchange invoiceExchange() {
         return ExchangeBuilder.topicExchange(TOPIC_EXCHANGE_NAME).durable(true).build();
     }
-    @Bean(name="invoiceQueue")
+
+    @Bean(name = "invoiceQueue")
     public Queue invoiceQueue() {
         return QueueBuilder.durable(INVOICE_QUEUE).build();
     }
+
     @Bean
-    Binding bindingInvoiceQueue(@Qualifier("invoiceQueue") Queue invoiceQueue,@Qualifier("invoiceExchange") Exchange invoiceExchange) {
+    Binding bindingInvoiceQueue(@Qualifier("invoiceQueue") Queue invoiceQueue, @Qualifier("invoiceExchange") Exchange invoiceExchange) {
         return BindingBuilder.bind(invoiceQueue).to(invoiceExchange).with(INVOICE_ROUTE_KEY).noargs();
     }
 
     /**
-     *  有数上报/ 支付门店 queue 绑定
+     * 有数上报/ 支付门店 queue 绑定
+     *
      * @return
      */
     @Bean(name = "sendWechatReportQueue")
@@ -137,4 +148,20 @@ public class OrderCallBackConfig {
     Binding bindingSendWechatReportQueue(@Qualifier("sendWechatReportQueue") Queue sendWechatReportQueue, @Qualifier("topicExchange") Exchange topicExchange) {
         return BindingBuilder.bind(sendWechatReportQueue).to(topicExchange).with(SEND_YOUSHU_REPORT_QUEUE_ROUTING_KEY).noargs();
     }
+
+
+    /**
+     * 有数上报/ 支付门店 queue 绑定
+     *
+     * @return
+     */
+    @Bean(name = "orderStatusProcessCenterQueue")
+    public Queue orderStatusProcessCenterQueue() {
+        return QueueBuilder.durable(ORDER_STATUS_PROCESS_CENTER_QUEUE).build();
+    }
+
+    @Bean
+    Binding bindingOrderStatusProcessCenterQueue(@Qualifier("orderStatusProcessCenterQueue") Queue orderStatusProcessCenterQueue, @Qualifier("topicExchange") Exchange topicExchange) {
+        return BindingBuilder.bind(orderStatusProcessCenterQueue).to(topicExchange).with(ORDER_STATUS_PROCESS_CENTER_QUEUE_ROUTING_KEY).noargs();
+    }
 }

call-back-service/src/main/java/cn/freemud/controller/CallBackController.java

@@ -35,10 +35,10 @@ public class CallBackController {
     private OrderCallBackService orderCallBackService;
 
     @PostMapping("/order")
-    @ApiAnnotation(logMessage = "/callback/order",printRequestLog = false)
+    @ApiAnnotation(logMessage = "/callback/order", printRequestLog = false)
     public BaseResponse orderCallBackHandle(@Valid @RequestBody @LogParams OrderCallBackRequestVo requestVo) {
-        ApiLog.infoMessage("orderCallBackHandle start url:{} orderCode:{} requestId:{}","/callback/order",
-                requestVo.getOrderCode(),requestVo.getRequestId());
+        ApiLog.infoMessage("orderCallBackHandle start url:{} orderCode:{} requestId:{} orderstate:{}", "/callback/order",
+                requestVo.getOrderCode(), requestVo.getRequestId(), requestVo.getOrderState());
         return orderCallBackService.orderCallBackHandle(requestVo);
     }