Merge branch 'master' into fix-套餐商品原价问题

shopping-cart-application-service/src/main/java/cn/freemud/adapter/ShoppingCartConvertAdapter.java

@@ -154,6 +154,39 @@ public class ShoppingCartConvertAdapter {
         } else if (cartGoods.isWeightType()) {
             cartGoodsDetailDto.setProductType(ProductType.WEIGHT_PRODUCT.getCode());
         }
+        //套餐商品券
+        if (CollectionUtils.isNotEmpty(cartGoods.getProductComboList()) && GoodsTypeEnum.COUPON_GOODS.getGoodsType().equals(cartGoods.getGoodsType())) {
+            cartGoodsDetailDto.setProductType(ProductType.SETMEAL.getCode());
+            List<ShoppingCartGoodsDto.CartGoodsDetailDto> comboProducts = new ArrayList<>(0);
+
+            for (CartGoods.ComboxGoods comboxGoods : cartGoods.getProductComboList()) {
+                ShoppingCartGoodsDto.CartGoodsDetailDto comboProduct = new ShoppingCartGoodsDto.CartGoodsDetailDto();
+                comboProduct.setTaxId(cartGoods.getTaxId());
+                comboProduct.setTax(cartGoods.getTax());
+                comboProduct.setSpuId(comboxGoods.getSpuId());
+                comboProduct.setSpuName(comboxGoods.getSpuName());
+                comboProduct.setSkuId(comboxGoods.getGoodsId());
+                // 设置原始商品类型
+                comboProduct.setOriginalProductType(comboxGoods.getOriginalProductType());
+                comboProduct.setSkuName(StringUtils.isEmpty(comboxGoods.getSkuName()) ? comboxGoods.getSpuName() : comboxGoods.getSkuName());
+                comboProduct.setOriginalPrice(comboxGoods.getOriginalPrice());
+                comboProduct.setPicture(comboxGoods.getPic());
+                int qty = comboxGoods.getQty() * cartGoods.getQty();
+                comboProduct.setQty(qty);
+                comboProduct.setProductType(comboxGoods.isWeightType() ? ProductType.WEIGHT_PRODUCT.getCode() : ProductType.SETMEAL.getCode());
+                comboProduct.setParentProductId(cartGoods.getGoodsId());
+                comboProduct.setIsFixedProduct(true);
+                comboProduct.setStockLimit(cartGoods.isStockLimit());
+                comboProduct.setCustomerCode(comboxGoods.getCustomerCode());
+                comboProduct.setWeight(comboxGoods.getWeight());
+                comboProduct.setUnit(comboxGoods.getUnit());
+                List<ShoppingCartGoodsDto.CartGoodsDetailDto.CartGoodsExtra> cartGoodsExtras = BeanUtil.convertBeans(comboxGoods.getExtra(), ShoppingCartGoodsDto.CartGoodsDetailDto.CartGoodsExtra::new);
+                comboProduct.setExtraList(cartGoodsExtras);
+                comboProduct.setSpecialExtra(comboxGoods.getSpecialExtra());
+                comboProducts.add(comboProduct);
+            }
+            cartGoodsDetailDto.setComboProducts(comboProducts);
+        }
         //小料
         if (CollectionUtils.isNotEmpty(cartGoods.getProductMaterialList())) {
             List<ShoppingCartGoodsDto.CartGoodsDetailDto.MaterialGoods> materialList = new ArrayList<>(0);