Skip to content

O
order-group
Commit 9f133aa3 by 徐康
Options

修复问题

parent 0f0c5e3f
Showing with 3 additions and 3 deletions
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/calculation/CouponDiscountCalculation.java
...@@ -226,14 +226,14 @@ public class CouponDiscountCalculation { ...@@ -226,14 +226,14 @@ public class CouponDiscountCalculation {
cartGoods.setQty(b3S1DiscountOptional.get().getActualGoodsNumber()); cartGoods.setQty(b3S1DiscountOptional.get().getActualGoodsNumber());
cartGoods.setCouponCode(b3S1DiscountOptional.get().getActivityCode()); cartGoods.setCouponCode(b3S1DiscountOptional.get().getActivityCode());
cartGoods.setCouponName(b3S1DiscountOptional.get().getActivityName()); cartGoods.setCouponName(b3S1DiscountOptional.get().getActivityName());
cartGoods.setOriginalAmount(cartGoods.getOriginalPrice() * cartGoods.getQty()); cartGoods.setOriginalAmount(cartGoods.getOriginalPrice() * cartGoods.getQty() + materialPrice * cartGoods.getQty());
cartGoods.setAmount(goodsMap.get(cartGoods.getCartGoodsUid()).getRealAmount() + materialPrice * cartGoods.getQty()); cartGoods.setAmount(0 + materialPrice * cartGoods.getQty());
cartGoods.setIsB3S1CouponGoods(1); cartGoods.setIsB3S1CouponGoods(1);
cartGoodsNew.setCartGoodsUid(UUID.randomUUID().toString()); cartGoodsNew.setCartGoodsUid(UUID.randomUUID().toString());
cartGoodsNew.setQty(newNum); cartGoodsNew.setQty(newNum);
cartGoodsNew.setCouponCode(null); cartGoodsNew.setCouponCode(null);
cartGoodsNew.setCouponName(null); cartGoodsNew.setCouponName(null);
cartGoodsNew.setOriginalAmount(cartGoods.getOriginalPrice() * newNum); cartGoodsNew.setOriginalAmount(cartGoods.getOriginalPrice() * newNum + materialPrice * newNum);
cartGoodsNew.setAmount(cartGoods.getOriginalPrice() * newNum + materialPrice * newNum); cartGoodsNew.setAmount(cartGoods.getOriginalPrice() * newNum + materialPrice * newNum);
newCartGoodsList.add(cartGoodsNew); newCartGoodsList.add(cartGoodsNew);
} else if(cartGoods.getQty() == b3S1DiscountOptional.get().getActualGoodsNumber()) { } else if(cartGoods.getQty() == b3S1DiscountOptional.get().getActualGoodsNumber()) {
......
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