Commit de2ab5ac by 徐康

问题修复

parent 9f133aa3
...@@ -287,7 +287,11 @@ public class CouponDiscountCalculation { ...@@ -287,7 +287,11 @@ public class CouponDiscountCalculation {
int index2 = nowCartGoodsList.indexOf(cartGoods); int index2 = nowCartGoodsList.indexOf(cartGoods);
if(index2 < i) { if(index2 < i) {
changed.set(true); changed.set(true);
nowCartGoodsList.get(index2).setQty(nowCartGoodsList.get(index2).getQty() + cartGoods.getQty()); CartGoods cartGoodsNow = nowCartGoodsList.get(index2);
cartGoodsNow.setQty(cartGoodsNow.getQty() + cartGoods.getQty());
cartGoodsNow.setAmount(cartGoodsNow.getAmount() + cartGoods.getAmount());
cartGoodsNow.setMaterialAmount(cartGoodsNow.getMaterialAmount() + cartGoods.getMaterialAmount());
cartGoodsNow.setOriginalAmount(cartGoodsNow.getOriginalAmount() + cartGoods.getOriginalAmount());
nowCartGoodsList.remove(i); nowCartGoodsList.remove(i);
} }
ApiLog.debug("合并买3赠1商品券 【merge-ing】 : {} ", JSONObject.toJSONString(nowCartGoodsList)); ApiLog.debug("合并买3赠1商品券 【merge-ing】 : {} ", JSONObject.toJSONString(nowCartGoodsList));
......
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