Merge branch 'feature/20201217_四个非常搭套餐需求_yu.sun' into develop

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

@@ -800,7 +800,6 @@ public class ShoppingCartConvertAdapter {
 
             List<com.freemud.sdk.api.assortment.shoppingcart.domain.CartGoods.MaterialGoods> productMaterialList = new ArrayList<>();
             Long materialAmount = 0L;
-            Long originalMaterAmount = 0L;
             if (CollectionUtils.isNotEmpty(materialList)){
                 for (ProductTypeBeanDTO.ProductGroupType.GroupDetailType detailType : materialList) {
                     com.freemud.sdk.api.assortment.shoppingcart.domain.CartGoods.MaterialGoods materialGoods = new com.freemud.sdk.api.assortment.shoppingcart.domain.CartGoods.MaterialGoods();
@@ -814,8 +813,6 @@ public class ShoppingCartConvertAdapter {
 
                     productMaterialList.add(materialGoods);
                     materialAmount += detailType.getProductFinalPrice().longValue() * comboxGoods.getQty();
-                    originalMaterAmount += detailType.getProductFinalPrice().longValue() * comboxGoods.getQty();
-
                 }
             }
             comboxGoods.setMaterialAmount(materialAmount);
@@ -968,6 +965,7 @@ public class ShoppingCartConvertAdapter {
                             cartGoods.getProductGroupList().stream().mapToLong(group -> (null != group.getMaterialAmount() ? group.getMaterialAmount() : 0)).sum();
                     cartGoods.setOriginalMaterialAmount(materialAmount);
                     cartGoods.setMaterialAmount(materialAmount);
+                    cartGoods.setOriginalAmount(cartGoods.getOriginalPrice()*cartGoods.getQty() + materialAmount);
                 }
             }
             //更新当前商品行价格
@@ -1142,7 +1140,7 @@ public class ShoppingCartConvertAdapter {
                                 ;
                                 materialSubName = materialSubName + "/" + detail.getProductName();
                             }
-                            //设置购物车行记录
+                            //设置购物车行加料列表
                             cartGoods.setProductMaterialList(materialGoodsList);
                             //加料行记录现价总价
                             cartGoods.setMaterialAmount(materialAmount);