Merge branches 'develop' and 'feature/20200303_预约单2_wuping' of…

Merge branches 'develop' and 'feature/20200303_预约单2_wuping' of http://gitlab.freemud.com/order-group-application/order-group into develop

order-management/src/main/java/cn/freemud/management/service/OrderDeliveryService.java

@@ -169,7 +169,9 @@ public class OrderDeliveryService {
         deliveryOrderRequestDto.setOrderTime(new Date(order.getGmtCreate()));
         deliveryOrderRequestDto.setCallbackUrl(deliveryCallBackUrl);
         // 预约单预计送到时间
+        if (order.getGmtExpect() != null && order.getGmtExpect() != 0) {
             deliveryOrderRequestDto.setExpectTime(new Date(order.getGmtExpect()));
+        }
         deliveryOrderRequestDto.setIsPre(order.getGmtExpect() != null ? 1 : 0);
         List<CreateDeliveryOrderRequestDto.DeliveryProductInfo> productInfos = new ArrayList<>();
         order.getProductList().forEach(productList -> {