Merge remote-tracking branch 'origin/qa' into qa

85d04a5f · 徐康 · 93135153 · fe8ab1c1 · 85d04a5f
Commit 85d04a5f authored Jun 16, 2021 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
@@ -731,7 +731,7 @@ public class OrderAdapter {
        createOrderDto.setMenuType(BusinessTypeEnum.getByCode(createOrderVo.getMenuType()));
        createOrderDto.setMarketingType(createOrderVo.getMarketingType());
        // 【ID1030916】订单查询门店获取预计送达时间
-        createOrderDto.setEstimateDeliveryCompleteTime(createOrderVo.getUserDeliveryInfoDto().getEstimateDeliveryCompleteTime());
+        createOrderDto.setEstimateDeliveryCompleteTime(createOrderVo.getUserDeliveryInfoDto() == null ? null : createOrderVo.getUserDeliveryInfoDto().getEstimateDeliveryCompleteTime());
        return createOrderDto;
    }