opt@qa_20210705:#合并代码 处理冲突

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java

@@ -82,6 +82,7 @@ import com.freemud.sdk.api.assortment.shoppingcart.enums.BusinessTypeEnum;
 import com.freemud.sdk.api.assortment.shoppingcart.request.CheckCartRequest;
 import com.freemud.sdk.api.assortment.shoppingcart.service.ShoppingCartBaseService;
 import com.freemud.sdk.api.assortment.shoppingcart.service.impl.ShoppingCartBaseServiceImpl;
+import com.freemud.sdk.api.assortment.shoppingcart.util.ShoppingSdkLogUtil;
 import com.google.common.collect.Lists;
 import javafx.util.Pair;
 import ma.glasnost.orika.MapperFacade;
@@ -720,9 +721,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
                     , deliveryAmount
                     , null);
 //            ApiLog.info("fisherman 新算价 配送费字段数据 01 ",calculationSharingDiscountResult,shoppingCartGoodsResponseVo);
-            if(ApplicationConstant.printDebug){
-                ApiLog.printLog("批量使用优惠券前，oldCoupons,coupons", JSON.toJSONString(calculationSharingDiscountResult),JSON.toJSONString(shoppingCartGoodsResponseVo),null);
-            }
+            ShoppingSdkLogUtil.debugLog("批量使用优惠券前，oldCoupons,coupons", JSON.toJSONString(calculationSharingDiscountResult),JSON.toJSONString(shoppingCartGoodsResponseVo),null);
             sharingCartService.distribute(calculationSharingDiscountResult
                     , cartGoodsList
                     , shoppingCartGoodsResponseVo
@@ -738,9 +737,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
                     , userId
                     , storeId);
 //            ApiLog.info("fisherman 新算价 配送费字段数据 02 ",null,shoppingCartGoodsResponseVo);shoppingCartGoodsResponseVo
-            if(ApplicationConstant.printDebug){
-                ApiLog.printLog("fisherman 新算价 配送费字段数据 02 ",JSON.toJSONString(shoppingCartGoodsResponseVo), null,null);
-            }
+            ShoppingSdkLogUtil.debugLog("fisherman 新算价 配送费字段数据 02 ",JSON.toJSONString(shoppingCartGoodsResponseVo), null,null);
             buildShoppingCartGoodsResponse(shoppingCartGoodsResponseVo,calculationSharingDiscountResult,shoppingCartInfoRequestVo.getFlag(),partnerId);
         }
         else {
@@ -824,9 +821,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
         // 添加购物车商品总价和加价购商品总价,现在是自己计算,后面需要优化为促销计算, 这段要删除
 
 //        ApiLog.info("fisherman 新算价 校验入参券是否可用new ",shoppingCartGoodsResponseVo,shoppingCartInfoRequestVo.getCouponCodes());
-        if(ApplicationConstant.printDebug){
-            ApiLog.printLog("校验入参券是否可用",JSON.toJSONString(shoppingCartGoodsResponseVo),shoppingCartInfoRequestVo.getCouponCode(),null);
-        }
+        ShoppingSdkLogUtil.debugLog("校验入参券是否可用",JSON.toJSONString(shoppingCartGoodsResponseVo),shoppingCartInfoRequestVo.getCouponCode(),null);
         // 校验入参券是否可用
         if (!checkAvailableCoupon(shoppingCartGoodsResponseVo, shoppingCartInfoRequestVo.getCouponCode())){
             return ResponseUtil.error(ResponseResult.SHOPPING_CART_COUPON_NOT_USE);
@@ -1494,9 +1489,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
         }
         try {
             //            ApiLog.debug("activityClient discount :{}", JSON.toJSONString(activityCalculationDiscountRequestDto));
-            if(ApplicationConstant.printDebug){
-                ApiLog.printLog("activityClient discount :{}", JSON.toJSONString(activityCalculationDiscountRequestDto),null,null);
-            }
+            ShoppingSdkLogUtil.debugLog("activityClient discount :{}", JSON.toJSONString(activityCalculationDiscountRequestDto),null,null);
             activityCalculationDiscountResponseDto = activityClient.calculationDiscount(activityCalculationDiscountRequestDto);
         } catch (Exception ex) {
             ErrorLog.printErrorLog("calculation_discount_error", "/calculation/discount", activityCalculationDiscountRequestDto, ex);
@@ -2486,9 +2479,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
             return deliveryAmount;
         }
 //        ApiLog.debug("获取配送配逻辑 tackingNo:{},storeDeliveryUseOld:{},receiveId:{},partnerId:{},storeId:{}", LogThreadLocal.getTrackingNo(), storeDeliveryUseOld, receiveId, partnerId, storeId);
-        if(ApplicationConstant.printDebug){
-            ApiLog.printLog("获取配送配逻辑 tackingNo:{},storeDeliveryUseOld:{},receiveId:{},partnerId:{},storeId:{}", LogThreadLocal.getTrackingNo(),JSON.toJSONString(storeDeliveryUseOld),"receiveId:"+receiveId+",partnerId:"+partnerId+",storeId:"+storeId);
-        }
+        ShoppingSdkLogUtil.debugLog("获取配送配逻辑 tackingNo:{},storeDeliveryUseOld:{},receiveId:{},partnerId:{},storeId:{}", LogThreadLocal.getTrackingNo(),JSON.toJSONString(storeDeliveryUseOld),"receiveId:"+receiveId+",partnerId:"+partnerId+",storeId:"+storeId);
         if (storeDeliveryUseOld) {
             deliveryAmount = Long.parseLong(getDeliveryAmount(receiveId, partnerId, storeId).toString());
             shoppingCartGoodsResponseVo.setDeliveryFeeZeroReason(0);