增加超时配置

0538d644 · 姜海波 · 44ecdb1e · 0538d644
Commit 0538d644 authored Apr 08, 2020 by 姜海波
Show whitespace changes
Inline Side-by-side

Showing with 1 additions and 1 deletions

order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
+1 -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
@@ -134,7 +134,7 @@ public class OrderAdapter {
        ArrayList<CreateOrderAccountRequest> orderAccountDtos = new ArrayList<>();
        long deliveryAmount = 0;
        long discountDeliveryAmount = 0;
-        if (deliveryInfoDto != null) {
+        if (StringUtils.isNotEmpty(createOrderVo.getMenuType())&&deliveryInfoDto != null) {
            deliveryAmount = shoppingCartGoodsDto.getDeliveryAmount();
            discountDeliveryAmount = shoppingCartGoodsDto.getDeliveryAmount();
            if(shoppingCartGoodsDto.getIsDiscountDelivery() && deliveryAmount>shoppingCartGoodsDto.getDiscountDeliveryAmount()){