小料价格和成交价分开显示

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

@@ -378,8 +378,8 @@ public class ShoppingCartAdapter {
         cartGoods.setMaterialAmount(materialAmount);
         //加料行记录原价总价
         cartGoods.setOriginalMaterialAmount(originalMaterAmount);
-        cartGoods.setOriginalAmount(cartGoods.getOriginalAmount() + originalMaterAmount);
-        cartGoods.setSubName(StringUtils.strip(materialSubName, "/"));
+        //cartGoods.setOriginalAmount(cartGoods.getOriginalAmount() + originalMaterAmount);
+        //cartGoods.setSubName(StringUtils.strip(materialSubName, "/"));
     }
 
     private boolean updateComboxGoodsInfo(CartGoods cartGoods, CartGoods.ComboxGoods comboxGoods, ProductBeanDTO parentProductBean, List<ProductBeanDTO> productBeans, CartGoodsStates cartGoodsStates, List<String> invalidGoodsIdList) {

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

@@ -173,7 +173,7 @@ public class CartGoods {
     private List<ComboxGoods> productGroupList;
 
     /**
-     * 商品加料
+     * 商品原始加料数据
      */
     private List<MaterialGoods> productMaterialList;
 

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

@@ -48,18 +48,20 @@ public class MaterialPromotionService implements IPromotionService {
     public void updateShoppingCartGoodsDiscount(CouponPromotionVO couponPromotionVO, ActivityQueryDto activityQueryDto, ActivityCalculationDiscountResponseDto.CalculationDiscountResult calculationDiscountResult, List<CartGoods> cartGoodsList, ShoppingCartGoodsResponseVo shoppingCartGoodsResponseVo, UserLoginInfoDto userLoginInfoDto, ShoppingCartInfoRequestVo shoppingCartInfoRequestVo) {
 
         long materialAmount = 0L, materialOriginal = 0L;
-
+        //todo : 加料和商品成交价不需要累计 分开显示
         for (CartGoods cartGoods : cartGoodsList) {
             if (CollectionUtils.isEmpty(cartGoods.getProductMaterialList())) continue;
             materialAmount = 0L;
             materialOriginal = 0L;
             for (CartGoods.MaterialGoods materialGoods : cartGoods.getProductMaterialList()) {
-                materialAmount += materialGoods.getFinalPrice()*cartGoods.getQty();
-                materialOriginal += materialGoods.getOriginalPrice() * cartGoods.getQty();
+                //materialAmount += materialGoods.getFinalPrice()*cartGoods.getQty();
+                //materialOriginal += materialGoods.getOriginalPrice() * cartGoods.getQty();
+                materialGoods.setAmount(materialGoods.getFinalPrice() * cartGoods.getQty());
+                materialGoods.setOriginalAmount(materialGoods.getOriginalPrice() * cartGoods.getQty());
             }
             //设置商品行现总价\行原价 商品总价+小料商品总价
-            cartGoods.setAmount(cartGoods.getAmount() + materialAmount);
-            cartGoods.setOriginalAmount(cartGoods.getOriginalAmount() + materialOriginal);
+            //cartGoods.setAmount(cartGoods.getAmount() + materialAmount);
+            //cartGoods.setOriginalAmount(cartGoods.getOriginalAmount() + materialOriginal);
         }
     }