sunyu::update::update about combo coupon

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

@@ -170,6 +170,24 @@ public class ShoppingCartMccafeAdapter {
         } else if (cartGoods.isWeightType()) {
             cartGoodsDetailDto.setProductType(ProductType.WEIGHT_PRODUCT.getCode());
         }
+
+        //如果是套餐商品，将套餐固定子商品转换给均摊实体
+        if (CollectionUtils.isNotEmpty(cartGoods.getProductComboList())){
+            List<ShoppingCartGoodsDto.CartGoodsDetailDto> comboProductList = new ArrayList<>();
+            for (CartGoods.ComboxGoods comboGoods : cartGoods.getProductComboList()) {
+                comboProductList.add(convertComboProduct2DetailGoods(comboGoods));
+            }
+            cartGoodsDetailDto.setComboProducts(comboProductList);
+        }
+        //如果是套餐商品，将套餐固定可选商品转换给均摊实体
+        if (CollectionUtils.isNotEmpty(cartGoods.getProductGroupList())){
+            List<ShoppingCartGoodsDto.CartGoodsDetailDto> comboProductList = new ArrayList<>();
+            for (CartGoods.ComboxGoods comboGoods : cartGoods.getProductComboList()) {
+                comboProductList.add(convertComboProduct2DetailGoods(comboGoods));
+            }
+            cartGoodsDetailDto.setComboProducts(comboProductList);
+        }
+
         //小料
         if (CollectionUtils.isNotEmpty(cartGoods.getProductMaterialList())) {
             List<ShoppingCartGoodsDto.CartGoodsDetailDto.MaterialGoods> materialList = new ArrayList<>(0);
@@ -206,6 +224,65 @@ public class ShoppingCartMccafeAdapter {
         return cartGoodsDetailDto;
     }
 
+
+
+    public ShoppingCartGoodsDto.CartGoodsDetailDto convertComboProduct2DetailGoods(CartGoods.ComboxGoods cartGoods) {
+        // 设置基础信息
+        ShoppingCartGoodsDto.CartGoodsDetailDto cartGoodsDetailDto = new ShoppingCartGoodsDto.CartGoodsDetailDto();
+//        cartGoodsDetailDto.setCartGoodsUid(cartGoods.getCartGoodsUid());
+        cartGoodsDetailDto.setTaxId(cartGoods.getTaxId());
+        cartGoodsDetailDto.setTax(cartGoods.getTax());
+        cartGoodsDetailDto.setSpuId(cartGoods.getSpuId());
+        cartGoodsDetailDto.setSpuName(cartGoods.getSpuName());
+        cartGoodsDetailDto.setSkuId(StringUtils.isEmpty(cartGoods.getSkuId()) ? cartGoods.getSpuId() : cartGoods.getSkuId());
+        cartGoodsDetailDto.setSkuName(StringUtils.isEmpty(cartGoods.getSkuName()) ? cartGoods.getSpuName() : cartGoods.getSkuName());
+        cartGoodsDetailDto.setOriginalPrice(cartGoods.getOriginalPrice());
+        cartGoodsDetailDto.setSalePrice(cartGoods.getOriginalPrice());
+        cartGoodsDetailDto.setPicture(cartGoods.getPic());
+        cartGoodsDetailDto.setQty(cartGoods.getQty());
+//        cartGoodsDetailDto.setActivityType(cartGoods.getActivityType());
+//        cartGoodsDetailDto.setNodeId(cartGoods.getNodeId());
+//        cartGoodsDetailDto.setCategoryName(cartGoods.getCategoryName());
+//        cartGoodsDetailDto.setCouponCode(cartGoods.getCouponCode());
+//        cartGoodsDetailDto.setStockLimit(cartGoods.isStockLimit());
+        cartGoodsDetailDto.setProductCode(cartGoods.getCustomerCode());
+        cartGoodsDetailDto.setCustomerCode(cartGoods.getCustomerCode());
+        cartGoodsDetailDto.setWeight(cartGoods.getWeight());
+        cartGoodsDetailDto.setUnit(cartGoods.getUnit());
+        cartGoodsDetailDto.setActivityDiscountsDtos(new ArrayList<>());
+        cartGoodsDetailDto.setTotalDiscountAmount(0);
+//        cartGoodsDetailDto.setSpecialExtra(cartGoods.getSpecialExtra());
+//        cartGoodsDetailDto.setClassificationId(cartGoods.getClassificationId());
+//        cartGoodsDetailDto.setClassificationName(cartGoods.getClassificationName());
+//        if (GoodsTypeEnum.SET_MEAL_GOODS.getGoodsType().equals(cartGoods.getGoodsType())) {
+//            cartGoodsDetailDto.setProductType(ProductType.SETMEAL.getCode());
+//        } else if (cartGoods.isWeightType()) {
+//            cartGoodsDetailDto.setProductType(ProductType.WEIGHT_PRODUCT.getCode());
+//        }
+
+        //小料
+        if (CollectionUtils.isNotEmpty(cartGoods.getProductMaterialList())) {
+            List<ShoppingCartGoodsDto.CartGoodsDetailDto.MaterialGoods> materialList = new ArrayList<>(0);
+            for (CartGoods.MaterialGoods materialGoods : cartGoods.getProductMaterialList()) {
+                ShoppingCartGoodsDto.CartGoodsDetailDto.MaterialGoods goods = new ShoppingCartGoodsDto.CartGoodsDetailDto.MaterialGoods();
+                goods.setSpuId(materialGoods.getSpuId());
+                goods.setSpuName(materialGoods.getSpuName());
+                goods.setOriginalPrice(materialGoods.getOriginalPrice());
+                goods.setSalePrice(materialGoods.getFinalPrice());
+                goods.setCustomerCode(materialGoods.getCustomerCode());
+                goods.setProductCode(materialGoods.getCustomerCode());
+                goods.setQty(cartGoods.getQty());
+                goods.setTotalDiscountAmount(0);
+                materialList.add(goods);
+            }
+            cartGoodsDetailDto.setMaterialList(materialList);
+        }
+        // 设置总优惠&售价
+        List<ShoppingCartGoodsDto.CartGoodsDetailDto.CartGoodsExtra> cartGoodsExtras = BeanUtil.convertBeans(cartGoods.getExtra(), ShoppingCartGoodsDto.CartGoodsDetailDto.CartGoodsExtra::new);
+        cartGoodsDetailDto.setExtraList(cartGoodsExtras);
+        return cartGoodsDetailDto;
+    }
+
     /**
      *  活动级别的促销均摊
      * 获取当前商品的售后价格