Skip to content

H
haoban-manage3.0
Commit 162283ed by 徐高华
Options

核销文案

parent 97ef61d8
Showing with 1 additions and 1 deletions
haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/order/GicOrderController.java
...@@ -271,7 +271,7 @@ public class GicOrderController { ...@@ -271,7 +271,7 @@ public class GicOrderController {
return RestResponse.failure("9999", "核销订单不存在"); return RestResponse.failure("9999", "核销订单不存在");
} }
Date pickOverTime = detail.getOrderInfo().getPickUpOverTime() ; Date pickOverTime = detail.getOrderInfo().getPickUpOverTime() ;
if(null != pickOverTime && pickOverTime.before(new Date())) { if(null != pickOverTime && pickOverTime.before(new Date()) && detail.getOrderInfo().getOrderStep()!=4) {
return RestResponse.failure("9999", "此订单自提时间已截止"); return RestResponse.failure("9999", "此订单自提时间已截止");
} }
return RestResponse.successResult(orderDetailVO); return RestResponse.successResult(orderDetailVO);
......
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