sunyu::update::update about monthCard validate

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

@@ -172,7 +172,9 @@ public class ShoppingCartMCoffeeServiceImpl {
         }
 
         //种子券商品信息校验
-        seedCouponGoodsValidate(addShoppingCartGoodsRequestVo,oldCartGoodsList);
+        if (addShoppingCartGoodsRequestVo.getIsMonthCard()< 1 && addShoppingCartGoodsRequestVo.getIsSeedCouponGoods() > 0) {
+            seedCouponGoodsValidate(addShoppingCartGoodsRequestVo, oldCartGoodsList);
+        }
 
         //加锁，防止重复请求导致的加购数量错误
         synchronized (oldCartGoodsList) {
@@ -2236,10 +2238,11 @@ public class ShoppingCartMCoffeeServiceImpl {
      * @param oldCartGoodsList
      */
     private void seedCouponGoodsValidate(MCoffeeAddGoodsRequestVo addShoppingCartGoodsRequestVo,List<CartGoods> oldCartGoodsList){
-        if (addShoppingCartGoodsRequestVo.getIsMonthCard()< 1 && addShoppingCartGoodsRequestVo.getIsSeedCouponGoods() > 0) {
+        //若加购种子券商品，则券号不可为空
         if (StringUtils.isEmpty(addShoppingCartGoodsRequestVo.getCouponCode())){
             throw new ServiceException(ResponseResult.SHOPPING_CART_ADD_ERROR);
         }
+        //加购种子券商品，购物车中必须已有月卡不可为空
         if (CollectionUtils.isEmpty(oldCartGoodsList)) {
             throw new ServiceException(ResponseResult.SHOPPING_CART_SEED_COUPON_VALID);
         }
@@ -2263,7 +2266,5 @@ public class ShoppingCartMCoffeeServiceImpl {
         if ((seedCouponGoodsCount+addShoppingCartGoodsRequestVo.getQty()) > seedCouponCount){
             throw new ServiceException(ResponseResult.SHOPPING_CART_SEED_COUPON_VALID);
         }
-
-        }
     }
 }