opt@feature/20210720-购物车日志修改-张志恒:# 日志信息打印调整

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

@@ -24,12 +24,10 @@ import cn.freemud.entities.dto.UserLoginInfoDto;
 import cn.freemud.entities.dto.WechatReportOrderDto;
 import cn.freemud.entities.vo.OrderCallBackRequestVo;
 import cn.freemud.redis.RedisCache;
-import cn.freemud.utils.LogUtil;
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.freemud.api.assortment.datamanager.entity.db.AssortmentOpenPlatformWxapp;
 import com.freemud.api.assortment.datamanager.manager.AssortmentOpenPlatformWxappManager;
-import com.freemud.application.sdk.api.log.ErrorLog;
+import com.freemud.application.sdk.api.log.ApiLog;
 import com.freemud.application.sdk.api.ordercenter.enums.NewOrderStatus;
 import com.freemud.application.sdk.api.ordercenter.enums.OrderClientType;
 import com.freemud.application.sdk.api.ordercenter.enums.PayChannelType;
@@ -42,11 +40,9 @@ import com.freemud.sdk.api.assortment.orderdistributor.service.OrderDistribution
 import com.google.common.collect.Lists;
 import org.apache.commons.lang.ObjectUtils;
 import org.apache.commons.lang.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.commons.lang.exception.ExceptionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.ApplicationContext;
 import org.springframework.stereotype.Component;
 import org.springframework.util.CollectionUtils;
 
@@ -54,9 +50,6 @@ import java.util.*;
 
 @Component
 public class OrderCallBackMQService {
-    private static ApplicationContext context;
-    private static Logger logger = LoggerFactory.getLogger(OrderCallBackMQService.class);
-
     @Autowired
     private MQService mqService;
 
@@ -70,8 +63,6 @@ public class OrderCallBackMQService {
     private String invoicePartnerIds;
     private static final String backOrdersChangeOrderStatusConsumerQueue="program.backorders_change_order_status_consumer_queue";
     private static final String backOrdersNotifyActivityExchange="program.backorders_notify_activity_exchange";
-    @Autowired
-    private LogUtil logUtil;
     public void sendOrderMQ(OrderCallBackRequestVo body) {
         //发送订单回调
         Header header = new Header(MQAction.UPDATE.getAction(), "call-back-service-api",
@@ -102,6 +93,7 @@ public class OrderCallBackMQService {
      * @param body
      */
     public void revert(OrderCallBackRequestVo body){
+        ApiLog.infoMessage("activityReverse start orderCode:{}", body.getOrderCode());
         if (ObjectUtils.notEqual(body.getDelayMsgEventType(),2)){
             return;
         }
@@ -114,8 +106,9 @@ public class OrderCallBackMQService {
             Header header = new Header(MQAction.INSERT.getAction(), "backOrdersStatusChange", orderCode, backOrdersChangeOrderStatusConsumerQueue);
             MQMessage<OrderStatusChangeRequestDto> message = new MQMessage<>(header, requestDto);
             mqService.convertAndSend(backOrdersNotifyActivityExchange, backOrdersChangeOrderStatusConsumerQueue, message);
+            ApiLog.infoMessage("activityReverse end orderCode:{}", body.getOrderCode());
         } catch (Exception e) {
-            ErrorLog.errorConvertJson(this.getClass(),"activityReverseError:"+orderCode,e);
+            ApiLog.infoMessage("activityReverse Error orderCode:{} e:{}",e, body.getOrderCode(), ExceptionUtils.getFullStackTrace(e));
         }
     }
     private void sendWechatReportMQ(OrderCallBackRequestVo body) {
@@ -129,10 +122,10 @@ public class OrderCallBackMQService {
                         OrderCallBackConfig.QUEUE_ROUTING_KEY, OrderCallBackConfig.QUEUE_NAME);
                 MQMessage<WechatReportOrderDto> message = new MQMessage<>(header, wechatReportOrderDto);
                 mqService.convertAndSend(OrderCallBackConfig.TOPIC_EXCHANGE_NAME, OrderCallBackConfig.WECHAT_ORDER_REPORT_QUEUE_ROUTING_KEY, message);
-                logUtil.info("orderCode:{} queue:{} content:{}", orderInfoReqs.getOrderCode(), "wechat-report-queue", JSONObject.toJSONString(message));
             }
-        } catch (Exception ex) {
-            logUtil.error("sendWechatReportMQError OrderCode:{},OrderCallBackRequestVo:{}",ex,body.getOrderCode(),JSONObject.toJSONString(body));
+            ApiLog.infoMessage("sendWechatReportMQ end orderCode:{}", body.getOrderCode());
+        } catch (Exception e) {
+            ApiLog.infoMessage("sendWechatReportMQ Error orderCode:{} e:{}", body.getOrderCode(), ExceptionUtils.getFullStackTrace(e));
         }
     }
     private DisRequest convent2DisRequest(OrderCallBackRequestVo orderBean, Integer orderState) {
@@ -154,8 +147,8 @@ public class OrderCallBackMQService {
         OrderInfoReqs orderInfoReqs = null;
         try {
             orderInfoReqs = JSONObject.parseObject(body.getContent(), OrderInfoReqs.class);
-        } catch (Exception ex) {
-            logUtil.error(context.getEnvironment().getProperty("spring.application.name").concat("parseObjectOrderInfoReqsError,orderCode:{}"), ex,body.getOrderCode());
+        } catch (Exception e) {
+            ApiLog.infoMessage("getOrderInfoReqs parseObjectOrderInfoReqs Error,orderCode:{} e:{}", body.getOrderCode(), ExceptionUtils.getFullStackTrace(e));
             return null;
         }
         // 未支付订单不通知开放平台
@@ -182,8 +175,8 @@ public class OrderCallBackMQService {
                             (body.getOperateType() == 1 && NewOrderStatus.PLACE_AN_ORDER.getIndex().equals(orderInfoReqs.getOrderState())))) {
                 return orderInfoReqs;
             }
-        } catch (Exception ex) {
-            ErrorLog.errorDev(context.getEnvironment().getProperty("spring.application.name").concat("parseObjectOrderInfoReqsError,orderCode:{}"), ex,body.getOrderCode());
+        } catch (Exception e) {
+            ApiLog.infoMessage("getWechatReportOrderInfoReqs parseObjectOrderInfoReqs Error,orderCode:{} e:{}", body.getOrderCode(), ExceptionUtils.getFullStackTrace(e));
             return null;
         }
         return null;
@@ -278,8 +271,7 @@ public class OrderCallBackMQService {
      * @param body
      */
     private void sendInvoiceReportMQ(OrderCallBackRequestVo body) {
-
-        logUtil.info("callback send invoice report MQ:{},{}",body.getOrderCode(), JSON.toJSONString(body));
+        ApiLog.infoMessage("callback sendInvoiceReportMQ start orderCode:{}",body.getOrderCode());
         if (!ObjectUtils.equals("1", body.getMsgType()) || body.getOperateType() == null || body.getOperateType() == 2) {
             return ;
         }
@@ -296,9 +288,9 @@ public class OrderCallBackMQService {
 
             MQMessage<OrderInfoReqs> message = new MQMessage<>(header, orderInfoReqs);
             mqService.convertAndSend(OrderCallBackConfig.TOPIC_EXCHANGE_NAME, OrderCallBackConfig.INVOICE_ROUTE_KEY, message);
-            logUtil.info("callback send invoice mq orderCode={},mqRequest={}",body.getOrderCode(), JSON.toJSONString(orderInfoReqs));
+            ApiLog.infoMessage("callback sendInvoiceReportMQ end orderCode={}",body.getOrderCode());
         } catch (Exception e) {
-            logUtil.error("callback set invoice mq orderCode={}",e,orderInfoReqs.getOrderCode());
+            ApiLog.infoMessage("callback sendInvoiceReportMQ Error orderCode:{} e:{}", body.getOrderCode(), ExceptionUtils.getFullStackTrace(e));
         }
     }
 
@@ -308,7 +300,6 @@ public class OrderCallBackMQService {
      */
     public void revertParkingOrders(OrderCallBackRequestVo body){
         String orderCode=body.getOrderCode();
-        logUtil.info("parkingOrderBackOrdersStatusChange orderCode:{}", orderCode);
         OrderStatusChangeRequestDto requestDto = new OrderStatusChangeRequestDto();
         requestDto.setOid(orderCode);
         //2：未支付
@@ -317,8 +308,9 @@ public class OrderCallBackMQService {
             Header header = new Header(MQAction.INSERT.getAction(), "parkingOrderBackOrdersStatusChange", orderCode, backOrdersChangeOrderStatusConsumerQueue);
             MQMessage<OrderStatusChangeRequestDto> message = new MQMessage<>(header, requestDto);
             mqService.convertAndSend(backOrdersNotifyActivityExchange, backOrdersChangeOrderStatusConsumerQueue, message);
+            ApiLog.infoMessage("revertParkingOrders parkingOrderBackOrdersStatusChange end orderCode:{}", orderCode);
         } catch (Exception e) {
-            ErrorLog.errorConvertJson(this.getClass(),"parkingOrderBackOrdersStatusChange:"+orderCode,e);
+            ApiLog.infoMessage("revertParkingOrders parkingOrderBackOrdersStatusChange Error orderCode:{} e:{}", body.getOrderCode(), ExceptionUtils.getFullStackTrace(e));
         }
     }
 
@@ -344,16 +336,17 @@ public class OrderCallBackMQService {
             if (Objects.isNull(body) || StringUtils.isEmpty(body.getContent())) {
                 return;
             }
-            logUtil.info("send youshu report MQ orderCode:{} body:{} ", body.getOrderCode(), body);
+            ApiLog.infoMessage("send sendYoushuReportMQ start orderCode:{} ", body.getOrderCode());
             // 正常变化  订单正向操作  fisherman 检查下
             if (body.getOperateType() == 1 && "1".equals(body.getMsgType())) {
                 Header header = new Header(MQAction.UPDATE.getAction(), "call-back-service-api",
                         OrderCallBackConfig.SEND_YOUSHU_REPORT_QUEUE_ROUTING_KEY, OrderCallBackConfig.SEND_YOUSHU_REPORT_QUEUE);
                 MQMessage<OrderCallBackRequestVo> message = new MQMessage<>(header, body);
                 mqService.convertAndSend(OrderCallBackConfig.TOPIC_EXCHANGE_NAME, OrderCallBackConfig.SEND_YOUSHU_REPORT_QUEUE_ROUTING_KEY, message);
+                ApiLog.infoMessage("send sendYoushuReportMQ end orderCode:{}", body.getOrderCode());
             }
         }catch (Exception e){
-            logUtil.error("send youshu report MQ orderCode:{}", e,body.getOrderCode());
+            ApiLog.infoMessage("send sendYoushuReportMQ Error orderCode:{} e:{}", body.getOrderCode(), ExceptionUtils.getFullStackTrace(e));
         }
     }
 }

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

@@ -34,7 +34,7 @@ public class CallBackController {
     private OrderCallBackService orderCallBackService;
 
     @PostMapping("/order")
-    @ApiAnnotation(logMessage = "/order")
+    @ApiAnnotation(logMessage = "/callback/order")
     public BaseResponse orderCallBackHandle(@Valid @RequestBody @LogParams OrderCallBackRequestVo requestVo) {
         return orderCallBackService.orderCallBackHandle(requestVo);
     }