Merge branch 'feature/20210414-商品券添加默认属性-lcf'

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

@@ -145,9 +145,17 @@ public class CouponPromotionService implements IPromotionService {
                         cartGoods.setQty(cartGoods.getQty());
                         cartGoods.setCouponCode(checkSpqInfoResponseDto.getCouponCode());
                         cartGoods.setSpuName(checkSpqInfoResponseDto.getSpuName());
-                        cartGoods.setSpecProductId(checkSpqInfoResponseDto.getDefaultSpecId());
-                        cartGoods.setSubName(checkSpqInfoResponseDto.getDefaultSpecName());
-                        cartGoods.setExtra(checkSpqInfoResponseDto.getExtras());
+                        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());
+                            cartGoods.setSpecProductId(StringUtils.join(specIdList, "/"));
+                            cartGoods.setSubName(StringUtils.join(specNameList, "/"));
+                        } else {
+                            cartGoods.setSpecProductId(checkSpqInfoResponseDto.getDefaultSpecId());
+                            cartGoods.setSubName(checkSpqInfoResponseDto.getDefaultSpecName());
+                            cartGoods.setExtra(checkSpqInfoResponseDto.getExtras());
+                        }
                         if (GoodsTypeEnum.HG_COUPON_GOODS.getGoodsType().equals(cartGoods.getGoodsType())) {
                             ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Goods discountGoods = calculationDiscountResult.getGoods()
                                     .stream()

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

@@ -142,8 +142,18 @@ public class CouponSharingService {
                         cartGoods.setQty(cartGoods.getQty());
                         cartGoods.setCouponCode(checkSpqInfoResponseDto.getCouponCode());
                         cartGoods.setSpuName(checkSpqInfoResponseDto.getSpuName());
-                        cartGoods.setSpecProductId(checkSpqInfoResponseDto.getDefaultSpecId());
-                        cartGoods.setSubName(checkSpqInfoResponseDto.getDefaultSpecName());
+                        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())) {
                             CalculationSharingDiscountResponseDto.CalculationDiscountResult.Goods discountGoods = calculationDiscountResult.getGoods()
@@ -196,10 +206,20 @@ public class CouponSharingService {
                         cartGoods.setCouponCode(checkSpqInfoResponseDto.getCouponCode());
                         cartGoods.setSpuName(checkSpqInfoResponseDto.getSpuName());
                         cartGoods.setSpuForeignName(checkSpqInfoResponseDto.getSpuForeignName());
-                        cartGoods.setSpecProductId(checkSpqInfoResponseDto.getDefaultSpecId());
-                        cartGoods.setSubName(checkSpqInfoResponseDto.getDefaultSpecName());
-                        cartGoods.setSubForeignName(checkSpqInfoResponseDto.getDefaultForeignSpecName());
-                        cartGoods.setExtra(checkSpqInfoResponseDto.getExtras());
+                        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.setSubForeignName(checkSpqInfoResponseDto.getDefaultForeignSpecName());
+                            cartGoods.setExtra(checkSpqInfoResponseDto.getExtras());
+                        }
                         if (GoodsTypeEnum.HG_COUPON_GOODS.getGoodsType().equals(cartGoods.getGoodsType())) {
                             CalculationSharingDiscountResponseDto.CalculationDiscountResult.Goods discountGoods = discountResult.getGoods()
                                     .stream()