删除商品券导致 购物车显示商品名称 为换购券 券名称

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

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

@@ -1433,8 +1433,11 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
             } else {
                 CheckSpqInfoRequestDto checkSpqInfoRequestDto = new CheckSpqInfoRequestDto(partnerId, storeId, couponCode, menuType);
                 CheckSpqInfoResponseDto checkSpqInfoResponseDto = null;
+                // fisherman 删除商品券导致 购物车显示商品名称 为换购券 券名称
+                boolean viewProductName = false;
                 if (GoodsTypeEnum.HG_COUPON_GOODS.getGoodsType().equals(cartGoods.getGoodsType())
                         || GoodsTypeEnum.BUY_M_SEND_N_COUPON.getGoodsType().equals(cartGoods.getGoodsType())) {
+                    viewProductName = true;
                     checkSpqInfoResponseDto = couponService.checkSpqInfo(checkSpqInfoRequestDto, cartGoods.getSkuId());
                 } else {
                     checkSpqInfoResponseDto = couponService.checkSpqInfo(checkSpqInfoRequestDto);
@@ -1460,8 +1463,13 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
                     uuidList.add(cartGoods.getCartGoodsUid());
                     spqIdToCartUuid.put(couponCode, uuidList);
                 }
-                cartGoods.setName(checkSpqInfoResponseDto.getCouponName());
-                cartGoods.setSpuName(checkSpqInfoResponseDto.getCouponName());
+                if (viewProductName) {
+                    cartGoods.setName(checkSpqInfoResponseDto.getSkuName());
+                    cartGoods.setSpuName(checkSpqInfoResponseDto.getSkuName());
+                }else {
+                    cartGoods.setName(checkSpqInfoResponseDto.getCouponName());
+                    cartGoods.setSpuName(checkSpqInfoResponseDto.getCouponName());
+                }
                 cartGoods.setStockLimit(checkSpqInfoResponseDto.isStockLimit());
                 if (GoodsTypeEnum.BUY_M_SEND_N_COUPON.getGoodsType().equals(cartGoods.getGoodsType())) {
                     cartGoods.setName(checkSpqInfoResponseDto.getSkuName());