sunyu::update::add new field about isMonthCardGoods and fix bug for updateQty…

sunyu::update::add new field about isMonthCardGoods and fix bug for updateQty then update month-card product quantity

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

@@ -212,9 +212,9 @@ public class CartGoods {
      */
     private int isSunnyCoupon=0;
     /**
-     * 是否为种子券商品 1:是；0:否
+     * 是否为月享卡商品 1:是；0:否
      */
-    private int isSeedCouponGoods;
+    private int isMonthCardGoods = 0;
     /**
      * 月享卡信息
      */

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

@@ -175,7 +175,7 @@ public class ShoppingCartMCoffeeServiceImpl {
         }
 
         //种子券商品信息校验
-        if (addShoppingCartGoodsRequestVo.getIsMonthCard()< 1 && addShoppingCartGoodsRequestVo.getIsSeedCouponGoods() > 0) {
+        if (addShoppingCartGoodsRequestVo.getIsMonthCard()< 1 && addShoppingCartGoodsRequestVo.getIsMonthCardGoods() > 0) {
             seedCouponGoodsValidate(addShoppingCartGoodsRequestVo, oldCartGoodsList);
         }
 
@@ -300,15 +300,12 @@ public class ShoppingCartMCoffeeServiceImpl {
                 if (StringUtils.isNotBlank(cartGoods.getCouponCode())) {
                     ActivityCalculationDiscountRequestDto.CalculationDiscountCoupon calculationDiscountCoupon = new ActivityCalculationDiscountRequestDto.CalculationDiscountCoupon();
                     calculationDiscountCoupon.setCode(cartGoods.getCouponCode());
-                    if (cartGoods.getIsSeedCouponGoods()>0) {
-                        calculationDiscountCoupon.setCartGoodsUid(cartGoods.getCartGoodsUid());
-                    }
                     coupons.add(calculationDiscountCoupon);
                 }
 
                 //使用券的是，如果购物车已经存在这个券，先清除，再添加
                 //过滤月享卡种子券
-                if (StringUtils.isNotEmpty(couponCode) && couponCode.equals(cartGoods.getCouponCode()) && Objects.equals(0,cartGoods.getIsSeedCouponGoods())) {
+                if (StringUtils.isNotEmpty(couponCode) && couponCode.equals(cartGoods.getCouponCode()) && Objects.equals(0,cartGoods.getIsMonthCardGoods())) {
                     cartGoods.setQty(0);
                 }
                 if (StringUtils.isNotEmpty(goodsId) && StringUtils.isNotEmpty(couponCode) && isContinue
@@ -321,7 +318,7 @@ public class ShoppingCartMCoffeeServiceImpl {
                         cartGoods.setQty(cartGoods.getQty() - 1);
                     } else {
                         //如果购物车存在相同的商品，则先删除购物车商品，在新增商品券购物车行
-                        if (Objects.equals(0,cartGoods.getIsSeedCouponGoods())){
+                        if (Objects.equals(0,cartGoods.getIsMonthCardGoods())){
                             cartGoods.setQty(0);
                         }
                     }
@@ -530,34 +527,12 @@ public class ShoppingCartMCoffeeServiceImpl {
             }
         }
 
-        for (CartGoods goods : cartGoodsList) {
-            if (Objects.equals(1,goods.getIsMonthCard())
-                    && goods.getCartGoodsUid().equals(updateShoppingCartGoodsQtyRequestVo.getCartGoodsUid())){
-                if (updateShoppingCartGoodsQtyRequestVo.getQty() == 0){
-                    if (cartGoodsList.size()>1) {
-                        Iterator<CartGoods> cartGoodsIterator = cartGoodsList.iterator();
-                        while (cartGoodsIterator.hasNext()) {
-                            String couponCode = null != cartGoodsIterator.next() && StringUtils.isNotEmpty(cartGoodsIterator.next().getCouponCode()) ?
-                                    cartGoodsIterator.next().getCouponCode() : "";
-                            if (StringUtils.isNotEmpty(couponCode) && couponCode.equals(goods.getMonthCardInfo().getCardCode()))
-                            {
-                                cartGoodsIterator.remove();
-                                break;
-                            }
-                        }
-                    }else{
-                        cartGoodsList = new ArrayList<>();
-                    }
-                }
-            }
-        }
-
         if (cartGoods == null) {
             throw new ServiceException(ResponseResult.SHOPPING_CART_UPDATE_ERROR);
         }
 
         //商品券行商品数量不可增加
-        if (cartGoods.getCouponCode() != null && qty > 1 && cartGoods.getIsSeedCouponGoods() < 0) {
+        if (cartGoods.getCouponCode() != null && qty > 1 && cartGoods.getIsMonthCardGoods() < 1) {
             throw new ServiceException(ResponseResult.NOT_SUPPORTED);
         }
 
@@ -1668,7 +1643,7 @@ public class ShoppingCartMCoffeeServiceImpl {
         cartGoods.setSkuId(skuId);
         cartGoods.setQty(qty);
         cartGoods.setIsMonthCard(addShoppingCartGoodsRequestVo.getIsMonthCard());
-        cartGoods.setIsSeedCouponGoods(addShoppingCartGoodsRequestVo.getIsSeedCouponGoods());
+        cartGoods.setIsMonthCardGoods(addShoppingCartGoodsRequestVo.getIsMonthCardGoods());
         cartGoods.setCouponCode(addShoppingCartGoodsRequestVo.getCouponCode());
         Integer goodsType = StringUtils.isEmpty(skuId) || ObjectUtils.equals(spuId, skuId) ? GoodsTypeEnum.SPU_GOODS.getGoodsType() : GoodsTypeEnum.SKU_GOODS.getGoodsType();
         if (spuId.startsWith(CommonsConstant.COUPON_PREFIX)) {
@@ -2248,7 +2223,7 @@ public class ShoppingCartMCoffeeServiceImpl {
         mCoffeeAddGoodsRequestVo.setCouponCode(goodsInfo.getCouponCode());
         mCoffeeAddGoodsRequestVo.setGroupName(goodsInfo.getGroupName());
         mCoffeeAddGoodsRequestVo.setIsMonthCard(goodsInfo.getIsMonthCard());
-        mCoffeeAddGoodsRequestVo.setIsSeedCouponGoods(goodsInfo.getIsSeedCouponGoods());
+        mCoffeeAddGoodsRequestVo.setIsMonthCardGoods(goodsInfo.getIsMonthCardGoods());
         mCoffeeAddGoodsRequestVo.setMonthCardInfo(goodsInfo.getMonthCardInfo());
         return mCoffeeAddGoodsRequestVo;
     }

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

@@ -105,9 +105,9 @@ public class BatchGoodsInfoVo {
      */
     private int isMonthCard;
     /**
-     * 是否为种子券商品 1:是；0:否
+     * 是否为月享卡商品
      */
-    private int isSeedCouponGoods;
+    private int isMonthCardGoods;
     /**
      * 月享卡加购信息
      */

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

@@ -144,9 +144,9 @@ public class MCoffeeAddGoodsRequestVo {
      */
     private int isMonthCard;
     /**
-     * 是否为种子券商品 1:是；0:否
+     * 是否为月享卡商品
      */
-    private int isSeedCouponGoods;
+    private int isMonthCardGoods;
     /**
      * 月享卡加购信息
      */