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

a9e0b2df · 徐康 · c788ad0d · 3906ecc8 · a9e0b2df
Commit a9e0b2df authored Aug 12, 2020 by 徐康
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

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

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
@@ -134,8 +134,8 @@ public class OrderAdapter {
        long deliveryAmount = 0;
        long discountDeliveryAmount = 0;
        if (createOrderVo.getMenuType().equals(BusinessTypeEnum.SAAS_DELIVERY.getCode())) {
-            deliveryAmount = shoppingCartGoodsDto.getDeliveryAmount();
-            discountDeliveryAmount = shoppingCartGoodsDto.getDeliveryAmount();
+            deliveryAmount = shoppingCartGoodsDto.getDeliveryAmount()==null?9l:shoppingCartGoodsDto.getDeliveryAmount();
+            discountDeliveryAmount = shoppingCartGoodsDto.getDeliveryAmount()==null?9l:shoppingCartGoodsDto.getDeliveryAmount();
            if(shoppingCartGoodsDto.getIsDiscountDelivery() && deliveryAmount>shoppingCartGoodsDto.getDiscountDeliveryAmount()){
                discountDeliveryAmount = shoppingCartGoodsDto.getDiscountDeliveryAmount();
            }