加料原总价和现总价设0

assortment-shoppingcart-sdk/pom.xml

@@ -10,7 +10,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>assortment-shoppingcart-sdk</artifactId>
-    <version>1.1.3.733.RELEASE</version>
+    <version>1.1.3.734.RELEASE</version>
 
     <dependencies>
         <dependency>

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

@@ -321,6 +321,8 @@ public class ShoppingCartAdapter {
             cartGoods.setWeight(isSkuProduct ? skuProduct.getWeight() : spuProduct.getWeight());
             cartGoods.setUnit(isSkuProduct ? skuProduct.getUnit() : spuProduct.getUnit());
             cartGoods.setWeightType(CommonsConstant.WEIGHT_PRODUCT.equals(spuProduct.getWeightType()));
+            cartGoods.setMaterialAmount(0L);
+            cartGoods.setOriginalMaterialAmount(0L);
             // todo 设置加料
             this.checkMaterialProduct(cartGoods, spuProduct);
 
@@ -337,6 +339,7 @@ public class ShoppingCartAdapter {
      * @param spuProduct
      */
     private void checkMaterialProduct(CartGoods cartGoods, ProductBeanDTO spuProduct) {
+
         if (CollectionUtils.isEmpty(cartGoods.getProductMaterialList())) return;
         //加料信息为空
         if (CollectionUtils.isEmpty(spuProduct.getAdditionalGroupList())) return;
@@ -359,7 +362,7 @@ public class ShoppingCartAdapter {
             material.setSpuId(detail.getProductId());
             //行单价 \ 行总价
             material.setFinalPrice(detail.getProductFinalPrice().longValue());
-            material.setAmount(detail.getProductFinalPrice().longValue());
+            material.setAmount(detail.getProductFinalPrice().longValue() * cartGoods.getQty());
             //原行单价*数量
             material.setOriginalAmount(detail.getProductFinalPrice().longValue() * cartGoods.getQty());
             material.setOriginalPrice(detail.getProductFinalPrice().longValue());
@@ -376,7 +379,7 @@ public class ShoppingCartAdapter {
         //加料行记录原价总价
         cartGoods.setOriginalMaterialAmount(originalMaterAmount);
         cartGoods.setOriginalAmount(cartGoods.getOriginalAmount() + originalMaterAmount);
-        cartGoods.setSubName(materialSubName);
+        cartGoods.setSubName(StringUtils.strip(materialSubName, "/"));
     }
 
     private boolean updateComboxGoodsInfo(CartGoods cartGoods, CartGoods.ComboxGoods comboxGoods, ProductBeanDTO parentProductBean, List<ProductBeanDTO> productBeans, CartGoodsStates cartGoodsStates, List<String> invalidGoodsIdList) {