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

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

@@ -86,11 +86,6 @@ 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));
-        logUtil.info("fisherman 2 ", JSON.toJSONString(cartGoodsList));
-        logUtil.info("fisherman 3 ", JSON.toJSONString(shoppingCartGoodsResponseVo));
-        logUtil.info("fisherman 4 ", JSON.toJSONString(couponPromotionVO));
-        logUtil.info("fisherman 5 ", JSON.toJSONString(shoppingCartInfoRequestVo));
         /**
          * 可用券及券折扣
          */