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

order-application-service/src/main/java/cn/freemud/service/impl/SellCouponOrderServiceImpl.java

@@ -312,6 +312,8 @@ public class SellCouponOrderServiceImpl implements OrderFactoryService {
         AssortmentCustomerInfoVo userLoginInfoDto = checkOrder.checkOrderByMemberNew(requestVo.getSessionId());
         // 如果用户适用SVC 卡支付，则校验svc卡,
         Integer enableSharing = checkOrder.checkMemberSvcCard(userLoginInfoDto.getPartnerId(), userLoginInfoDto.getMemberId(), requestVo);
+        // fisherman 当前时间点 默认走同享逻辑上线 2022年5月26日17:23:00
+        enableSharing = 1;
         String trackingNo = LogThreadLocal.getTrackingNo();
         String partnerId = userLoginInfoDto.getPartnerId();
         String storeId = requestVo.getShopId();

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

@@ -10,6 +10,8 @@ import cn.freemud.entities.vo.ShoppingCartGoodsResponseVo;
 import cn.freemud.entities.vo.ShoppingCartInfoRequestVo;
 import cn.freemud.enums.OrderChannelType;
 import cn.freemud.service.impl.calculate.promotion.*;
+import com.alibaba.fastjson.JSON;
+import com.freemud.application.sdk.api.ordercenter.util.LogUtil;
 import com.freemud.sdk.api.assortment.shoppingcart.enums.BusinessTypeEnum;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -52,6 +54,8 @@ public class CalculationSharingCartService {
     @Autowired
     private BuyOneGiveOneSendService buyOneGiveOneSendService;
 
+    @Autowired
+    private LogUtil logUtil;
     /**
      * 响应购物车价格计算依赖促销
      */