Merge branch 'feature/20210609-v2.0.34-购物车支持配送券ID1030707-周晓航' into qa

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

@@ -1697,6 +1697,11 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
      */
     private void updateShoppingCartGoodsDiscount(CouponPromotionVO couponPromotionVO, ActivityQueryDto activityQueryDto, ActivityCalculationDiscountResponseDto.CalculationDiscountResult calculationDiscountResult, List<CartGoods> cartGoodsList
             , ShoppingCartGoodsResponseVo shoppingCartGoodsResponseVo, ShoppingCartInfoRequestVo shoppingCartInfoRequestVo, UserLoginInfoDto userLoginInfoDto,String menuType,Long deliveryAmount) {
+        LogUtil.info("fisherman 促销活动计算价格 01",JSON.toJSONString(couponPromotionVO), JSON.toJSONString(activityQueryDto));
+        LogUtil.info("fisherman 促销活动计算价格 02",JSON.toJSONString(calculationDiscountResult), JSON.toJSONString(cartGoodsList));
+        LogUtil.info("fisherman 促销活动计算价格 03",JSON.toJSONString(shoppingCartGoodsResponseVo), JSON.toJSONString(shoppingCartInfoRequestVo));
+        LogUtil.info("fisherman 促销活动计算价格 04",JSON.toJSONString(userLoginInfoDto), JSON.toJSONString(deliveryAmount));
+
         if (couponPromotionVO !=null) {
             couponPromotionVO.setDeliveryAmount(deliveryAmount);
         }
@@ -1851,6 +1856,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
         MaterialPromotionService materialPromotionService = (MaterialPromotionService) PromotionFactory.getPromotionService(ShoppingCartPromotionEnum.Material);
         materialPromotionService.updateShoppingCartGoodsDiscount(couponPromotionVO, activityQueryDto, calculationDiscountResult, cartGoodsList, shoppingCartGoodsResponseVo, userLoginInfoDto, shoppingCartInfoRequestVo);
 
+        LogUtil.info("fisherman 促销活动计算价格 05",JSON.toJSONString(shoppingCartGoodsResponseVo), JSON.toJSONString(couponPromotionVO));
     }
 
     /**