Merge remote-tracking branch 'remotes/origin/feature/1.9.20_发票上报' into develop

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

@@ -33,7 +33,6 @@ public class OrderCallBackConfig {
     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_EXCHANGE = "invoice-report-topic-exchange";
     public static final String INVOICE_QUEUE = "invoice-report-queue";
     public static final String INVOICE_ROUTE_KEY = "invoice-report-queue-routing-key";
     /**
@@ -105,7 +104,7 @@ public class OrderCallBackConfig {
      */
     @Bean(name = "invoiceExchange")
     public Exchange invoiceExchange() {
-        return ExchangeBuilder.topicExchange(INVOICE_EXCHANGE).durable(true).build();
+        return ExchangeBuilder.topicExchange(TOPIC_EXCHANGE_NAME).durable(true).build();
     }
     @Bean(name="invoiceQueue")
     public Queue invoiceQueue() {

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

@@ -247,7 +247,7 @@ public class OrderCallBackMQService {
                     OrderCallBackConfig.INVOICE_ROUTE_KEY, OrderCallBackConfig.INVOICE_QUEUE);
 
             MQMessage<OrderInfoReqs> message = new MQMessage<>(header, orderInfoReqs);
-            mqService.convertAndSend(OrderCallBackConfig.INVOICE_EXCHANGE, OrderCallBackConfig.INVOICE_ROUTE_KEY, message);
+            mqService.convertAndSend(OrderCallBackConfig.TOPIC_EXCHANGE_NAME, OrderCallBackConfig.INVOICE_ROUTE_KEY, message);
             log.info("callback send invoice mq orderCode={},mqRequest={}",body.getOrderCode(), JSON.toJSONString(orderInfoReqs));
         } catch (Exception e) {
             log.error("callback set invoice mq orderCode={},exception={}",orderInfoReqs.getOrderCode(),e.toString());

call-back-service/src/main/java/cn/freemud/service/impl/ToolsServiceImpl.java

@@ -81,7 +81,7 @@ public class ToolsServiceImpl implements ToolsService {
                         OrderCallBackConfig.INVOICE_ROUTE_KEY, OrderCallBackConfig.INVOICE_QUEUE);
 
                 MQMessage<String> message = new MQMessage<>(header, JSON.toJSONString(reqs));
-                mqService.convertAndSend(OrderCallBackConfig.INVOICE_EXCHANGE, OrderCallBackConfig.INVOICE_ROUTE_KEY, message);
+                mqService.convertAndSend(OrderCallBackConfig.TOPIC_EXCHANGE_NAME, OrderCallBackConfig.INVOICE_ROUTE_KEY, message);
             }
         }
         return new BaseResponse("1","100","写入MQ："+orderTotal);