自提截止时间

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/order/GicOrderController.java

@@ -254,6 +254,10 @@ public class GicOrderController {
             if(!(orderDetailVO.getOrderStep().equals("2") || orderDetailVO.getOrderStep().equals("4"))) {
                 return RestResponse.failure("9999", "核销订单不存在");
             }
+            Date pickOverTime = detail.getOrderInfo().getPickUpOverTime() ;
+            if(null != pickOverTime && pickOverTime.after(new Date())) {
+                return RestResponse.failure("9999", "此订单自提时间已截止");
+            }
             return RestResponse.successResult(orderDetailVO);
         } else {
             return RestResponse.failure("9999", ret.getMessage());