Skip to content

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

Merge branch 'feature/2020-1104-混合支付' into qa

parents e01fd249 2fcbe42b
Showing with 1 additions and 1 deletions
order-application-service/src/main/java/cn/freemud/service/impl/CheckOrder.java
...@@ -764,7 +764,7 @@ public class CheckOrder { ...@@ -764,7 +764,7 @@ public class CheckOrder {
} }
Integer svcAmount = 0 ; Integer svcAmount = 0 ;
Integer svcVAmount = 0 ; Integer svcVAmount = 0 ;
Long totalVAmount = shoppingCartGoodsDto.getTotalAmount(); Long totalVAmount = shoppingCartGoodsDto.getTotalAmount() +shoppingCartGoodsDto.getPackageAmount();
if (svcCardAmount.getData().getData().getCardSimpleInfos().size()>0) { if (svcCardAmount.getData().getData().getCardSimpleInfos().size()>0) {
svcAmount = svcCardAmount.getData().getData().getCardSimpleInfos().get(0).getAmount(); svcAmount = svcCardAmount.getData().getData().getCardSimpleInfos().get(0).getAmount();
svcVAmount = svcCardAmount.getData().getData().getCardSimpleInfos().get(0).getVamount(); svcVAmount = svcCardAmount.getData().getData().getCardSimpleInfos().get(0).getVamount();
......
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