Skip to content

O
order-group
Commit c1d334cc by xiaoer.li@freemud.com
Options

Merge remote-tracking branch 'remotes/origin/feature/促销算价基于最新master的分支' into qa

parents 24618885 ff2bb994
Showing with 2 additions and 1 deletions
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/calculate/CalculationCommonService.java
...@@ -69,7 +69,8 @@ public class CalculationCommonService { ...@@ -69,7 +69,8 @@ public class CalculationCommonService {
CalculationSharingDiscountResponseDto.CalculationDiscountResult.Goods find = goods.stream().filter((k) -> k.getCartGoodsUid().equals(cartGoods.getCartGoodsUid())).findFirst().get(); CalculationSharingDiscountResponseDto.CalculationDiscountResult.Goods find = goods.stream().filter((k) -> k.getCartGoodsUid().equals(cartGoods.getCartGoodsUid())).findFirst().get();
if (find == null) continue; if (find == null) continue;
//成交价行记录 //成交价行记录
amount += find.getRealAmount() * cartGoods.getQty(); //amount += find.getRealAmount() * cartGoods.getQty();
amount += find.getRealAmount();
cartGoods.setAmount(amount); cartGoods.setAmount(amount);
totalAmount += amount; totalAmount += amount;
//原价行记录 //原价行记录
......
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