fix-券商品展示问题

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

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

@@ -10,10 +10,8 @@ import cn.freemud.enums.AvailableCouponQueryFlagEnum;
 import cn.freemud.enums.GoodsTypeEnum;
 import cn.freemud.service.CouponService;
 import cn.freemud.service.impl.AssortmentSdkService;
-import com.alibaba.fastjson.JSON;
 import com.freemud.sdk.api.assortment.shoppingcart.constant.CommonsConstant;
 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 org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.collections4.MapUtils;
@@ -155,6 +153,16 @@ public class CouponSharingService {
                 }
                 // couponService.checkValidCoupon(couponPromotionVO, validCouponCodeLis, spqIdToCartUuid, couponCode, cartGoodsList);
 
+                // fisherman bug修复,买m赠n券商品属性未展示问题
+                List<CartGoods.CartGoodsExtra> extra = cartGoods.getExtra();
+                if (CollectionUtils.isNotEmpty(extra)){
+                    List<String> specIdList = extra.stream().map(CartGoods.CartGoodsExtra::getAttributeId).collect(Collectors.toList());
+                    List<String> specNameList = extra.stream().map(CartGoods.CartGoodsExtra::getAttributeName).collect(Collectors.toList());
+                    List<String> foreignSpecNameList = extra.stream().map(CartGoods.CartGoodsExtra::getAttributeForeignName).collect(Collectors.toList());
+                    cartGoods.setSpecProductId(StringUtils.join(specIdList, "/"));
+                    cartGoods.setSubName(StringUtils.join(specNameList, "/"));
+                    cartGoods.setSubForeignName(StringUtils.join(foreignSpecNameList, "/"));
+                }
                 // 计算优惠信息时，已将券校验过，放在map中
                 if (MapUtils.isNotEmpty(validCouponMap)) {
                     CheckSpqInfoResponseDto checkSpqInfoResponseDto;
@@ -170,18 +178,8 @@ public class CouponSharingService {
                         cartGoods.setQty(cartGoods.getQty());
                         cartGoods.setCouponCode(checkSpqInfoResponseDto.getCouponCode());
                         cartGoods.setSpuName(checkSpqInfoResponseDto.getSpuName());
-                        List<CartGoods.CartGoodsExtra> extra = cartGoods.getExtra();
-                        if (CollectionUtils.isNotEmpty(extra)){
-                            List<String> specIdList = extra.stream().map(CartGoods.CartGoodsExtra::getAttributeId).collect(Collectors.toList());
-                            List<String> specNameList = extra.stream().map(CartGoods.CartGoodsExtra::getAttributeName).collect(Collectors.toList());
-                            List<String> foreignSpecNameList = extra.stream().map(CartGoods.CartGoodsExtra::getAttributeForeignName).collect(Collectors.toList());
-                            cartGoods.setSpecProductId(StringUtils.join(specIdList, "/"));
-                            cartGoods.setSubName(StringUtils.join(specNameList, "/"));
-                            cartGoods.setSubForeignName(StringUtils.join(foreignSpecNameList, "/"));
-                        } else {
                         cartGoods.setSpecProductId(checkSpqInfoResponseDto.getDefaultSpecId());
                         cartGoods.setSubName(checkSpqInfoResponseDto.getDefaultSpecName());
-                        }
                         cartGoods.setExtra(checkSpqInfoResponseDto.getExtras());
                         if (GoodsTypeEnum.HG_COUPON_GOODS.getGoodsType().equals(cartGoods.getGoodsType())) {
                             Goods discountGoods = calculationDiscountResult.getGoods()