fix 实付配送费用

03be8813 · xiaoer.li@freemud.com · 28610b62 · 03be8813
Commit 03be8813 authored Sep 01, 2020 by xiaoer.li@freemud.com
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletions

order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
+2 -1

No files found.
--- a/order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
+++ b/order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
@@ -1023,7 +1023,8 @@ public class OrderAdapter {
                        responseVo.setPromotionMessage(promotionMessageDto);
                    }
                    if (OrderAccountType.DELIVERY_AMOUNT.getCode().equals(accountBean.getType())) {
-                        deliveryAmount = accountBean.getPrice();
+                        //deliveryAmount = accountBean.getPrice();
+                        deliveryAmount = null != accountBean.getActualCostAmount() ? accountBean.getActualCostAmount() : accountBean.getPrice();
                    }
                    if (OrderAccountType.PACK_AMOUNT.getCode().equals(accountBean.getType())) {
                        packageAmount = accountBean.getPrice();