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

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

@@ -1071,13 +1071,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
             }
             //SVC卡支付
             SVCCardPay(cardCodes, shoppingCartInfoRequestVo.getReceiveId(), partnerId, storeId, shoppingCartGoodsResponseVo);
-            ShoppingCartGoodsResponseVo result = goodsList.getResult();
-            if (Objects.nonNull(result.getSvcDiscountDesc())) {
-                String svcDiscountDesc = result.getSvcDiscountDesc();
-                result.setSvcDiscountDesc(svcDiscountDesc+"--"+result.getCurrentTime());
-            }
-            return ResponseUtil.success(result);
-//            return ResponseUtil.success(goodsList.getResult());
+            return ResponseUtil.success(goodsList.getResult());
 
         }
 

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);
-
         /**
          * 可用券及券折扣
          */