Merge branch 'KA-储值卡增加营销规则同享配置ID1046436-zxh-20220505' into pre

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

@@ -1062,7 +1062,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
             ShoppingCartGoodsResponseVo shoppingCartGoodsResponseVo = goodsList.getResult();
             // fisherman -> 储值卡互斥需求 发现bug 导致返回购物车数据不对 当前时间节点无法修复 重新请求一次
             if (Objects.nonNull(shoppingCartInfoRequestVo.getEnableSharing()) && shoppingCartInfoRequestVo.getEnableSharing().compareTo(0) == 0) {
-                logUtil.info("fisherman -> 当前请求了2次计算操作", shoppingCartInfoRequestVo.getSessionId());
+                logUtil.info("fisherman -> 当前请求了2次计算操作", JSON.toJSONString(shoppingCartInfoRequestVo), JSON.toJSONString(shoppingCartGoodsResponseVo));
                 goodsList = getGoodsList(shoppingCartInfoRequestVo);
                 if (goodsList == null || !ResponseResult.SUCCESS.getCode().equals(goodsList.getCode())) {
                     return goodsList;

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

@@ -87,10 +87,6 @@ public class CalculationSharingCartService {
             deliverySharingService.mallDeliveryResponse(shoppingCartGoodsResponseVo, deliveryAmount,discountResult);
         }
 
-        logUtil.info("fisherman->1 储值卡配置同享",JSON.toJSONString(discountResult),JSON.toJSONString(cartGoodsList),JSON.toJSONString(shoppingCartGoodsResponseVo));
-        logUtil.info("fisherman->2 储值卡配置同享",JSON.toJSONString(shoppingCartInfoRequestVo),JSON.toJSONString(userLoginInfoDto),JSON.toJSONString(couponPromotionVO));
-        logUtil.info("fisherman->3 储值卡配置同享",JSON.toJSONString(activityQueryDto),"menuType:"+menuType + "_deliveryAmount:" + deliveryAmount + "_opt:" + opt + "_partnerId:" + partnerId + "_flag:" + flag + "_userId:" + userId + "_storeId:" + storeId + "_nightDistributionFee:" + nightDistributionFee);
-
         /**
          * 可用券及券折扣
          */