取消选券的时候, 判断券对应商品是什么

Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>

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

@@ -78,7 +78,6 @@ import com.freemud.sdk.api.assortment.shoppingcart.enums.BusinessTypeEnum;
 import com.freemud.sdk.api.assortment.shoppingcart.request.CheckCartRequest;
 import com.freemud.sdk.api.assortment.shoppingcart.service.ShoppingCartBaseService;
 import com.freemud.sdk.api.assortment.shoppingcart.service.impl.ShoppingCartBaseServiceImpl;
-import com.freemud.sdk.api.assortment.shoppingcart.util.ShoppingSdkLogUtil;
 import com.google.common.collect.Lists;
 import javafx.util.Pair;
 import ma.glasnost.orika.MapperFacade;
@@ -715,17 +714,20 @@ 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())) {
-                        CheckSpqInfoRequestDto checkSpqInfoRequestDto = new CheckSpqInfoRequestDto(partnerId, storeId, cartGoods.getSpuId(), menuType);
-                        GetProductsVo productInfo = null;
-                        if (GoodsTypeEnum.HG_COUPON_GOODS.getGoodsType().equals(cartGoods.getGoodsType())) {
-                            productInfo = couponService.getSpqProductInfo(checkSpqInfoRequestDto, cartGoods.getSkuId());
-                        } else {
-                            productInfo = couponService.getSpqProductInfo(checkSpqInfoRequestDto);
-                        }
-                        if (productInfo == null) {
-                            cartGoodsList.remove(i);
-                        } else {
-                            convert2CartGoods(cartGoods, productInfo);
+                        //fisherman 一单多券 判断传递过来的券 是哪个商品
+                        if (unChooseCouponCode.equals(cartGoods.getSkuId())) {
+                            CheckSpqInfoRequestDto checkSpqInfoRequestDto = new CheckSpqInfoRequestDto(partnerId, storeId, cartGoods.getSpuId(), menuType);
+                            GetProductsVo productInfo = null;
+                            if (GoodsTypeEnum.HG_COUPON_GOODS.getGoodsType().equals(cartGoods.getGoodsType())) {
+                                productInfo = couponService.getSpqProductInfo(checkSpqInfoRequestDto, cartGoods.getSkuId());
+                            } else {
+                                productInfo = couponService.getSpqProductInfo(checkSpqInfoRequestDto);
+                            }
+                            if (productInfo == null) {
+                                cartGoodsList.remove(i);
+                            } else {
+                                convert2CartGoods(cartGoods, productInfo);
+                            }
                         }
                     }
                 }