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

@@ -371,9 +371,11 @@ public class ShoppingCartAdapter {
         }
         //设置购物车行记录
         cartGoods.setProductMaterialList(materialGoodsList);
+        //加料行记录现价总价
         cartGoods.setMaterialAmount(materialAmount);
+        //加料行记录原价总价
         cartGoods.setOriginalMaterialAmount(originalMaterAmount);
-        cartGoods.setOriginalAmount(cartGoods.getOriginalPrice() + originalMaterAmount);
+        cartGoods.setOriginalAmount(cartGoods.getOriginalAmount() + originalMaterAmount);
         cartGoods.setSubName(materialSubName);
     }
 

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

@@ -56,15 +56,19 @@ public class MaterialPromotionService implements IPromotionService {
                 }
             }
         }
-        long materialAmount = 0L;
+        long materialAmount = 0L, materialOriginal = 0L;
+
         for (CartGoods cartGoods : cartGoodsList) {
             if (cartGoods.getProductMaterialList().size() == 0) continue;
             materialAmount = 0L;
+            materialOriginal = 0L;
             for (CartGoods.MaterialGoods materialGoods : cartGoods.getProductMaterialList()) {
                 materialAmount += materialGoods.getFinalPrice() * cartGoods.getQty();
+                materialOriginal += materialGoods.getOriginalPrice() * cartGoods.getQty();
             }
-            //设置商品行现总价 商品总价+小料商品总价
+            //设置商品行现总价\行原价 商品总价+小料商品总价
             cartGoods.setAmount(cartGoods.getAmount() + materialAmount);
+            cartGoods.setOriginalAmount(cartGoods.getOriginalAmount() + materialOriginal);
         }
     }