Merge branch 'feature/20210603-v2.0.33-订单获取预计送达时间ID1030763-周晓航' into qa

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;
     }