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

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

@@ -49,6 +49,7 @@ import org.springframework.stereotype.Component;
 import org.springframework.util.CollectionUtils;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 
@@ -68,7 +69,7 @@ public class OrderCallBackMQService {
     @Autowired
     private AssortmentOpenPlatformWxappManager openPlatformWxappManager;
     @Value("${saas.order.invoice.report.partnerIds}")
-    private String InvoicePartnerIds;
+    private String invoicePartnerIds;
 
     public void sendOrderMQ(OrderCallBackRequestVo body) {
         //发送订单回调
@@ -84,7 +85,7 @@ public class OrderCallBackMQService {
         //微信数据上传（创建新订单&支付成功时上传）
         sendWechatReportMQ(body);
         //上报发票信息
-        sendnvoiceReportMQ(body);
+        sendInvoiceReportMQ(body);
     }
     private void sendWechatReportMQ(OrderCallBackRequestVo body) {
         try {
@@ -228,32 +229,28 @@ public class OrderCallBackMQService {
      *  只上报普通订单
      * @param body
      */
-    private void sendnvoiceReportMQ(OrderCallBackRequestVo body) {
+    private void sendInvoiceReportMQ(OrderCallBackRequestVo body) {
 
-        log.info("sendnvoiceReportMQ:{},{}",body.getOrderCode(), JSON.toJSONString(body));
+        log.info("callback send invoice report MQ:{},{}",body.getOrderCode(), JSON.toJSONString(body));
         if (!ObjectUtils.equals("1", body.getMsgType()) || body.getOperateType() == null || body.getOperateType() == 2) {
             return ;
         }
         OrderInfoReqs orderInfoReqs = JSONObject.parseObject(body.getContent(), OrderInfoReqs.class);
-        if (
-                (
-                        orderInfoReqs == null
-                        || !NewOrderStatus.PENDING_PAYMENT.getIndex().equals(orderInfoReqs.getOrderState())
-                        || orderInfoReqs.getBizType()!=1
-                )
-                && !InvoicePartnerIds.contains(orderInfoReqs.getPartnerId())
-        ) {
+        if (orderInfoReqs==null
+                || !Arrays.asList(invoicePartnerIds.split(",")).contains(orderInfoReqs.getPartnerId())
+                || !NewOrderStatus.PLACE_AN_ORDER.getIndex().equals(orderInfoReqs.getOrderState())
+                || orderInfoReqs.getBizType()!=1)  {
             return;
         }
-
         try {
             Header header = new Header("report", "call-back-service-api",
                     OrderCallBackConfig.INVOICE_ROUTE_KEY, OrderCallBackConfig.INVOICE_QUEUE);
 
             MQMessage<OrderInfoReqs> message = new MQMessage<>(header, orderInfoReqs);
             mqService.convertAndSend(OrderCallBackConfig.INVOICE_EXCHANGE, OrderCallBackConfig.INVOICE_ROUTE_KEY, message);
+            log.info("callback send invoice mq orderCode={},mqRequest={}",body.getOrderCode(), JSON.toJSONString(orderInfoReqs));
         } catch (Exception e) {
-            log.error("setInvoice,orderCode={}",orderInfoReqs.getOrderCode(),e.toString());
+            log.error("callback set invoice mq orderCode={},exception={}",orderInfoReqs.getOrderCode(),e.toString());
         }
     }
 }