Merge remote-tracking branch 'remotes/origin/feature/1.9.32_商品加料' into develop

# Conflicts:
#	assortment-shoppingcart-sdk/pom.xml
#	shopping-cart-application-service/pom.xml

assortment-shoppingcart-sdk/src/main/java/com/freemud/sdk/api/assortment/shoppingcart/adapter/ShoppingCartAdapter.java

@@ -352,11 +352,11 @@ public class ShoppingCartAdapter {
         Long originalMaterAmount = 0L;
         String materialSubName = cartGoods.getSubName();
         for (CartGoods.MaterialGoods materialGoods : cartGoods.getProductMaterialList()) {
-            ProductBeanDTO.ProductGroupType.GroupDetailType detail = materialHash.get(materialGoods.getMaterialId());
+            ProductBeanDTO.ProductGroupType.GroupDetailType detail = materialHash.get(materialGoods.getSpuId());
             if (detail == null) continue;
             CartGoods.MaterialGoods material = new CartGoods.MaterialGoods();
-            material.setMaterialName(detail.getProductName());
-            material.setMaterialId(detail.getProductId());
+            material.setSpuName(detail.getProductName());
+            material.setSpuId(detail.getProductId());
             //行单价 \ 行总价
             material.setFinalPrice(detail.getProductFinalPrice().longValue());
             material.setAmount(detail.getProductFinalPrice().longValue());

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

@@ -302,11 +302,11 @@ public class CartGoods {
         /**
          * 加料Id
          */
-        private String materialId;
+        private String spuId;
         /**
          * 加料名称
          */
-        private String materialName;
+        private String spuName;
         /**
          * 购物车一行商品的现单价
          */

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

@@ -115,8 +115,8 @@ public class ShoppingCartConvertAdapter {
             List<ShoppingCartGoodsDto.CartGoodsDetailDto.MaterialGoods> materialList = new ArrayList<>(0);
             for (CartGoods.MaterialGoods materialGoods : cartGoods.getProductMaterialList()) {
                 ShoppingCartGoodsDto.CartGoodsDetailDto.MaterialGoods goods = new ShoppingCartGoodsDto.CartGoodsDetailDto.MaterialGoods();
-                goods.setMaterialId(materialGoods.getMaterialId());
-                goods.setMaterialName(materialGoods.getMaterialName());
+                goods.setSpuId(materialGoods.getSpuId());
+                goods.setSpuName(materialGoods.getSpuName());
                 goods.setOriginalPrice(materialGoods.getOriginalPrice());
                 goods.setSalePrice(materialGoods.getFinalPrice());
                 materialList.add(goods);
@@ -399,7 +399,7 @@ public class ShoppingCartConvertAdapter {
         if (CollectionUtils.isNotEmpty(addShoppingCartGoodsRequestVo.getProductMaterialList())) {
             for (MaterialRequestVo materialRequestVo : addShoppingCartGoodsRequestVo.getProductMaterialList()) {
                 CartGoods.MaterialGoods materialGoods = new CartGoods.MaterialGoods();
-                materialGoods.setMaterialId(materialRequestVo.getMaterialId());
+                materialGoods.setSpuId(materialRequestVo.getSpuId());
                 materialGoodsList.add(materialGoods);
             }
         }

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

@@ -262,8 +262,8 @@ public class ShoppingCartGoodsDto {
             /**
              * 加料商品ID
              */
-            private String materialId;
-            private String materialName;
+            private String spuId;
+            private String spuName;
             /**
              * 商品行记录：当前元售价
              */

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

@@ -381,11 +381,11 @@ public class CartGoods {
         /**
          * 加料Id
          */
-        private String materialId;
+        private String spuId;
         /**
          * 加料名称
          */
-        private String materialName;
+        private String spuName;
         /**
          * 购物车一行商品的原单价
          */

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

@@ -19,5 +19,5 @@ public class MaterialRequestVo {
     /**
      * 加料商品ID
      */
-    private String materialId;
+    private String spuId;
 }

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

@@ -47,7 +47,7 @@ public class MaterialPromotionService implements IPromotionService {
             for (CartGoods cartGoods : cartGoodsList) {
                 if (CollectionUtils.isEmpty(cartGoods.getProductMaterialList())) continue;
                 for (CartGoods.MaterialGoods materialGoods : cartGoods.getProductMaterialList()) {
-                    ActivityCalculationDiscountResponseDto.CalculationDiscountResult.ApportionGoods.Material material = map.get(materialGoods.getMaterialId());
+                    ActivityCalculationDiscountResponseDto.CalculationDiscountResult.ApportionGoods.Material material = map.get(materialGoods.getSpuId());
                     //设置小料行单价和行总价
                     if (material.getNowPrice() > 0) {
                         materialGoods.setFinalPrice(material.getNowPrice());
@@ -87,9 +87,9 @@ public class MaterialPromotionService implements IPromotionService {
         if (map == null && map.isEmpty()) return;
         List<ShoppingCartGoodsDto.CartGoodsDetailDto> products = shoppingCartGoodsDto.getProducts();
         for (ShoppingCartGoodsDto.CartGoodsDetailDto product : products) {
-            if (product.getMaterialList().size() == 0) return;
+            if (CollectionUtils.isEmpty(product.getMaterialList())) continue;
             for (ShoppingCartGoodsDto.CartGoodsDetailDto.MaterialGoods materialGoods : product.getMaterialList()) {
-                ActivityCalculationDiscountResponseDto.CalculationDiscountResult.ApportionGoods.Material material = map.get(materialGoods.getMaterialId());
+                ActivityCalculationDiscountResponseDto.CalculationDiscountResult.ApportionGoods.Material material = map.get(materialGoods.getSpuId());
                 if (material.getApportionAmount().intValue() == 0) continue;
 
                 //设置行记录参加的活动及总优惠
@@ -106,6 +106,15 @@ public class MaterialPromotionService implements IPromotionService {
                 product.setProductType(GoodsTypeEnum.MATERIAL.getGoodsType());
             }
         }
+        //将小料的价格累加到商品行上
+        for (ShoppingCartGoodsDto.CartGoodsDetailDto product : products) {
+            if (CollectionUtils.isEmpty(product.getMaterialList())) continue;
+            for (ShoppingCartGoodsDto.CartGoodsDetailDto.MaterialGoods materialGoods : product.getMaterialList()) {
+                product.setSalePrice(product.getSalePrice() + materialGoods.getSalePrice());//现金
+                product.setOriginalPrice(product.getOriginalPrice() + materialGoods.getOriginalPrice());
+                product.setTotalDiscountAmount(product.getTotalDiscountAmount() + materialGoods.getTotalDiscountAmount());
+            }
+        }
     }
 
     /**

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

@@ -857,7 +857,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
             for (CartGoods.MaterialGoods materialGoods : cartGoods.getProductMaterialList()) {
                 ActivityCalculationDiscountRequestDto.CalculationDiscountGoods.Material material = new ActivityCalculationDiscountRequestDto.CalculationDiscountGoods.Material();
                 material.setType(1);
-                material.setGoodsId(materialGoods.getMaterialId());
+                material.setGoodsId(materialGoods.getSpuId());
                 material.setGoodsQuantity(cartGoods.getQty());
                 material.setOriginalPrice(materialGoods.getFinalPrice());
                 materials.add(material);