取消勾选券商品, 包含买M赠N券的商品逻辑处理

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

@@ -693,7 +693,8 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
                 // 遍历该商品券选择的商品,并将商品券替换为普通商品
                 for (int i = cartGoodsList.size() - 1; i >= 0; i--) {
                     CartGoods cartGoods = cartGoodsList.get(i);
-                    if (GoodsTypeEnum.COUPON_GOODS.getGoodsType().equals(cartGoods.getGoodsType()) || GoodsTypeEnum.HG_COUPON_GOODS.getGoodsType().equals(cartGoods.getGoodsType())) {
+
+                    if (GoodsTypeEnum.couponTypeList.contains(cartGoods.getGoodsType())) {
                         if (Objects.equals(cartGoods.getCouponCode() ,unChooseCouponCode)) {
                             CheckSpqInfoRequestDto checkSpqInfoRequestDto = new CheckSpqInfoRequestDto(partnerId, storeId, cartGoods.getCouponCode(), menuType,null);
                             GetProductsVo productInfo = null;