处理日志显示

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

@@ -84,7 +84,7 @@ public class OrderCallBackMQService {
         //微信数据上传（创建新订单&支付成功时上传）
         sendWechatReportMQ(body);
         //上报发票信息
-        sendnvoiceReportMQ(body);
+        sendInvoiceReportMQ(body);
     }
     private void sendWechatReportMQ(OrderCallBackRequestVo body) {
         try {
@@ -228,9 +228,9 @@ 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 ;
         }
@@ -238,7 +238,7 @@ public class OrderCallBackMQService {
         if (
                 (
                         orderInfoReqs == null
-                        || !NewOrderStatus.PENDING_PAYMENT.getIndex().equals(orderInfoReqs.getOrderState())
+                        || !NewOrderStatus.PLACE_AN_ORDER.getIndex().equals(orderInfoReqs.getOrderState())
                         || orderInfoReqs.getBizType()!=1
                 )
                 && !InvoicePartnerIds.contains(orderInfoReqs.getPartnerId())
@@ -252,8 +252,9 @@ public class OrderCallBackMQService {
 
             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());
         }
     }
 }