日志修改

order-application-service/src/main/java/cn/freemud/service/delivery/ThirdDeliveryServiceImpl.java

@@ -3,6 +3,7 @@ package cn.freemud.service.delivery;
 import cn.freemud.adapter.MessageNoticeAdapter;
 import cn.freemud.amp.service.ProduceMQService;
 import cn.freemud.base.entity.BaseResponse;
+import cn.freemud.base.log.ErrorLog;
 import cn.freemud.base.log.LogTreadLocal;
 import cn.freemud.entities.dto.delivery.*;
 import cn.freemud.entities.dto.ecology.*;
@@ -30,6 +31,7 @@ import com.freemud.application.sdk.api.deliverycenter.dto.CancelDeliveryOrderReq
 import com.freemud.application.sdk.api.deliverycenter.response.DeliveryInfoDto;
 import com.freemud.application.sdk.api.deliverycenter.response.DeliveryResponseDto;
 import com.freemud.application.sdk.api.deliverycenter.service.DeliveryService;
+import com.freemud.application.sdk.api.log.ApiLog;
 import com.freemud.application.sdk.api.log.LogThreadLocal;
 import com.freemud.application.sdk.api.ordercenter.enums.OrderClientType;
 import com.freemud.application.sdk.api.ordercenter.enums.OrderType;
@@ -138,7 +140,7 @@ public class ThirdDeliveryServiceImpl implements ThirdDeliveryService {
         OrderBaseResponse orderBaseResponseDto = orderCenterSdkService.updateDeliveryInfoById(requestDto);
         //订单服务修改配送单信息失败
         if (!SUCCESS_RESPONSE_CODE.equals(orderBaseResponseDto.getErrcode())) {
-            AppLogUtil.errorLog("updateDeliveryInfoById_error", JSONObject.toJSONString(requestDto), JSONObject.toJSONString(orderBaseResponseDto));
+            ApiLog.printLog("updateDeliveryInfoById_error", JSONObject.toJSONString(requestDto), JSONObject.toJSONString(orderBaseResponseDto), "");
             return ResponseUtil.success();
         }
         PosBaseRequestDto posBaseRequestDto = new PosBaseRequestDto();
@@ -410,11 +412,7 @@ public class ThirdDeliveryServiceImpl implements ThirdDeliveryService {
         message.setContent(content);
 
         pushMessageNoticeDto.setData(new Gson().toJson(message));
-        try {
-            messageNoticeClient.createMessage(pushMessageNoticeDto, LogThreadLocal.getTrackingNo());
-        }catch (Exception e){
-            AppLogUtil.errorLog("推送消息中心失败，订单编号:{}，失败原因：{}", orderId, "", e);
-        }
+        messageNoticeClient.createMessage(pushMessageNoticeDto, LogThreadLocal.getTrackingNo());
     }
 
     /**
@@ -552,37 +550,33 @@ public class ThirdDeliveryServiceImpl implements ThirdDeliveryService {
      * 通知生态发送调用消息
      */
     public void sendException(String orderId, String unusualReason, String unusualTime, String desc) {
-        try {
-            BaseQueryOrderRequest baseQueryOrderRequest = new BaseQueryOrderRequest();
-            baseQueryOrderRequest.setOrderId(orderId);
-            baseQueryOrderRequest.setTrackingNo(LogTreadLocal.getTrackingNo());
-            QueryOrderByIdResponse response = orderCenterSdkService.queryOrderById(baseQueryOrderRequest);
-            QueryOrdersResponse.DataBean.OrderBean orderBean = response.getData();
-            SubscribeMessageRequest request = new SubscribeMessageRequest();
-            OrderExtInfoDto extInfoDto = JSONObject.parseObject(orderBean.getExtInfo(), new TypeReference<OrderExtInfoDto>() {
-            });
-            String messageType = "UNUSUAL_ORDER";
-            if(deliveryEarlyWarningMsg.equals(desc)){
-                messageType = "DELIVERY_REMIND";
-                if(orderBean.getStatus() != null && OrderStatus.getByCode(orderBean.getStatus()) != null){
-                    desc = OrderStatus.getByCode(orderBean.getStatus()).getDesc();
-                }
+        BaseQueryOrderRequest baseQueryOrderRequest = new BaseQueryOrderRequest();
+        baseQueryOrderRequest.setOrderId(orderId);
+        baseQueryOrderRequest.setTrackingNo(LogTreadLocal.getTrackingNo());
+        QueryOrderByIdResponse response = orderCenterSdkService.queryOrderById(baseQueryOrderRequest);
+        QueryOrdersResponse.DataBean.OrderBean orderBean = response.getData();
+        SubscribeMessageRequest request = new SubscribeMessageRequest();
+        OrderExtInfoDto extInfoDto = JSONObject.parseObject(orderBean.getExtInfo(), new TypeReference<OrderExtInfoDto>() {
+        });
+        String messageType = "UNUSUAL_ORDER";
+        if (deliveryEarlyWarningMsg.equals(desc)) {
+            messageType = "DELIVERY_REMIND";
+            if (orderBean.getStatus() != null && OrderStatus.getByCode(orderBean.getStatus()) != null) {
+                desc = OrderStatus.getByCode(orderBean.getStatus()).getDesc();
             }
-            request.setMiniAppId(extInfoDto.getAppid());
-            SendMessageRequest sendMessageRequest = new SendMessageRequest();
-            sendMessageRequest.setMessageType(messageType);
-            sendMessageRequest.setMiniAppId(extInfoDto.getAppid());
-            sendMessageRequest.setOrderId(orderId);
-            sendMessageRequest.setPartnerId(orderBean.getCompanyId());
-            sendMessageRequest.setRemark(unusualReason);
-            sendMessageRequest.setStoreId(orderBean.getShopId());
-            sendMessageRequest.setOrderStatus(desc);
-            sendMessageRequest.setUtcTime(unusualTime);
-            SendMessageResponse sendMessageResponse = ecologyAdminApplicationClient.sendTemplateMessage(sendMessageRequest);
-            AppLogUtil.debugLotsParams("调用生态返回参数，订单编号:{},返回信息：{}", orderId, JSONObject.toJSONString(sendMessageResponse));
-        } catch (Exception e) {
-            AppLogUtil.errorLog("调用生态返回参数失败，订单编号:{}，失败原因：{}", orderId, "", e);
         }
+        request.setMiniAppId(extInfoDto.getAppid());
+        SendMessageRequest sendMessageRequest = new SendMessageRequest();
+        sendMessageRequest.setMessageType(messageType);
+        sendMessageRequest.setMiniAppId(extInfoDto.getAppid());
+        sendMessageRequest.setOrderId(orderId);
+        sendMessageRequest.setPartnerId(orderBean.getCompanyId());
+        sendMessageRequest.setRemark(unusualReason);
+        sendMessageRequest.setStoreId(orderBean.getShopId());
+        sendMessageRequest.setOrderStatus(desc);
+        sendMessageRequest.setUtcTime(unusualTime);
+        SendMessageResponse sendMessageResponse = ecologyAdminApplicationClient.sendTemplateMessage(sendMessageRequest);
+        AppLogUtil.debugLotsParams("调用生态返回参数，订单编号:{},返回信息：{}", orderId, JSONObject.toJSONString(sendMessageResponse));
     }
 
 

order-application-service/src/main/java/cn/freemud/service/impl/EvaluationServiceImpl.java

@@ -16,6 +16,7 @@ import cn.freemud.interceptor.ServiceException;
 import cn.freemud.service.EvaluationService;
 import cn.freemud.service.thirdparty.ActivityApplicationClient;
 import cn.freemud.utils.ResponseUtil;
+import com.alibaba.fastjson.JSON;
 import com.freemud.api.assortment.datamanager.entity.db.AssortmentOrderEvaluation;
 import com.freemud.api.assortment.datamanager.entity.db.AssortmentProductEvaluation;
 import com.freemud.api.assortment.datamanager.entity.dto.InsertOrderEvaluationReqDto;
@@ -101,7 +102,7 @@ public class EvaluationServiceImpl implements EvaluationService {
                 }
             }
         } catch (Exception ex) {
-            ErrorLog.printErrorLog("userOrderEvaluationNewError", "/order/userOrderEvaluationNew", request, ex);
+            ErrorLog.errorConvertJson(this.getClass(), "userOrderEvaluationNewError /order/userOrderEvaluationNew" + JSON.toJSONString(request), ex);
             return ResponseUtil.success(new OrderEvaluationStatus(EvaluationStatus.FAIL.getCode()));
         }
         return ResponseUtil.success(orderEvaluationStatus);

order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java

@@ -1321,23 +1321,19 @@ public class OrderServiceImpl implements Orderservice {
 
         //fisherman  【ID1032306】 【订单聚合层】总部和区域活动可同时生效
         BaseResponse<PayGiftCheckAndJoinResponseObj> payGiftBaseResponse;
-        try {
-            payGiftBaseResponse = activityApplicationClient.payGiftCheckAndJoinNew(payGitRequestDto);
-            AppLogUtil.infoLog("fisherman  总部和区域活动可同时生效 ", payGitRequestDto, payGiftBaseResponse);
-            if (String.valueOf(RESPONSE_SUCCESS_CODE).equals(payGiftBaseResponse.getCode()) && payGiftBaseResponse.getResult() != null) {
-                PayGiftCheckAndJoinResponseObj result = payGiftBaseResponse.getResult();
-                PayGiftCheckAndJoinResponseDto oldPayGift = result.getOldPayGift();
-                // fisherman 版本前 原参数保留，暂不变更 向下兼容
-                if (oldPayGift != null) {
-                    queryOrderResponseVo.setActivityName(oldPayGift.getActivityName());
-                    queryOrderResponseVo.setCoupons(oldPayGift.getCoupons());
-                    queryOrderResponseVo.setWechatCouponInfo(oldPayGift.getWechatCouponInfo());
-                    queryOrderResponseVo.setPayGiftReps(oldPayGift);
-                }
-                queryOrderResponseVo.setNewPayGift(result.getNewPayGift());
+        payGiftBaseResponse = activityApplicationClient.payGiftCheckAndJoinNew(payGitRequestDto);
+        AppLogUtil.infoLog("fisherman  总部和区域活动可同时生效 ", payGitRequestDto, payGiftBaseResponse);
+        if (String.valueOf(RESPONSE_SUCCESS_CODE).equals(payGiftBaseResponse.getCode()) && payGiftBaseResponse.getResult() != null) {
+            PayGiftCheckAndJoinResponseObj result = payGiftBaseResponse.getResult();
+            PayGiftCheckAndJoinResponseDto oldPayGift = result.getOldPayGift();
+            // fisherman 版本前 原参数保留，暂不变更 向下兼容
+            if (oldPayGift != null) {
+                queryOrderResponseVo.setActivityName(oldPayGift.getActivityName());
+                queryOrderResponseVo.setCoupons(oldPayGift.getCoupons());
+                queryOrderResponseVo.setWechatCouponInfo(oldPayGift.getWechatCouponInfo());
+                queryOrderResponseVo.setPayGiftReps(oldPayGift);
             }
-        }catch (Exception e){
-            AppLogUtil.errorLog("error to /promotionActivity/payGiftShareCheckAndJoin ", JSON.toJSONString(payGitRequestDto),null, e);
+            queryOrderResponseVo.setNewPayGift(result.getNewPayGift());
         }
     }