Commit 9a3b33f2 by ping.wu

创建配送单预约时间判断错误修改

parent 16c4f92a
...@@ -169,7 +169,9 @@ public class OrderDeliveryService { ...@@ -169,7 +169,9 @@ public class OrderDeliveryService {
deliveryOrderRequestDto.setOrderTime(new Date(order.getGmtCreate())); deliveryOrderRequestDto.setOrderTime(new Date(order.getGmtCreate()));
deliveryOrderRequestDto.setCallbackUrl(deliveryCallBackUrl); deliveryOrderRequestDto.setCallbackUrl(deliveryCallBackUrl);
// 预约单预计送到时间 // 预约单预计送到时间
deliveryOrderRequestDto.setExpectTime(new Date(order.getGmtExpect())); if (order.getGmtExpect() != null && order.getGmtExpect() != 0) {
deliveryOrderRequestDto.setExpectTime(new Date(order.getGmtExpect()));
}
deliveryOrderRequestDto.setIsPre(order.getGmtExpect() != null ? 1 : 0); deliveryOrderRequestDto.setIsPre(order.getGmtExpect() != null ? 1 : 0);
List<CreateDeliveryOrderRequestDto.DeliveryProductInfo> productInfos = new ArrayList<>(); List<CreateDeliveryOrderRequestDto.DeliveryProductInfo> productInfos = new ArrayList<>();
order.getProductList().forEach(productList -> { order.getProductList().forEach(productList -> {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment