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

5c1c646c · xiaoer.li@freemud.com · e01fd249 · 2fcbe42b · 5c1c646c
Commit 5c1c646c authored Nov 16, 2020 by xiaoer.li@freemud.com
Hide whitespace changes
Inline Side-by-side

Showing with 1 additions and 1 deletions

order-application-service/src/main/java/cn/freemud/service/impl/CheckOrder.java
+1 -1

No files found.
--- a/order-application-service/src/main/java/cn/freemud/service/impl/CheckOrder.java
+++ b/order-application-service/src/main/java/cn/freemud/service/impl/CheckOrder.java
@@ -764,7 +764,7 @@ public class CheckOrder {
        }
        Integer svcAmount = 0 ;
        Integer svcVAmount = 0 ;
-        Long totalVAmount = shoppingCartGoodsDto.getTotalAmount();
+        Long totalVAmount = shoppingCartGoodsDto.getTotalAmount() +shoppingCartGoodsDto.getPackageAmount();
        if (svcCardAmount.getData().getData().getCardSimpleInfos().size()>0) {
            svcAmount = svcCardAmount.getData().getData().getCardSimpleInfos().get(0).getAmount();
            svcVAmount = svcCardAmount.getData().getData().getCardSimpleInfos().get(0).getVamount();