去掉行记录计算

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

@@ -138,11 +138,11 @@ public class MaterialPromotionService implements IPromotionService {
                 pk = shoppingCartConvertAdapter.jointPk(material.getCartGoodsUid(), material.getGoodsId());
                 if (mApportion.get(pk) == null) {
                     MaterialApportion materialApportion = new MaterialApportion();
-                    materialApportion.setSalePrice(material.getNowPrice());
-                    materialApportion.setAmount(material.getNowPrice() * material.getGoodsQuantity());
+                    //materialApportion.setSalePrice(material.getNowPrice());
+                    //materialApportion.setAmount(material.getNowPrice() * material.getGoodsQuantity());
                     materialApportion.setApportionAmount(material.getApportionAmount() * material.getGoodsQuantity());
                     materialApportion.setGoodsId(material.getGoodsId());
-                    materialApportion.setTotalDiscountAmount(material.getApportionAmount()*material.getGoodsQuantity());
+                    materialApportion.setTotalDiscountAmount(material.getApportionAmount() * material.getGoodsQuantity());
                     materialApportion.setPk(pk);
                     ApportionDetails apportionDetails = new ApportionDetails();
                     if (CollectionUtils.isNotEmpty(material.getApportionDetails())) {
@@ -155,10 +155,10 @@ public class MaterialPromotionService implements IPromotionService {
                     continue;
                 }
                 MaterialApportion apportion = mApportion.get(pk);
-                apportion.setSalePrice(apportion.getSalePrice() + material.getNowPrice());
-                apportion.setAmount(apportion.getAmount() + material.getNowPrice() * material.getGoodsQuantity());
+                //apportion.setSalePrice(apportion.getSalePrice() + material.getNowPrice());
+                //apportion.setAmount(apportion.getAmount() + material.getNowPrice() * material.getGoodsQuantity());
                 apportion.setApportionAmount(apportion.getApportionAmount() + material.getApportionAmount() * material.getGoodsQuantity());
-                apportion.setTotalDiscountAmount(apportion.getTotalDiscountAmount()+material.getApportionAmount()*material.getGoodsQuantity());
+                apportion.setTotalDiscountAmount(apportion.getTotalDiscountAmount() + material.getApportionAmount() * material.getGoodsQuantity());
                 mApportion.put(pk, apportion);
             }
         }