Feign打印日志修改，assortment-messagepush-sdk升级

order-application-service/src/main/java/cn/freemud/annotations/LogIgnoreFeign.java

@@ -12,21 +12,13 @@ import java.lang.annotation.*;
 @Inherited
 public @interface LogIgnoreFeign {
 
-    /**
-     * 是否打印日志，true打印，false不打印，注意设置成false状态码和状态码信息都不会打印
-     * @return
-     */
-    boolean printLog() default false;
+    String logMessage() default "";  // 输出方法名称，用以识别：Apollo临时开关temp-print-body-log-methods
 
-    /**
-     * printLog 设置成true的时候，可以排除哪些状态码的响应不用打印响应报文，只会打印状态码
-     *
-     * @return
-     */
-    String[] excludeStatusCodes() default "100";
+    boolean printInfoLog() default false; // 若设置为true，则会永久打印
 
-    String statusCodeFieldName() default "code";
+    String[] excludeStatusCodes() default "100"; // 设置系统除了100/200等正常状态码之外，依然会打印响应报文
 
-    String messageFieldName() default "message";
+    String statusCodeFieldName() default "code"; // 兼容基础服务返回statusCode字段
 
+    String messageFieldName() default "message"; // 兼容基础服务返回message字段
 }

order-application-service/src/main/java/cn/freemud/aop/LogIgnoreFeignAspect.java

@@ -6,9 +6,8 @@ import cn.freemud.entities.vo.ThirdPartLogVo;
 import cn.freemud.utils.AppLogUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-import com.freemud.application.sdk.api.base.SDKCommonBaseContextWare;
-import com.freemud.application.sdk.api.log.LogThreadLocal;
 import com.freemud.application.sdk.api.log.ThirdPartyLog;
+import com.google.common.collect.Lists;
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.Signature;
 import org.aspectj.lang.annotation.Around;
@@ -20,6 +19,7 @@ import org.springframework.stereotype.Component;
 import org.springframework.util.StringUtils;
 
 import java.lang.reflect.Method;
+import java.util.List;
 
 /**
  * @author freemud
@@ -32,11 +32,18 @@ import java.lang.reflect.Method;
 @Aspect
 @Component
 public class LogIgnoreFeignAspect {
+
+    /**
+     * Apollo全局开关print-feign-response-body-log，一般是false，意思是全局都不打印响应报文，但是系统除了100/200等正常状态码之外，依然会打印响应报文，excludeStatusCodes = {ResponseCodeConstant.询问基础服务正常响应码}。
+     */
+    @Value("${print-feign-response-body-log:false}")
+    private volatile boolean printFeignResponseBodyLog = false;
+
     /**
-     * 是否打印响应报文日志，默认是false,若为true会覆盖注解里面的{@link LogIgnore}配置，输出响应报文里面所有的信息
+     * Apollo临时开关temp-feign-print-body-log-methods，平常都不想打印，只是偶尔想临时打印，使用添加logMessage = "aaa"的方法名称，用逗号拼接即可。
      */
-    @Value("${print-feign-response-body-log-order-application-service:true}")
-    private volatile boolean printFeignResponseBodyLog = true;
+    @Value("${temp-feign-print-body-log-methods:aaa,bbb}")
+    private volatile List<String> tempFeignPrintBodyLogMethods = Lists.newArrayList();
 
     @Pointcut("execution(* cn.freemud.service.thirdparty..*.*(..))")
     public void clientLog() {
@@ -61,15 +68,15 @@ public class LogIgnoreFeignAspect {
                 Method currentMethod = sig.getDeclaringType().getDeclaredMethod(msig.getName(), msig.getParameterTypes());
                 Object logReult = result;
                 ThirdPartLogVo thirdPartLogVo = AppLogUtil.createThirdPartLogVo(joinPoint);
-                String statusCodeValue = "ignore";
-                String messageValue = "ignore";
+                JSONObject json = JSON.parseObject(JSON.toJSONString(result));
+                String statusCodeValue = json.getString("code");
+                String messageValue = json.getString("message");
                 // 打印第三方出参日志   如果feign方法没有IgnoreFeignLogAnnotation注解,全部打日志,但是由于statusCodeValue = "ignore",是不是触发日志告警的
                 LogIgnoreFeign logIgnore = currentMethod.getAnnotation(LogIgnoreFeign.class);
                 if (logIgnore != null) {
-                    JSONObject json = JSON.parseObject(JSON.toJSONString(result));
                     statusCodeValue = json.getString(logIgnore.statusCodeFieldName());
                     messageValue = json.getString(logIgnore.messageFieldName());
-                    if (!this.printFeignResponseBodyLog && !logIgnore.printLog()) {
+                    if (!this.printFeignResponseBodyLog && !logIgnore.printInfoLog() && !this.tempFeignPrintBodyLogMethods.contains(logIgnore.logMessage())) {
                         //todo 当排除了这个状态码不打印响应的具体内容只会打印状态码和状态描述信息
                         String[] excludeStatusCodes = logIgnore.excludeStatusCodes();
                         if (!StringUtils.isEmpty(statusCodeValue) && this.containStatusCode(excludeStatusCodes, statusCodeValue)) {

order-application-service/src/main/java/cn/freemud/service/thirdparty/ActivityApplicationClient.java

@@ -32,7 +32,7 @@ public interface ActivityApplicationClient {
     /**
      * 付有礼活动验证与参与
      */
-    @LogIgnoreFeign
+    @LogIgnoreFeign(logMessage="payGiftCheckAndJoin")
     @PostMapping("/promotionActivity/payGiftCheckAndJoin")
     public BaseResponse<PayGiftCheckAndJoinResponseDto> payGiftCheckAndJoin(@RequestBody PayGitCheckAndJoinRequestDto requestVo);
 
@@ -42,7 +42,7 @@ public interface ActivityApplicationClient {
      * @param requestVo
      * @return
      */
-    @LogIgnoreFeign
+    @LogIgnoreFeign(logMessage="payGiftShareCheckAndJoin")
     @PostMapping("/promotionActivity/payGiftShareCheckAndJoin")
     BaseResponse<PayGiftCheckAndJoinResponseObj> payGiftCheckAndJoinNew(@RequestBody PayGitCheckAndJoinRequestDto requestVo);
 
@@ -50,7 +50,7 @@ public interface ActivityApplicationClient {
      * 查询可领券活动
      * 目前:  评价有礼活动使用
      */
-    @LogIgnoreFeign
+    @LogIgnoreFeign(logMessage="checkAndJoin")
     @PostMapping("/promotionActivity/evaluate/checkAndJoin")
     public BaseResponse<CheckAndJoinResponse> checkAndJoin(@RequestBody ActivityRequestCommon requestVo);
 

order-application-service/src/main/java/cn/freemud/service/thirdparty/CardBinClient.java

@@ -22,7 +22,7 @@ public interface CardBinClient {
      * @param requestDto
      * @return
      */
-    @LogIgnoreFeign(messageFieldName= ResponseCodeKeyConstant.MSG,statusCodeFieldName=ResponseCodeKeyConstant.STATUS_CODE)
+    @LogIgnoreFeign(messageFieldName= ResponseCodeKeyConstant.MSG,statusCodeFieldName=ResponseCodeKeyConstant.STATUS_CODE,logMessage="getAppKey")
     @PostMapping("/getAppKey")
     GetAppKeyResponseDto getAppKey(GetAppKeyRequestDto requestDto);
 
@@ -31,7 +31,7 @@ public interface CardBinClient {
      * @param requestDto
      * @return
      */
-    @LogIgnoreFeign(messageFieldName= ResponseCodeKeyConstant.MSG,statusCodeFieldName=ResponseCodeKeyConstant.STATUS_CODE)
+    @LogIgnoreFeign(messageFieldName= ResponseCodeKeyConstant.MSG,statusCodeFieldName=ResponseCodeKeyConstant.STATUS_CODE,logMessage="batchQueryActivityInfo")
     @PostMapping(value = "/batchQueryActivityInfo")
     BatchQueryActivityInfoResponseDto batchQueryActivityInfo(BatchQueryActivityInfoRequestDto requestDto);
 

order-application-service/src/main/java/cn/freemud/service/thirdparty/ComPayClient.java

@@ -33,14 +33,14 @@ public interface ComPayClient {
     /**
      * 混合支付统一下单
      */
-    @LogIgnoreFeign(messageFieldName= ResponseCodeKeyConstant.MSG)
+    @LogIgnoreFeign(logMessage="combPay",messageFieldName= ResponseCodeKeyConstant.MSG)
     @PostMapping("/payment/application/pay")
     CombPayResponse combPay(@RequestBody CombPayRequest combPayRequest, @RequestHeader("partnerId") String partnerId);
 
     /**
      * 混合支付查询接口
      */
-    @LogIgnoreFeign(messageFieldName= ResponseCodeKeyConstant.MSG)
+    @LogIgnoreFeign(logMessage="paymentApplicationQuery",messageFieldName= ResponseCodeKeyConstant.MSG)
     @PostMapping("/payment/application/query")
     MultiQueryRespDto<MultiQueryRespDto.Data>  paymentApplicationQuery(MultiQueryRequest multiQueryRequest, @RequestHeader("partnerId") Integer partnerId);
 

order-application-service/src/main/java/cn/freemud/service/thirdparty/CouponAdapterClient.java

@@ -31,7 +31,7 @@ public interface CouponAdapterClient {
      * @param couponAvailableReqVo
      * @return
      */
-    @LogIgnoreFeign(statusCodeFieldName= ResponseCodeKeyConstant.STATUS_CODE_result)
+    @LogIgnoreFeign(logMessage="getCouponsAvailable",statusCodeFieldName= ResponseCodeKeyConstant.STATUS_CODE_result)
     @PostMapping("/getCouponsAvailable")
     CouponAvailableRespDto getCouponsAvailable(CouponAvailableReqVo couponAvailableReqVo);
 

order-application-service/src/main/java/cn/freemud/service/thirdparty/CouponOfflineClient.java

@@ -11,7 +11,7 @@ import org.springframework.web.bind.annotation.PostMapping;
 public interface CouponOfflineClient {
 
 
-    @LogIgnoreFeign(messageFieldName= ResponseCodeKeyConstant.MSG,statusCodeFieldName=ResponseCodeKeyConstant.STATUS_CODE)
+    @LogIgnoreFeign(logMessage="verification",messageFieldName= ResponseCodeKeyConstant.MSG,statusCodeFieldName=ResponseCodeKeyConstant.STATUS_CODE)
     @PostMapping("/api")
     CouponCodeResponseDto verification(CouponCodeVerificationDto couponCodeVerificationDto);
 }

order-application-service/src/main/java/cn/freemud/service/thirdparty/CouponOnlineClient.java

@@ -29,13 +29,13 @@ public interface CouponOnlineClient {
     @PostMapping(value = "/code_v4", produces = MediaType.APPLICATION_JSON_UTF8_VALUE,
             consumes = {MediaType.APPLICATION_FORM_URLENCODED_VALUE}
     )
-    @LogIgnoreFeign(messageFieldName= ResponseCodeKeyConstant.MSG,statusCodeFieldName=ResponseCodeKeyConstant.STATUS_CODE)
+    @LogIgnoreFeign(logMessage="getCouponDetails",messageFieldName= ResponseCodeKeyConstant.MSG,statusCodeFieldName=ResponseCodeKeyConstant.STATUS_CODE)
     GetCouponDetailResponseDto getCouponDetails(@RequestParam Map<String, ?> map);
 
     /**
      * 查询券详情
      */
-    @LogIgnoreFeign(messageFieldName= ResponseCodeKeyConstant.MSG,statusCodeFieldName=ResponseCodeKeyConstant.STATUS_CODE)
+    @LogIgnoreFeign(logMessage="invalidCoupons",messageFieldName= ResponseCodeKeyConstant.MSG,statusCodeFieldName=ResponseCodeKeyConstant.STATUS_CODE)
     @PostMapping(value = "/coupon/state/invalid/coupons")
     InvalidCouponsResponseDto invalidCoupons(@RequestBody InvalidCouponsRequestDto invalidCouponsRequestDto);
 }

order-application-service/src/main/java/cn/freemud/service/thirdparty/CustomScoreClient.java

@@ -29,7 +29,7 @@ public interface CustomScoreClient {
     /**
      * 用户可用积分
      */
-    @LogIgnoreFeign
+    @LogIgnoreFeign(logMessage="getUserScoreUseDetail")
     @PostMapping(value = "/user/scoreUseDetail")
     GetUserScoreUserDetailDto getUserScoreUseDetail(@RequestBody GetUserScoreUseDetailVo getUserScoreUseDetailVo);
 }

order-application-service/src/main/java/cn/freemud/service/thirdparty/CustomerApplicationClient.java

@@ -24,7 +24,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 public interface CustomerApplicationClient {
 
     // TODO: 21-4-1 带合并
-    @LogIgnoreFeign
+    @LogIgnoreFeign(logMessage="purchasePaid")
     @PostMapping(value = "membercard/purchasePaid")
     BaseResponse purchasePaid(PurchasePaidRequestDto requestDto);
 

order-application-service/src/main/java/cn/freemud/service/thirdparty/CustomerClient.java

@@ -94,7 +94,7 @@ public interface CustomerClient {
     /**
      * 查询收货地址详情
      */
-    @LogIgnoreFeign
+    @LogIgnoreFeign(logMessage="getMemberExtendInfo")
     @PostMapping(value = "/customerservice/extend/getMemberExtendInfo")
     BaseResponse<GetMemberExtendInfoResponseDto>
             getMemberExtendInfo(@RequestBody GetMemberExtendInfoRequestDto extendInfoRequest);

order-application-service/src/main/java/cn/freemud/service/thirdparty/CustomerExtendClient.java

@@ -28,15 +28,15 @@ public interface CustomerExtendClient {
     /**
      * 会员优惠券列表
      */
-    @LogIgnoreFeign
+    @LogIgnoreFeign(logMessage="getMemberCouponListRequestDto")
     @PostMapping(value = "/customerextendservice/coupon/getCoupons")
     GetMemberCouponListResponseDto getMemberCouponListRequestDto(@RequestBody GetMemberCouponListRequestDto getMemberCouponListRequestDto);
 
-    @LogIgnoreFeign
+    @LogIgnoreFeign(logMessage="sendCouponForqujia")
     @PostMapping(value = "/customerextendservice/qujia/receiveCard")
     SendCouponForqujiaDtoResponseDto sendCouponForqujia(@RequestBody SendCouponForqujiaRequestDto request);
 
-    @LogIgnoreFeign
+    @LogIgnoreFeign(logMessage="b2bReceiveCard")
     @PostMapping(value = "/customerextendservice/qujia/b2breceiveCard")
     B2bReceiveCardResponseDto b2bReceiveCard(@RequestBody B2bReceiveCardRequestDto request);
 }

order-application-service/src/main/java/cn/freemud/service/thirdparty/DeliveryFeiginClient.java

@@ -16,35 +16,35 @@ import org.springframework.web.bind.annotation.RequestBody;
 public interface DeliveryFeiginClient {
 
     @PostMapping("/deliveryLogisticsAmount/queryDeliveryAmount")
-    @LogIgnoreFeign(messageFieldName=ResponseCodeKeyConstant.MSG)
+    @LogIgnoreFeign(logMessage="queryDeliveryAmount",messageFieldName=ResponseCodeKeyConstant.MSG)
     QueryDeliveryAmountResponseDto queryDeliveryAmount(@RequestBody QueryDeliveryAmountRequestDto request);
 
     @PostMapping("/delivery/orderRemind")
-    @LogIgnoreFeign(messageFieldName=ResponseCodeKeyConstant.MSG)
+    @LogIgnoreFeign(logMessage="orderRemind",messageFieldName=ResponseCodeKeyConstant.MSG)
     QueryDeliveryAmountResponseDto orderRemind(@RequestBody OrderRemindRequestDto request);
 
     @PostMapping("/delivery/listFreeRider")
-    @LogIgnoreFeign(messageFieldName=ResponseCodeKeyConstant.MSG)
+    @LogIgnoreFeign(logMessage="listFreeRider",messageFieldName=ResponseCodeKeyConstant.MSG)
     MCCafeDeliveryBaseResponse<ResRiderTrackDto> listFreeRider(@RequestBody QueryLocusRiderTrackDto request);
 
     @PostMapping("/delivery/create")
-    @LogIgnoreFeign(messageFieldName=ResponseCodeKeyConstant.MSG)
+    @LogIgnoreFeign(logMessage="deliveryOrderAdd",messageFieldName=ResponseCodeKeyConstant.MSG)
     CreateDeliveryOrderResponseDto deliveryOrderAdd(@RequestBody CreateDeliveryVo request);
 
     @PostMapping("/delivery/getDeliveryStatusAndRiderPosition")
-    @LogIgnoreFeign(messageFieldName=ResponseCodeKeyConstant.MSG)
+    @LogIgnoreFeign(logMessage="getDeliveryStatusAndRiderPosition",messageFieldName=ResponseCodeKeyConstant.MSG)
     DeliveryBaseResponse<DeliveryStatusAndRiderPositionDto> getDeliveryStatusAndRiderPosition(@RequestBody QueryDeliveryBaseRequest queryDeliveryBaseRequest);
 
     @PostMapping("/delivery/getThirdDeliveryFlag")
-    @LogIgnoreFeign(messageFieldName=ResponseCodeKeyConstant.MSG)
+    @LogIgnoreFeign(logMessage="getThirdDeliveryFlag",messageFieldName=ResponseCodeKeyConstant.MSG)
     DeliveryBaseResponse<GetDeliveryFlagResponseDto> getThirdDeliveryFlag(@RequestBody GetDeliveryFlagRequest getDeliveryFlagRequest);
 
     @PostMapping("/delivery/queryDeliveryTemplate")
-    @LogIgnoreFeign(messageFieldName=ResponseCodeKeyConstant.MSG)
+    @LogIgnoreFeign(logMessage="queryDeliveryTemplate",messageFieldName=ResponseCodeKeyConstant.MSG)
     QueryDeliveryTemplateResponse queryDeliveryTemplate(@RequestBody QueryDeliveryTemplateRequest queryDeliveryTemplateRequest);
 
     @PostMapping("/delivery/isFreightRefundSupported")
-    @LogIgnoreFeign(messageFieldName=ResponseCodeKeyConstant.MSG)
+    @LogIgnoreFeign(logMessage="isFreightRefundSupported",messageFieldName=ResponseCodeKeyConstant.MSG)
     QueryFreightRefundSupportedResponse isFreightRefundSupported(@RequestBody QueryFreightRefundSupportedVo queryDeliveryTemplateVo);
 
 

order-application-service/src/main/java/cn/freemud/service/thirdparty/EcologyAdminApplicationClient.java

@@ -22,19 +22,19 @@ public interface EcologyAdminApplicationClient {
     /**
      * 获取虚拟门店
      */
-    @LogIgnoreFeign
+    @LogIgnoreFeign(logMessage="getBuyBindVirtualStore")
     @PostMapping(value = "ecology/api/app/info/getBuyBindVirtualStore", produces = MediaType.APPLICATION_JSON_VALUE ,consumes = MediaType.APPLICATION_JSON_VALUE )
     BaseResponse<VirtualBindStoreResponse> getBuyBindVirtualStore(@RequestBody VirtualStoreRequest virtualStoreRequest);
 
-    @LogIgnoreFeign
+    @LogIgnoreFeign(logMessage="getAuthorizerAccessToken")
     @PostMapping(value = "/ecology/api/getAuthorizerAccessToken")
     GetTokenResponseDto getAuthorizerAccessToken(@RequestBody GetAuthorizerRequestDto request);
 
-    @LogIgnoreFeign
+    @LogIgnoreFeign(logMessage="subscribeMessage")
     @PostMapping(value = "/ecology/api/subscribeMessage/send")
     SubscribeMessageResponse subscribeMessage(SubscribeMessageRequest request);
 
-    @LogIgnoreFeign
+    @LogIgnoreFeign(logMessage="sendTemplateMessage")
     @PostMapping(value = "/ecology/api/templateMessage/send")
     SendMessageResponse sendTemplateMessage(SendMessageRequest request);
 }

order-application-service/src/main/java/cn/freemud/service/thirdparty/FMAssistantCloudPrintClient.java

@@ -17,7 +17,7 @@ public interface FMAssistantCloudPrintClient {
     /**
      * 申请退款小票打印
      */
-    @LogIgnoreFeign
+    @LogIgnoreFeign(logMessage="applyRefundPrint")
     @PostMapping(value = "/assistant/cloudPrint/applyRefund/print")
     BaseResponse applyRefundPrint(@RequestBody OrderPrintDto orderPrintDto);
 }

order-application-service/src/main/java/cn/freemud/service/thirdparty/MicroOpenplatformClient.java

@@ -30,7 +30,7 @@ public interface MicroOpenplatformClient {
      * @param orderCounts
      * @return
      */
-    @LogIgnoreFeign
+    @LogIgnoreFeign(logMessage="addOrderSum")
     @PostMapping("/thirdApp/order/addOrderSum")
     BaseResponse addOrderSum(@RequestBody SendOrderCountsMsg orderCounts);
 
@@ -40,7 +40,7 @@ public interface MicroOpenplatformClient {
      *
      * @return
      */
-    @LogIgnoreFeign
+    @LogIgnoreFeign(logMessage="getFilterPartner")
     @PostMapping("/thirdApp/getFilterPartner")
     BaseResponse<GetFilterPartnerResponse> getFilterPartner(@RequestBody OrderGetPartnerRequest request);
 

order-application-service/src/main/java/cn/freemud/service/thirdparty/PaymentNewClient.java

@@ -29,7 +29,7 @@ public interface PaymentNewClient {
     /**
      * 扫脸支付
      */
-    @LogIgnoreFeign
+    @LogIgnoreFeign(logMessage="facePay")
     @PostMapping("paymentcenter/facePay")
     com.freemud.application.sdk.api.base.BaseResponse<FacePayResponseDto> facePay(@RequestBody FacePayRequestDto orderPayDto);
 

order-application-service/src/main/java/cn/freemud/service/thirdparty/PosClient.java

@@ -28,21 +28,21 @@ public interface PosClient {
     /**
      * 配送
      */
-    @LogIgnoreFeign
+    @LogIgnoreFeign(logMessage="posSend")
     @PostMapping("/order/order/Send")
     BaseResponse posSend(@RequestBody PosBaseRequestDto requestDto);
 
     /**
      * 完成
      */
-    @LogIgnoreFeign
+    @LogIgnoreFeign(logMessage="posAffirm")
     @PostMapping("/order/order/Affirm")
     BaseResponse posAffirm(@RequestBody PosBaseRequestDto requestDto);
 
     /**
      * 骑手接单推送POS服务
      */
-    @LogIgnoreFeign
+    @LogIgnoreFeign(logMessage="deliveryRiderStatus")
     @PostMapping("/order/delivery/riderStatus")
     BaseResponse deliveryRiderStatus(@RequestBody PosBaseRequestDto request);
 }

order-application-service/src/main/java/cn/freemud/service/thirdparty/PromotionActivityClient.java

@@ -45,7 +45,7 @@ public interface PromotionActivityClient {
     /**
      * 增加分享裂变活动的分享记录
      */
-    @LogIgnoreFeign
+    @LogIgnoreFeign(logMessage="shareRecord")
     @PostMapping("/activities/share/record")
     BaseResponse shareRecord(@RequestBody ShareAcitivityRequestDto createActivityRecordDto);
 
@@ -70,7 +70,7 @@ public interface PromotionActivityClient {
     /**
      * 根据活动ID查询活动信息
      */
-    @LogIgnoreFeign
+    @LogIgnoreFeign(logMessage="getActivity")
     @GetMapping("/activities/share/getActivity")
     ActivityGetByIdResponseDto getById(@RequestParam("activityId") Long activityId);
 
@@ -101,7 +101,7 @@ public interface PromotionActivityClient {
     /**
      * 获取活动id
      */
-    @LogIgnoreFeign
+    @LogIgnoreFeign(logMessage="queryValidShareActivity")
     @PostMapping("/activities/share/queryValidShareActivity")
     BaseResponse queryValidShareActivity(@RequestBody QueryValidShareActivityReq activityReq);
 

order-application-service/src/main/java/cn/freemud/service/thirdparty/PromotionDiscountClient.java

@@ -38,21 +38,21 @@ public interface PromotionDiscountClient {
      * @param calculationDiscountRequestDto
      * @return
      */
-    @LogIgnoreFeign(messageFieldName= ResponseCodeKeyConstant.MSG,statusCodeFieldName=ResponseCodeKeyConstant.STATUS_CODE)
+    @LogIgnoreFeign(logMessage="calculationDiscountSharing",messageFieldName= ResponseCodeKeyConstant.MSG,statusCodeFieldName=ResponseCodeKeyConstant.STATUS_CODE)
     @PostMapping("/calculation/discount/sharing")
     ActivityCalculationDiscountResponseDto calculationDiscountSharing(CalculationDiscountRequestDto calculationDiscountRequestDto);
 
     /**
      * 统一活动查询接口
      */
-    @LogIgnoreFeign(messageFieldName= ResponseCodeKeyConstant.MSG,statusCodeFieldName=ResponseCodeKeyConstant.STATUS_CODE)
+    @LogIgnoreFeign(logMessage="activityQuery",messageFieldName= ResponseCodeKeyConstant.MSG,statusCodeFieldName=ResponseCodeKeyConstant.STATUS_CODE)
     @PostMapping("/activity/query")
     ActivityQueryResponseDto query(ActivityQueryRequestDto activityQueryRequestDto);
 
     /**
      * 优惠金额计算
      */
-    @LogIgnoreFeign(messageFieldName= ResponseCodeKeyConstant.MSG,statusCodeFieldName=ResponseCodeKeyConstant.STATUS_CODE)
+    @LogIgnoreFeign(logMessage="calculationDiscount",messageFieldName= ResponseCodeKeyConstant.MSG,statusCodeFieldName=ResponseCodeKeyConstant.STATUS_CODE)
     @PostMapping("/calculation/discount")
     CalculationDiscountResponseDto calculationDiscount(CalculationDiscountRequestDto calculationDiscountRequestDto);
 
@@ -62,7 +62,7 @@ public interface PromotionDiscountClient {
      * @param groupWorkQueryRequest
      * @return
      */
-    @LogIgnoreFeign(messageFieldName= ResponseCodeKeyConstant.MSG,statusCodeFieldName=ResponseCodeKeyConstant.STATUS_CODE)
+    @LogIgnoreFeign(logMessage="groupWorkQuery",messageFieldName= ResponseCodeKeyConstant.MSG,statusCodeFieldName=ResponseCodeKeyConstant.STATUS_CODE)
     @PostMapping("/groupWork/query")
     GroupWorkQueryResponse groupWorkQuery(GroupWorkQueryRequest groupWorkQueryRequest);
 
@@ -72,7 +72,7 @@ public interface PromotionDiscountClient {
      * @param groupWorkJoinRequest
      * @return
      */
-    @LogIgnoreFeign(messageFieldName= ResponseCodeKeyConstant.MSG,statusCodeFieldName=ResponseCodeKeyConstant.STATUS_CODE)
+    @LogIgnoreFeign(logMessage="groupWorkJoin",messageFieldName= ResponseCodeKeyConstant.MSG,statusCodeFieldName=ResponseCodeKeyConstant.STATUS_CODE)
     @PostMapping("/activity/groupWork/join")
     GroupWorkJoinResponse groupWorkJoin(GroupWorkJoinRequest groupWorkJoinRequest);
 
@@ -81,7 +81,7 @@ public interface PromotionDiscountClient {
      * @param querySpellGroupRequest
      * @return
      */
-    @LogIgnoreFeign(messageFieldName= ResponseCodeKeyConstant.MSG,statusCodeFieldName=ResponseCodeKeyConstant.STATUS_CODE)
+    @LogIgnoreFeign(logMessage="queryByGroupId",messageFieldName= ResponseCodeKeyConstant.MSG,statusCodeFieldName=ResponseCodeKeyConstant.STATUS_CODE)
     @PostMapping("/activity/groupWork/queryByGroupId")
     QuerySpellGroupVoResponse queryByGroupId(QuerySpellGroupRequest querySpellGroupRequest);
 
@@ -90,7 +90,7 @@ public interface PromotionDiscountClient {
      * @param querySpellGroupRequest
      * @return
      */
-    @LogIgnoreFeign(messageFieldName= ResponseCodeKeyConstant.MSG,statusCodeFieldName=ResponseCodeKeyConstant.STATUS_CODE)
+    @LogIgnoreFeign(logMessage="queryHistory",messageFieldName= ResponseCodeKeyConstant.MSG,statusCodeFieldName=ResponseCodeKeyConstant.STATUS_CODE)
     @PostMapping("/activity/groupWork/queryHistory")
     QueryHistoryGroupVOResponse queryHistory(QueryGroupHistoryRequest querySpellGroupRequest);
 

order-application-service/src/main/java/cn/freemud/service/thirdparty/ShoppingCartClient.java

@@ -33,7 +33,7 @@ public interface ShoppingCartClient {
      * @param request
      * @return
      */
-    @LogIgnoreFeign
+    @LogIgnoreFeign(logMessage="addShoppingCart")
     @PostMapping(value = "/add?lang=zh_CN")
     ShoppingCartInfoDto addShoppingCart(@RequestBody AddShoppingCartRequestDto request);
 
@@ -42,7 +42,7 @@ public interface ShoppingCartClient {
      * @param request
      * @return
      */
-    @LogIgnoreFeign
+    @LogIgnoreFeign(logMessage="updateShoppingCart")
     @PostMapping(value = "/updateCartInfo?lang=zh_CN")
     ShoppingCartBaseResponse updateShoppingCart(@RequestBody UpdateShoppingCartRequestDto request);
 
@@ -51,7 +51,7 @@ public interface ShoppingCartClient {
      * @param request
      * @return
      */
-    @LogIgnoreFeign
+    @LogIgnoreFeign(logMessage="getShoppingCart")
     @PostMapping(value = "/detail?lang=zh_CN")
     ShoppingCartInfoDto getShoppingCart(@RequestBody GetShoppingCartDto request);
 
@@ -61,7 +61,7 @@ public interface ShoppingCartClient {
      * @param request
      * @return
      */
-    @LogIgnoreFeign
+    @LogIgnoreFeign(logMessage="clearShoppingCart")
     @PostMapping(value = "/clearCartGoods?lang=zh_CN")
     ShoppingCartBaseResponse clearShoppingCart(@RequestBody NewShoppingCartClearDto request);
 
@@ -71,7 +71,7 @@ public interface ShoppingCartClient {
      * @param request
      * @return
      */
-    @LogIgnoreFeign
+    @LogIgnoreFeign(logMessage="clearMCCafeShoppingCart")
     @PostMapping(value = "/MCoffee/clearCartGoods?lang=zh_CN")
     ShoppingCartBaseResponse clearMCCafeShoppingCart(@RequestBody NewShoppingCartClearDto request);
 
@@ -80,49 +80,49 @@ public interface ShoppingCartClient {
      * @param request
      * @return
      */
-    @LogIgnoreFeign
+    @LogIgnoreFeign(logMessage="removeProduct")
     @PostMapping(value = "/remove?lang=zh_CN")
     ShoppingCartBaseResponse removeProduct(@RequestBody RemoveShoppingCartRequestDto request);
 
     /**
      * 获取购物车详情，包含均摊信息
      */
-    @LogIgnoreFeign
+    @LogIgnoreFeign(logMessage="getShoppingCartGoodsApportionNew")
     @PostMapping(value = "/getShoppingCartGoodsApportion?lang=zh_CN")
     BaseResponse<ShoppingCartGoodsDto> getShoppingCartGoodsApportionNew(@RequestBody GetShoppingCartGoodsApportionDto getShoppingCartGoodsApportionDto);
 
     /**
      * 麦咖啡获取购物车详情，包含均摊信息
      */
-    @LogIgnoreFeign
+    @LogIgnoreFeign(logMessage="getMCCafeShoppingCartGoodsApportionNew")
     @PostMapping(value = "/MCoffee/getShoppingCartGoodsApportion?lang=zh_CN")
     BaseResponse<ShoppingCartGoodsDto> getMCCafeShoppingCartGoodsApportionNew(@RequestBody GetShoppingCartGoodsApportionDto getShoppingCartGoodsApportionDto);
 
     /**
      * 获取拼单订单购物车详情，包含均摊信息
      */
-    @LogIgnoreFeign
+    @LogIgnoreFeign(logMessage="getCollageShoppingCartGoodsApportion")
     @PostMapping(value = "/collage/getShoppingCartGoodsApportion?lang=zh_CN")
     BaseResponse<ShoppingCartGoodsDto> getCollageShoppingCartGoodsApportion(@RequestBody GetShoppingCartGoodsApportionDto getShoppingCartGoodsApportionDto);
 
     /**
      * 清空拼单购物车
      */
-    @LogIgnoreFeign
+    @LogIgnoreFeign(logMessage="clearCollageOrder")
     @PostMapping(value = "/collage/clearOrder?lang=zh_CN")
     BaseResponse clearCollageOrder(@RequestBody NewShoppingCartClearDto newShoppingCartClearDto);
 
     /**
      * 更新拼单信息
      */
-    @LogIgnoreFeign
+    @LogIgnoreFeign(logMessage="updateCollageOrder")
     @PostMapping(value = "/collage/updateOrder?lang=zh_CN")
     BaseResponse updateCollageOrder(@RequestBody CollageOrderDto collageOrderDto);
 
     /**
      * 获取拼单状态信息
      */
-    @LogIgnoreFeign
+    @LogIgnoreFeign(logMessage="getCollageOrderStatus")
     @PostMapping(value = "/collage/getOrderStatus?lang=zh_CN")
     BaseResponse<Integer> getCollageOrderStatus(@RequestBody CollageOrderDto collageOrderDto);
 

order-application-service/src/main/java/cn/freemud/service/thirdparty/StoreBackstageClient.java

@@ -19,7 +19,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 @RequestMapping(consumes = MediaType.APPLICATION_JSON_UTF8_VALUE, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
 public interface StoreBackstageClient {
 
-    @LogIgnoreFeign
+    @LogIgnoreFeign(logMessage="pushOrderStore")
     @PostMapping("/orderStore/pushOrderStore")
     BaseResponse pushOrderStore(@RequestBody PushOrderStoreDto request);
 

order-application-service/src/main/java/cn/freemud/service/thirdparty/StoreBaseApiClient.java

@@ -20,7 +20,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 @RequestMapping(value = "/store", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
 public interface StoreBaseApiClient {
 
-    @LogIgnoreFeign
+    @LogIgnoreFeign(logMessage="queryDeliverDetail")
     @PostMapping(value = "/delivery/calcDeliveryData")
     StoreCBaseResponse<StoreCBaseResponseDto> queryDeliverDetail(@RequestBody StoreInfoRequestDto request);
 }

order-application-service/src/main/java/cn/freemud/service/thirdparty/StoreItemClient.java

@@ -34,21 +34,21 @@ public interface StoreItemClient {
      * 获取门店特定时间段菜单分类
      */
     @PostMapping(value = "/Menu/GetMenu")
-    @LogIgnoreFeign(messageFieldName= ResponseCodeKeyConstant.ERR_MSG,statusCodeFieldName=ResponseCodeKeyConstant.ERR_CODE)
+    @LogIgnoreFeign(logMessage="getMenuCategory",messageFieldName= ResponseCodeKeyConstant.ERR_MSG,statusCodeFieldName=ResponseCodeKeyConstant.ERR_CODE)
     GetMenuResponseDto getMenuCategory(@RequestBody GetMenuCategoryInfoDto getMenuCategoryInfoDto);
 
     /**
      * 根据spu或单品ID查询菜单
      * 根据商品id查询门店特定时间段菜单
      */
-    @LogIgnoreFeign(messageFieldName= ResponseCodeKeyConstant.ERR_MSG,statusCodeFieldName=ResponseCodeKeyConstant.ERR_CODE)
+    @LogIgnoreFeign(logMessage="getMenuCategoryByIds",messageFieldName= ResponseCodeKeyConstant.ERR_MSG,statusCodeFieldName=ResponseCodeKeyConstant.ERR_CODE)
     @PostMapping(value = "/Menu/GetMenuByIds")
     GetMenuByIdsResponseDto getMenuCategoryByIds(@RequestBody GetMenuCategoryByIdsDto getMenuCategoryByIdsDto);
 
     /**
      * 获取商品的详细信息
      */
-    @LogIgnoreFeign(messageFieldName= ResponseCodeKeyConstant.ERR_MSG,statusCodeFieldName=ResponseCodeKeyConstant.ERR_CODE)
+    @LogIgnoreFeign(logMessage="listProductInfos",messageFieldName= ResponseCodeKeyConstant.ERR_MSG,statusCodeFieldName=ResponseCodeKeyConstant.ERR_CODE)
     @PostMapping("/Shop/ListProductInfoByIdList")
     ProductInfosDto listProductInfos(@RequestBody GetProductInfoDto getProductInfoDto);
 
@@ -58,7 +58,7 @@ public interface StoreItemClient {
      * 根据skuid查询spu信息
      * @return
      */
-    @LogIgnoreFeign(messageFieldName= ResponseCodeKeyConstant.ERR_MSG,statusCodeFieldName=ResponseCodeKeyConstant.ERR_CODE)
+    @LogIgnoreFeign(logMessage="getSpuIdsBySkuIds",messageFieldName= ResponseCodeKeyConstant.ERR_MSG,statusCodeFieldName=ResponseCodeKeyConstant.ERR_CODE)
     @PostMapping("/Product/GetSpectionProductBySkuId")
     ProductListDto getSpuIdsBySkuIds(@RequestBody GetSpuIdsBySkuIdsDto requestDto);
 
@@ -68,7 +68,7 @@ public interface StoreItemClient {
      * @param request
      * @return
      */
-    @LogIgnoreFeign(messageFieldName= ResponseCodeKeyConstant.ERR_MSG,statusCodeFieldName=ResponseCodeKeyConstant.ERR_CODE)
+    @LogIgnoreFeign(logMessage="findDishWareProductList",messageFieldName= ResponseCodeKeyConstant.ERR_MSG,statusCodeFieldName=ResponseCodeKeyConstant.ERR_CODE)
     @PostMapping(value = "/Shop/ListDishwareProduct", produces = MediaType.APPLICATION_JSON_UTF8_VALUE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
     ShopBaseResponseDto<List<ProductListDto.DataBean>> findDishWareProductList(@RequestBody GetShopDishWareProductDto request);
 
@@ -76,7 +76,7 @@ public interface StoreItemClient {
     /**
      * 校验商品在当前门店是否可售
      */
-    @LogIgnoreFeign(messageFieldName= ResponseCodeKeyConstant.ERR_MSG,statusCodeFieldName=ResponseCodeKeyConstant.ERR_CODE)
+    @LogIgnoreFeign(logMessage="validateShopContainProduct",messageFieldName= ResponseCodeKeyConstant.ERR_MSG,statusCodeFieldName=ResponseCodeKeyConstant.ERR_CODE)
     @PostMapping("/Shop/validateShopContainProduct")
     ValidateProductInfosDto validateShopContainProduct(@RequestBody GetValidateProductInfoDto getProductInfoDto);
 

order-application-service/src/main/java/cn/freemud/service/thirdparty/SvcComPayClient.java

@@ -21,7 +21,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 @RequestMapping(produces = {"application/json;charset=UTF-8"})
 public interface SvcComPayClient {
 
-    @LogIgnoreFeign
+    @LogIgnoreFeign(logMessage="queryAssociationPaymentFlagPartnerSetting")
     @PostMapping("/paymentmanager/partnerSetting/queryAssociationPaymentFlagPartnerSetting")
     SvcComPayResponseDto query(SvcComPayRequestDto svcComPayRequestDto);
 }

order-application-service/src/main/java/cn/freemud/service/thirdparty/WeChatClient.java

@@ -77,7 +77,7 @@ public interface WeChatClient {
     @PostMapping(value = "wxa/business/groupBuy/createOrder?access_token={accessToken}",
             produces = MediaType.APPLICATION_JSON_VALUE,
             consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
-    @LogIgnoreFeign(messageFieldName= ResponseCodeKeyConstant.ERR_MSG,statusCodeFieldName=ResponseCodeKeyConstant.ERR_CODE)
+    @LogIgnoreFeign(logMessage="groupBuyCreateOrder",messageFieldName= ResponseCodeKeyConstant.ERR_MSG,statusCodeFieldName=ResponseCodeKeyConstant.ERR_CODE)
     GroupBuyResponse groupBuyCreateOrder(@PathVariable("accessToken") String accessToken, @RequestBody GroupBuyRequest groupBuyRequest);
 
 }

order-management/pom.xml

@@ -82,7 +82,7 @@
         <dependency>
             <groupId>com.freemud.sdk.api.assortment</groupId>
             <artifactId>assortment-messagepush-sdk</artifactId>
-            <version>2.7.2.RELEASE</version>
+            <version>2.7.3.RELEASE</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

order-management/src/main/java/cn/freemud/management/service/OrderBaseService.java

@@ -4,6 +4,10 @@ import cn.freemud.management.adapter.MessagePushAdapter;
 import cn.freemud.management.enums.DeliveryStatus;
 import cn.freemud.management.enums.OperateType;
 import cn.freemud.management.enums.OrderSource;
+import com.alibaba.fastjson.JSONObject;
+import com.freemud.application.sdk.api.base.BaseResponse;
+import com.freemud.application.sdk.api.constant.ResponseResultEnum;
+import com.freemud.application.sdk.api.log.ApiLog;
 import com.freemud.application.sdk.api.log.ErrorLog;
 import com.freemud.application.sdk.api.log.LogThreadLocal;
 import com.freemud.application.sdk.api.structure.request.PushMessageNoticeDto;
@@ -66,7 +70,10 @@ public class OrderBaseService {
         try {
             messageTemplateRequest = messagePushAdapter.convent2MessageTemplateRequest(orderBean, reason, opType);
             if (messageTemplateRequest!=null && messageTemplateRequest.getMessageEventType() != null) {
-                this.messageTemplatePushService.sendTemplateMsg(messageTemplateRequest);
+                BaseResponse baseResponse = messageTemplatePushService.sendTemplateMsg(messageTemplateRequest);
+                if(baseResponse != null && !ResponseResultEnum.SUCCESS.getCode().equals(baseResponse.getCode())){
+                    ApiLog.printLog("sendTemplateMsg",orderBean.getOid(), JSONObject.toJSONString(baseResponse),null);
+                }
             }
         } catch (Exception e) {
             ErrorLog.printErrorLog("sendTemplateMsgError", "", messageTemplateRequest, e);