Merge branch 'KA-fix-买M赠N券取消勾选有问题'

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

@@ -693,11 +693,12 @@ 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;
-                            if (GoodsTypeEnum.HG_COUPON_GOODS.getGoodsType().equals(cartGoods.getGoodsType())) {
+                            if (GoodsTypeEnum.HG_COUPON_GOODS.getGoodsType().equals(cartGoods.getGoodsType()) || GoodsTypeEnum.BUY_M_SEND_N_COUPON.getGoodsType().equals(cartGoods.getGoodsType())) {
                                 productInfo = couponService.getSpqProductInfo(checkSpqInfoRequestDto, cartGoods.getSkuId());
                             } else {
                                 productInfo = couponService.getSpqProductInfo(checkSpqInfoRequestDto);