核销文案

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

@@ -271,7 +271,7 @@ public class GicOrderController {
                 return RestResponse.failure("9999", "核销订单不存在");
             }
             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.successResult(orderDetailVO);