sunyu::update::促销算价接口新增cartGoodsUid字段

shopping-cart-application-service/src/main/java/cn/freemud/entities/dto/ActivityCalculationDiscountRequestDto.java

@@ -87,6 +87,10 @@ public class ActivityCalculationDiscountRequestDto {
          * 是否为种子券商品
          */
         private int isSeedCouponGoods;
+        /**
+         * 购物车商品行ID(种子券才传)
+         */
+        private String cartGoodsUid;
     }
 
     @Data

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

@@ -212,10 +212,9 @@ public class ShoppingCartMCoffeeServiceImpl {
                 }
             }
 
-
-            //商品券已添加情况校验
-            List<ActivityCalculationDiscountRequestDto.CalculationDiscountCoupon> coupons = checkGoodsCoupon(oldCartGoodsList, operationType, couponCode, goodsId, addShoppingCartGoodsRequestVo);
             CartGoods addCartGoods = convent2CartGoods(addShoppingCartGoodsRequestVo, goodsId, vo);
+            //商品券已添加情况校验
+            List<ActivityCalculationDiscountRequestDto.CalculationDiscountCoupon> coupons = checkGoodsCoupon(oldCartGoodsList, operationType, couponCode, goodsId, addCartGoods);
             setClassificationAndPrice(addCartGoods, productBeanListSpuClass);
             if (StringUtils.isNotEmpty(addShoppingCartGoodsRequestVo.getGroupName())) {
                 addCartGoods.setSkuName(addShoppingCartGoodsRequestVo.getGroupName());
@@ -284,7 +283,7 @@ public class ShoppingCartMCoffeeServiceImpl {
     }
 
 
-    private List<ActivityCalculationDiscountRequestDto.CalculationDiscountCoupon> checkGoodsCoupon(List<CartGoods> oldCartGoodsList, Integer operationType, String couponCode, String goodsId, MCoffeeAddGoodsRequestVo addShoppingCartGoodsRequestVo) {
+    private List<ActivityCalculationDiscountRequestDto.CalculationDiscountCoupon> checkGoodsCoupon(List<CartGoods> oldCartGoodsList, Integer operationType, String couponCode, String goodsId, CartGoods addShoppingCartGoodsRequestVo) {
         if (operationType != null && operationType == 1 && StringUtils.isBlank(couponCode)) {
             throw new ServiceException(ResponseResult.PARAMETER_MISSING, "商品券券号为空");
         }
@@ -300,6 +299,9 @@ public class ShoppingCartMCoffeeServiceImpl {
                     ActivityCalculationDiscountRequestDto.CalculationDiscountCoupon calculationDiscountCoupon = new ActivityCalculationDiscountRequestDto.CalculationDiscountCoupon();
                     calculationDiscountCoupon.setCode(cartGoods.getCouponCode());
                     calculationDiscountCoupon.setIsSeedCouponGoods(cartGoods.getIsSeedCouponGoods());
+                    if (cartGoods.getIsSeedCouponGoods()>0) {
+                        calculationDiscountCoupon.setCartGoodsUid(cartGoods.getCartGoodsUid());
+                    }
                     coupons.add(calculationDiscountCoupon);
                 }
                 if (StringUtils.isNotEmpty(couponCode) && couponCode.equals(cartGoods.getCouponCode())) {
@@ -349,6 +351,9 @@ public class ShoppingCartMCoffeeServiceImpl {
             ActivityCalculationDiscountRequestDto.CalculationDiscountCoupon calculationDiscountCoupon = new ActivityCalculationDiscountRequestDto.CalculationDiscountCoupon();
             calculationDiscountCoupon.setCode(couponCode);
             calculationDiscountCoupon.setIsSeedCouponGoods(addShoppingCartGoodsRequestVo.getIsSeedCouponGoods());
+            if (addShoppingCartGoodsRequestVo.getIsSeedCouponGoods()>0) {
+                calculationDiscountCoupon.setCartGoodsUid(addShoppingCartGoodsRequestVo.getCartGoodsUid());
+            }
             coupons.add(calculationDiscountCoupon);
         }