Merge branch 'feature/20210720-购物车日志修改-张志恒'

order-management/src/main/java/cn/freemud/management/annotations/LogIgnoreFeign.java

@@ -13,7 +13,7 @@ public @interface LogIgnoreFeign {
      * 是否打印日志，true打印，false不打印，注意设置成false状态码和状态码信息都不会打印
      * @return
      */
-    boolean printLog() default true;
+    boolean printLog() default false;
 
     /**
      * printLog 设置成true的时候，可以排除哪些状态码的响应不用打印响应报文，只会打印状态码

order-management/src/main/java/cn/freemud/management/controller/DeliveryOrderController.java

@@ -22,7 +22,7 @@ public class DeliveryOrderController {
     @Autowired
     private OrderDeliveryService orderDeliveryService;
 
-    @ApiAnnotation(logMessage = "创建配送单")
+    @ApiAnnotation(logMessage = "deliveryCreate")
     @ApiOperation(value = "创建配送单", notes = "创建配送单", produces = "application/json")
     @GetMapping("/delivery/create")
     public BaseResponse deliveryCreate(@RequestParam("orderCode") String orderCode

order-management/src/main/java/cn/freemud/management/controller/OrderManagerController.java

@@ -38,10 +38,10 @@ public class OrderManagerController {
     private OrderManagerAdapter orderManagerAdapter;
 
 
-    @ApiAnnotation(logMessage = "oms订单履单",printInfoLog = true)
+    @ApiAnnotation(logMessage = "statusOperate", printInfoLog = true)
     @ApiOperation(value = "oms订单履单", notes = "订单履单", produces = "application/json")
     @PostMapping("/statusOperate")
-    public BaseResponse deliveryCreate(@Validated @LogParams @RequestBody OrderManagerRequest request) {
+    public BaseResponse statusOperate(@Validated @LogParams @RequestBody OrderManagerRequest request) {
         OperateType byOpType = OperateType.getByOpType(request.getOperateType());
         if (byOpType==null){
             return ResponseUtil.error(ResponseResult.ORDER_OPERATE_TYPE_NOT_VALIDATE);
@@ -68,7 +68,7 @@ public class OrderManagerController {
         }
     }
 
-    @ApiAnnotation(logMessage = "麦咖啡订单入机")
+    @ApiAnnotation(logMessage = "mcCafeDeliveryCreate")
     @ApiOperation(value = "麦咖啡订单入机", notes = "麦咖啡订单入机", produces = "application/json")
     @PostMapping("/mcCafe/statusOperate")
     public BaseResponse mcCafeDeliveryCreate(@Validated @LogParams @RequestBody McCafeOrderManagerRequest request) {

order-management/src/main/java/cn/freemud/management/thirdparty/CouponOfflineMCCafeClient.java

@@ -19,31 +19,37 @@ public interface CouponOfflineMCCafeClient {
 
     @PostMapping("/mccafe/redeem")
     @LogIgnoreFeign(excludeStatusCodes = {ResponseCodeConstant.RESPONSE_SUCCESS_STR},
-            statusCodeFieldName = ResponseCodeKeyConstant.STATUS_CODE)
+            statusCodeFieldName = ResponseCodeKeyConstant.STATUS_CODE,
+            printLog = true)
     CouponRedeemResponse redeem(MCCafeCouponRequest mcCafeCouponRequest);
 
     @PostMapping("/mccafe/cancelRedeem")
     @LogIgnoreFeign(excludeStatusCodes = {ResponseCodeConstant.RESPONSE_SUCCESS_STR},
-            statusCodeFieldName = ResponseCodeKeyConstant.STATUS_CODE)
+            statusCodeFieldName = ResponseCodeKeyConstant.STATUS_CODE,
+            printLog = true)
     CouponRedeemResponse cancelRedeem(MCCafeCouponRequest mcCafeCouponRequest);
 
     @PostMapping("/mccafe/query")
     @LogIgnoreFeign(excludeStatusCodes = {ResponseCodeConstant.RESPONSE_SUCCESS_STR},
-            statusCodeFieldName = ResponseCodeKeyConstant.STATUS_CODE)
+            statusCodeFieldName = ResponseCodeKeyConstant.STATUS_CODE,
+            printLog = true)
     CouponQueryResponse query(MCCafeCouponRequest mcCafeCouponRequest);
 
     @PostMapping("/mccafe/batchQuery")
     @LogIgnoreFeign(excludeStatusCodes = {ResponseCodeConstant.RESPONSE_SUCCESS_STR},
-            statusCodeFieldName = ResponseCodeKeyConstant.STATUS_CODE)
+            statusCodeFieldName = ResponseCodeKeyConstant.STATUS_CODE,
+            printLog = true)
     McdNetBatchQueryResponse batchQuery(MCCafeCouponRequest mcCafeCouponRequest);
 
     @PostMapping("/mccafe/lock")
     @LogIgnoreFeign(excludeStatusCodes = {ResponseCodeConstant.RESPONSE_SUCCESS_STR},
-            statusCodeFieldName = ResponseCodeKeyConstant.STATUS_CODE)
+            statusCodeFieldName = ResponseCodeKeyConstant.STATUS_CODE,
+            printLog = true)
     CouponBaseResponse lock(MCCafeCouponLockRequest MCCafeCouponLockRequest);
 
     @PostMapping("/mccafe/unlock")
     @LogIgnoreFeign(excludeStatusCodes = {ResponseCodeConstant.RESPONSE_SUCCESS_STR},
-            statusCodeFieldName = ResponseCodeKeyConstant.STATUS_CODE)
+            statusCodeFieldName = ResponseCodeKeyConstant.STATUS_CODE,
+            printLog = true)
     CouponBaseResponse unlock(MCCafeCouponLockRequest MCCafeCouponLockRequest);
 }

order-management/src/main/java/cn/freemud/management/thirdparty/CustomerMcCafeClient.java

@@ -27,6 +27,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 public interface CustomerMcCafeClient {
 
     @PostMapping(value = "/customerextendservice/qujia/forbiddenCardCode")
-    @LogIgnoreFeign(excludeStatusCodes = {ResponseCodeConstant.RESPONSE_SUCCESS_STR})
+    @LogIgnoreFeign(excludeStatusCodes = {ResponseCodeConstant.RESPONSE_SUCCESS_STR}, printLog = true)
     BaseResponse forbiddenCardCodeForQujia(@RequestBody ForbiddenCardCodeRequest request);
 }

order-management/src/main/java/cn/freemud/management/thirdparty/DeliveryMCCafeClient.java

@@ -10,19 +10,20 @@ import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 
-@FeignClient(name = "DELIVERYCENTER",url="${delivery.center.feignUrl}")
+@FeignClient(name = "DELIVERYCENTER", url = "${delivery.center.feignUrl}")
 @RequestMapping(produces = {"application/json;charset=UTF-8"})
 public interface DeliveryMCCafeClient {
 
     // 配送停单
     @PostMapping("/delivery/halted")
-    @LogIgnoreFeign(excludeStatusCodes = {ResponseCodeConstant.RESPONSE_SUCCESS_STR}, messageFieldName = ResponseCodeKeyConstant.MSG)
+    @LogIgnoreFeign(excludeStatusCodes = {ResponseCodeConstant.RESPONSE_SUCCESS_STR}, messageFieldName = ResponseCodeKeyConstant.MSG, printLog = true)
     DeliveryResponseDto halted(DeliveryOrderHaltedRequest deliveryOrderHaltedRequest);
 
-    /**、
+    /**
+     * 、
      * 入机成功通知配送
      */
     @PostMapping("/delivery/assemblyack")
-    @LogIgnoreFeign(excludeStatusCodes = {ResponseCodeConstant.RESPONSE_SUCCESS_STR}, messageFieldName = ResponseCodeKeyConstant.MSG)
+    @LogIgnoreFeign(excludeStatusCodes = {ResponseCodeConstant.RESPONSE_SUCCESS_STR}, messageFieldName = ResponseCodeKeyConstant.MSG, printLog = true)
     DeliveryResponseDto assemblyAck(DeliveryOrderAssemblyackRequest request);
 }

order-management/src/main/java/cn/freemud/management/thirdparty/MulitiPaymentClient.java

@@ -25,7 +25,7 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RequestMapping;
 
-@FeignClient(name = "multi-pay-center-api",url = "${saas.paymentcenter.application.api.feign.url}")
+@FeignClient(name = "multi-pay-center-api", url = "${saas.paymentcenter.application.api.feign.url}")
 @RequestMapping(produces = {"application/json;charset=UTF-8"})
 public interface MulitiPaymentClient {
 
@@ -33,13 +33,13 @@ public interface MulitiPaymentClient {
      * 混合支付退款接口
      */
     @PostMapping("/payment/application/refund")
-    @LogIgnoreFeign(excludeStatusCodes = {ResponseCodeConstant.RESPONSE_SUCCESS_STR}, messageFieldName = ResponseCodeKeyConstant.MSG)
+    @LogIgnoreFeign(excludeStatusCodes = {ResponseCodeConstant.RESPONSE_SUCCESS_STR}, messageFieldName = ResponseCodeKeyConstant.MSG, printLog = true)
     MultiOrderRefundResponse paymentApplicationRefund(MultiOrderRefundRequest multiOrderRefundRequest, @RequestHeader("partnerId") String partnerId);
 
     /**
      * 批量支付退款
      */
     @PostMapping("/payment/application/batch/refund")
-    @LogIgnoreFeign(excludeStatusCodes = {ResponseCodeConstant.RESPONSE_SUCCESS_STR}, messageFieldName = ResponseCodeKeyConstant.MSG)
+    @LogIgnoreFeign(excludeStatusCodes = {ResponseCodeConstant.RESPONSE_SUCCESS_STR}, messageFieldName = ResponseCodeKeyConstant.MSG, printLog = true)
     PayBatchRefundResponse batchRefund(BatchOrderRefundV2Request batchOrderRefundV2Request);
 }

order-management/src/main/java/cn/freemud/management/thirdparty/OMSActivityClient.java

@@ -28,11 +28,15 @@ public interface OMSActivityClient {
 
     /**
      * 订单主动退款调促销接口
+     *
      * @param groupWorkRefundRequest
      * @return
      */
     @PostMapping("/activity/groupWork/refund")
-    @LogIgnoreFeign(excludeStatusCodes = {ResponseCodeConstant.RESPONSE_SUCCESS_STR}, statusCodeFieldName = ResponseCodeKeyConstant.STATUS_CODE, messageFieldName = ResponseCodeKeyConstant.MSG)
+    @LogIgnoreFeign(excludeStatusCodes = {ResponseCodeConstant.RESPONSE_SUCCESS_STR},
+            statusCodeFieldName = ResponseCodeKeyConstant.STATUS_CODE,
+            messageFieldName = ResponseCodeKeyConstant.MSG,
+            printLog = true)
     GroupWorkRefundResponse groupWorkRefund(GroupWorkRefundRequest groupWorkRefundRequest);
 
 }