sunyu::update::种子券功能

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

@@ -86,9 +86,9 @@ public class ActivityCalculationDiscountRequestDto {
         /**
          * 是否为种子券商品
          */
-        private int isSeedCouponGoods;
+        private Integer isSeedCouponGoods;
         /**
-         * 购物车商品行ID(种子券才传)
+         * 购物车商品行uid（种子券商品才传）
          */
         private String cartGoodsUid;
     }

shopping-cart-application-service/src/main/java/cn/freemud/entities/vo/UpdateShoppingCartGoodsQtyRequestVo.java

@@ -40,6 +40,7 @@ public class UpdateShoppingCartGoodsQtyRequestVo extends BaseRequestVo {
      * 更新前数量
      */
     private Integer oldQty;
+
     /**
      * 更新后商品数量
      */

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

@@ -128,12 +128,15 @@ public class CouponDiscountCalculation {
                 cartGoods.setAmount(goodsMap.get(cartGoods.getCartGoodsUid()).getRealAmount());
                 List<ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Goods.GoodsDiscount> discountsNew = goodsMap.get(cartGoods.getCartGoodsUid()).getDiscounts();
                 if (CollectionUtils.isNotEmpty(discountsNew)) {
-                    ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Goods.GoodsDiscount goodsDiscount = discountsNew.stream().filter(t ->
-                            (ActivityTypeEnum.TYPE_32.getCode().equals(t.getType()) || ActivityTypeEnum.TYPE_37.getCode().equals(t.getType()))).findFirst().get();
+                    Optional<ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Goods.GoodsDiscount> targetDiscount =  discountsNew.stream()
+                            .filter(t -> ActivityTypeEnum.TYPE_32.getCode().equals(t.getType()) || ActivityTypeEnum.TYPE_37.getCode().equals(t.getType())).findFirst();
+                    if (null != targetDiscount) {
+                        ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Goods.GoodsDiscount goodsDiscount = targetDiscount.get();
                         cartGoods.setCouponName(goodsDiscount.getActivityName());
                     }
                 }
             }
+        }
 
         // 当couponCode不为空时，需计算优惠价格
         long couponDiscount = 0;