Commit 7fa6dfab by xiaoer.li@freemud.com

Merge remote-tracking branch 'remotes/origin/feature/1.9.32_商品加料' into qa

parents d0e97aa7 26099349
...@@ -151,7 +151,7 @@ public class MaterialPromotionService implements IPromotionService { ...@@ -151,7 +151,7 @@ public class MaterialPromotionService implements IPromotionService {
mApportion.put(pk, materialApportion); mApportion.put(pk, materialApportion);
continue; continue;
} }
MaterialApportion apportion = mApportion.get(material.getGoodsId()); MaterialApportion apportion = mApportion.get(pk);
apportion.setSalePrice(apportion.getSalePrice() + material.getNowPrice()); apportion.setSalePrice(apportion.getSalePrice() + material.getNowPrice());
apportion.setAmount(apportion.getAmount() + material.getNowPrice() * material.getGoodsQuantity()); apportion.setAmount(apportion.getAmount() + material.getNowPrice() * material.getGoodsQuantity());
apportion.setApportionAmount(apportion.getApportionAmount() + material.getApportionAmount() * material.getGoodsQuantity()); apportion.setApportionAmount(apportion.getApportionAmount() + material.getApportionAmount() * material.getGoodsQuantity());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment