Merge remote-tracking branch 'remotes/origin/feature/2020-1026-删除已过期的券'

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

@@ -780,13 +780,12 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
                 if (checkSpqInfoResponseDto == null) {
                     cartGoodsList.remove(i);
                     assortmentSdkService.setShoppingCart(partnerId, storeId, userId, cartGoodsList, null, null, this.shoppingCartBaseService);
-                    if (GoodsTypeEnum.HG_COUPON_GOODS.getGoodsType().equals(cartGoods.getGoodsType())) {
-                        throw new ServiceException(ResponseResult.SHOPPING_CART_HG_COUPON_NOT_EXIST);
+                    //if (GoodsTypeEnum.HG_COUPON_GOODS.getGoodsType().equals(cartGoods.getGoodsType())) {
+                    //    throw new ServiceException(ResponseResult.SHOPPING_CART_HG_COUPON_NOT_EXIST);
+                    //} else {
+                    //    throw new ServiceException(ResponseResult.SHOPPING_CART_COUPON_NOT_EXIST);
+                    //}
                 } else {
-                        throw new ServiceException(ResponseResult.SHOPPING_CART_COUPON_NOT_EXIST);
-                    }
-
-                }
                     validCouponMap.put(spqId, checkSpqInfoResponseDto);
                     cartGoods.setName(checkSpqInfoResponseDto.getCouponName());
                     cartGoods.setSpuName(checkSpqInfoResponseDto.getCouponName());
@@ -804,6 +803,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
                     }
                 }
             }
+        }
         // 当加价购商品不为空时
         if (CollectionUtils.isNotEmpty(sendGoodsList)) {
             for (ShoppingCartInfoRequestVo.SendGoods sendGoods : sendGoodsList) {