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

shopping-cart-application-service/src/main/java/cn/freemud/entities/vo/ShoppingCartGoodsResponseVo.java

@@ -25,6 +25,10 @@ import java.util.List;
 @Data
 public class ShoppingCartGoodsResponseVo  extends ShoppingCartGoodsBaseResponseVo{
     /**
+     * 用于看前端第几次请求
+     */
+    private Long  currentTime = System.currentTimeMillis();
+    /**
      * 配送费的清单 包含 普通配送费  额外夜间配送费 额外白天配送费  下面的 deliveryAmount 是总的配送费
      */
     List<ExtraDeliveryDto> deliveryAmountList = new ArrayList<>();

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

@@ -193,6 +193,8 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
     @Autowired
     private StoreItemAdapter storeItemAdapter;
 
+    @Autowired
+    private com.freemud.application.sdk.api.ordercenter.util.LogUtil logUtil;
     private static final String limitCartKey = "ecology:kgd:wxappconfig:open_platform_partner_wxapp_config:appkey_";
 
 //    @Value("${saas.cart.sharing}")
@@ -1060,6 +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());
                 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

@@ -86,6 +86,11 @@ public class CalculationSharingCartService {
         if (BusinessTypeEnum.SAAS_MALL.getCode().equals(menuType) && null != shoppingCartInfoRequestVo && OrderChannelType.SAASMALL.getCode().equalsIgnoreCase(shoppingCartInfoRequestVo.getChannelType())) {
             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);
+
         /**
          * 可用券及券折扣
          */