Merge branch 'feature/20200727_麦咖啡p1v2支付券码路由' into qa

4855d3ca · 徐康 · e607833e · b9a416e8 · 4855d3ca
Commit 4855d3ca authored Sep 03, 2020 by 徐康
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

order-application-service/src/main/java/cn/freemud/adapter/DeliveryAdapter.java
+2 -0

No files found.
--- a/order-application-service/src/main/java/cn/freemud/adapter/DeliveryAdapter.java
+++ b/order-application-service/src/main/java/cn/freemud/adapter/DeliveryAdapter.java
@@ -153,6 +153,8 @@ public class DeliveryAdapter {
            if (CollectionUtils.isNotEmpty(collect)) {
                //配送费
                deliveryOrderRequestDto.setDeliveryTotal(collect.get(0).getPrice().intValue());
+            } else {
+                deliveryOrderRequestDto.setDeliveryTotal(0);
            }
        }else {
            deliveryOrderRequestDto.setDeliveryTotal(0);