修改 新算价 反馈商品名称问题

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

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

@@ -59,7 +59,6 @@ import com.freemud.api.assortment.datamanager.entity.vo.AssortmentCustomerInfoVo
 import com.freemud.api.assortment.datamanager.manager.AssortmentOpenPlatformPartnerStoreDeliveryConfigManager;
 import com.freemud.api.assortment.datamanager.manager.customer.AssortmentCustomerInfoManager;
 import com.freemud.application.sdk.api.base.SDKCommonBaseContextWare;
-import com.freemud.application.sdk.api.log.ApiLog;
 import com.freemud.application.sdk.api.log.ErrorLog;
 import com.freemud.application.sdk.api.log.LogThreadLocal;
 import com.freemud.application.sdk.api.membercenter.request.QueryReceiveAddressRequest;
@@ -1410,7 +1409,6 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
         // 校验后有效的商品券map
         Map<String, CheckSpqInfoResponseDto> validCouponMap = new HashMap<>(16);
         HashMap<String, List<String>> spqIdToCartUuid = new HashMap<>(16);
-        ShoppingSdkLogUtil.printLog("fisherman check ------01 ",null,JSON.toJSONString(cartGoodsList));
         for (int i = cartGoodsList.size() - 1; i >= 0; i--) {
             CartGoods cartGoods = cartGoodsList.get(i);
             //套餐商品的固定和可选商品必有一个
@@ -1466,7 +1464,6 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
                     uuidList.add(cartGoods.getCartGoodsUid());
                     spqIdToCartUuid.put(couponCode, uuidList);
                 }
-                ShoppingSdkLogUtil.printLog("fisherman check ------02 ",JSON.toJSONString(checkSpqInfoResponseDto),JSON.toJSONString(cartGoodsList));
                 if (viewProductName) {
                     cartGoods.setName(checkSpqInfoResponseDto.getSkuName());
                     cartGoods.setSpuName(checkSpqInfoResponseDto.getSkuName());

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

@@ -113,9 +113,11 @@ public class CalculationSharingDiscountService {
                 //商品券->商品券ID换取商品
                 CheckSpqInfoRequestDto checkSpqInfoRequestDto = new CheckSpqInfoRequestDto(partnerId, storeId, couponCode, menuType);
                 CheckSpqInfoResponseDto checkSpqInfo = null;
+                boolean viewProductName = false;
                 if (GoodsTypeEnum.HG_COUPON_GOODS.getGoodsType().equals(cartGoods.getGoodsType())
                         || GoodsTypeEnum.BUY_M_SEND_N_COUPON.getGoodsType().equals(cartGoods.getGoodsType())) {
                     checkSpqInfo = couponService.checkSpqInfo(checkSpqInfoRequestDto, cartGoods.getSkuId());
+                    viewProductName = true;
                 } else {
                     checkSpqInfo = couponService.checkSpqInfo(checkSpqInfoRequestDto);
                 }
@@ -142,8 +144,14 @@ public class CalculationSharingDiscountService {
                     uuidList.add(cartGoods.getCartGoodsUid());
                     spqIdToCartUuid.put(couponCode, uuidList);
                 }
-                cartGoods.setName(checkSpqInfo.getCouponName());
-                cartGoods.setSpuName(checkSpqInfo.getCouponName());
+                if (viewProductName) {
+                    cartGoods.setName(checkSpqInfo.getSkuName());
+                    cartGoods.setSpuName(checkSpqInfo.getSkuName());
+                    cartGoods.setSkuName(checkSpqInfo.getSkuName());
+                }else {
+                    cartGoods.setName(checkSpqInfo.getCouponName());
+                    cartGoods.setSpuName(checkSpqInfo.getCouponName());
+                }
                 cartGoods.setStockLimit(checkSpqInfo.isStockLimit());
                 //买M送N券不赋值券名称
                 if (GoodsTypeEnum.BUY_M_SEND_N_COUPON.getGoodsType().equals(cartGoods.getGoodsType())) {