Merge branches 'feature/20210728_购物车满赠优惠空判断_wuping' and 'qa' of…

Merge branches 'feature/20210728_购物车满赠优惠空判断_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa

order-management/src/main/java/cn/freemud/management/adapter/McCafeCouponAdapter.java

@@ -66,7 +66,7 @@ public class McCafeCouponAdapter {
         McdNetBatchQueryResponse mcdNetBatchQueryResponse = couponOfflineMCCafeClient.batchQuery(mcCafeCouponRequest);
         if (mcdNetBatchQueryResponse == null || !SUCCESS.equals(mcdNetBatchQueryResponse.getStatusCode())
                 || CollectionUtils.isEmpty(mcdNetBatchQueryResponse.getCouponlist())) {
-            logUtil.error("获取优惠券详情失败，无法核销,mcCafeCouponRequest:{},mcdNetBatchQueryResponse:{}", null,mcCafeCouponRequest, mcdNetBatchQueryResponse);
+            logUtil.error("","获取优惠券详情失败，无法核销,mcCafeCouponRequest:{},mcdNetBatchQueryResponse:{}", null,mcCafeCouponRequest, mcdNetBatchQueryResponse);
             return null;
         }
 

order-management/src/main/java/cn/freemud/management/service/handle/CouponHandle.java

@@ -43,7 +43,7 @@ public class CouponHandle {
                         break;
                     }
                     if (i == 0 && !RESPONSE_SUCCESS.equals(redeem.getStatusCode())) {
-                        logUtil.error("核销券码异常 mcCafeCouponRequest:{}, redeem:{}",null, mcCafeCouponRequest, redeem);
+                        logUtil.error("","核销券码异常 mcCafeCouponRequest:{}, redeem:{}",null, mcCafeCouponRequest, redeem);
                     }
                 }
             }
@@ -65,7 +65,7 @@ public class CouponHandle {
                         break;
                     }
                     if (i == 0 && !RESPONSE_SUCCESS.equals(response.getStatusCode())) {
-                        logUtil.error("解锁券码异常 mcCafeCouponLockRequest:{}, response:{}",null, mcCafeCouponLockRequest, response);
+                        logUtil.error("","解锁券码异常 mcCafeCouponLockRequest:{}, response:{}",null, mcCafeCouponLockRequest, response);
                     }
                 }
             }