加料商品键位修改

assortment-shoppingcart-sdk/src/main/java/com/freemud/sdk/api/assortment/shoppingcart/domain/CartGoods.java

@@ -380,5 +380,9 @@ public class CartGoods {
          * 购物车一行商品的总现价
          */
         private Long amount;
+        /**
+         * 麦咖啡入机键位
+         */
+        private String keyWord;
     }
 }

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

@@ -698,7 +698,7 @@ public class ShoppingCartConvertAdapter {
         comboxGoods.setTax(isComboxGoods ? productComboType.getTax() : groupDetailType.getTax());
         comboxGoods.setTaxId(isComboxGoods ? productComboType.getTaxId() : groupDetailType.getTaxId());
 
-        //套餐内商品加料
+        // TODO: 2020/10/22  套餐内可选商品加料，暂无
         if(CollectionUtils.isNotEmpty(comboxGoods.getProductMaterialList())){
             List<com.freemud.sdk.api.assortment.shoppingcart.domain.CartGoods.MaterialGoods> productMaterialList = new ArrayList<>();
             com.freemud.sdk.api.assortment.shoppingcart.domain.CartGoods.MaterialGoods materialGoods = new com.freemud.sdk.api.assortment.shoppingcart.domain.CartGoods.MaterialGoods();
@@ -730,7 +730,10 @@ public class ShoppingCartConvertAdapter {
         }
         //提取加料信息
         List<String> materialSpu = new ArrayList<>();
-        List<ProductBeanDTO.ProductGroupType.GroupDetailType> groupDetail = spuProduct.getAdditionalGroupList().get(0).getGroupDetail();
+        List<ProductBeanDTO.ProductGroupType.GroupDetailType> groupDetail = new ArrayList<>();
+        for (ProductBeanDTO.ProductGroupType productGroupType : spuProduct.getAdditionalGroupList()){
+            groupDetail.addAll(productGroupType.getGroupDetail());
+        }
         HashMap<String, ProductBeanDTO.ProductGroupType.GroupDetailType> materialHash = new HashMap<>();
         for (ProductBeanDTO.ProductGroupType.GroupDetailType groupDetailType : groupDetail) {
             materialHash.put(groupDetailType.getProductId(), groupDetailType);
@@ -758,6 +761,7 @@ public class ShoppingCartConvertAdapter {
             //原行单价*数量
             material.setOriginalAmount(detail.getProductFinalPrice().longValue() * cartGoods.getQty());
             material.setOriginalPrice(detail.getProductFinalPrice().longValue());
+            material.setKeyWord(materialGoods.getKeyWord());
             materialGoodsList.add(material);
             materialAmount += detail.getProductFinalPrice().longValue() * cartGoods.getQty();
             originalMaterAmount += detail.getProductFinalPrice().longValue() * cartGoods.getQty();
@@ -910,28 +914,26 @@ public class ShoppingCartConvertAdapter {
         //套餐内商品加料
         if(CollectionUtils.isNotEmpty(comboxGoods.getProductMaterialList())){
             if (CollectionUtils.isNotEmpty(productBeanDTO.getAdditionalGroupList())) {
-                List<ProductBeanDTO.ProductGroupType.GroupDetailType> groupDetail = productBeanDTO.getAdditionalGroupList().get(0).getGroupDetail();
-                ProductBeanDTO.ProductGroupType.GroupDetailType groupDetailType1 = null;
-                for (com.freemud.sdk.api.assortment.shoppingcart.domain.CartGoods.MaterialGoods productMaterialList :comboxGoods.getProductMaterialList()){
+                List<ProductBeanDTO.ProductGroupType.GroupDetailType> groupDetail = new ArrayList<>();
+                for (ProductBeanDTO.ProductGroupType productGroupType : productBeanDTO.getAdditionalGroupList()){
+                    groupDetail.addAll(productGroupType.getGroupDetail());
+                }
+                List<com.freemud.sdk.api.assortment.shoppingcart.domain.CartGoods.MaterialGoods> productMaterialList = new ArrayList<>();
+                for (com.freemud.sdk.api.assortment.shoppingcart.domain.CartGoods.MaterialGoods productMaterial :comboxGoods.getProductMaterialList()){
                     for (ProductBeanDTO.ProductGroupType.GroupDetailType groupDetailType : groupDetail){
-                        if(groupDetailType.getProductId().equals(productMaterialList.getSpuId())){
-                            groupDetailType1 = groupDetailType;
-                            break;
+                        if(groupDetailType.getProductId().equals(productMaterial.getSpuId())){
+                            com.freemud.sdk.api.assortment.shoppingcart.domain.CartGoods.MaterialGoods materialGoods = new com.freemud.sdk.api.assortment.shoppingcart.domain.CartGoods.MaterialGoods();
+                            materialGoods.setSpuId(groupDetailType.getProductId());
+                            materialGoods.setAmount(groupDetailType.getProductPrice().longValue());
+                            materialGoods.setFinalPrice(groupDetailType.getProductFinalPrice().longValue());
+                            materialGoods.setOriginalAmount(groupDetailType.getProductPrice().longValue());
+                            materialGoods.setOriginalPrice(groupDetailType.getProductPrice().longValue());
+                            materialGoods.setSpuName(groupDetailType.getProductName());
+                            materialGoods.setKeyWord(productMaterial.getKeyWord());
+                            productMaterialList.add(materialGoods);
                         }
                     }
                 }
-                if(groupDetailType1 == null){
-                    return;
-                }
-                List<com.freemud.sdk.api.assortment.shoppingcart.domain.CartGoods.MaterialGoods> productMaterialList = new ArrayList<>();
-                com.freemud.sdk.api.assortment.shoppingcart.domain.CartGoods.MaterialGoods materialGoods = new com.freemud.sdk.api.assortment.shoppingcart.domain.CartGoods.MaterialGoods();
-                materialGoods.setSpuId(groupDetailType1.getProductId());
-                materialGoods.setAmount(groupDetailType1.getProductPrice().longValue());
-                materialGoods.setFinalPrice(groupDetailType1.getProductFinalPrice().longValue());
-                materialGoods.setOriginalAmount(groupDetailType1.getProductPrice().longValue());
-                materialGoods.setOriginalPrice(groupDetailType1.getProductPrice().longValue());
-                materialGoods.setSpuName(groupDetailType1.getProductName());
-                productMaterialList.add(materialGoods);
                 comboxGoods.setProductMaterialList(productMaterialList);
             }
         }

shopping-cart-application-service/src/main/java/cn/freemud/entities/dto/shoppingCart/ShoppingCartGoodsDto.java

@@ -297,6 +297,8 @@ public class ShoppingCartGoodsDto {
              * 商品行优惠总金额=数量*单个商品优惠金额
              */
             private Integer totalDiscountAmount;
+
+            private String keyWord;
             /**
              * 当前商品享受的促销活动
              */

shopping-cart-application-service/src/main/java/cn/freemud/entities/vo/CartGoods.java

@@ -490,5 +490,10 @@ public class CartGoods {
          * 购物车一行商品的现价*数量
          */
         private Long amount;
+
+        /**
+         * 麦咖啡入机键位
+         */
+        private String keyWord;
     }
 }