From 2549dcd977ed1cab382fb0f99a7a89d7ad9c25a2 Mon Sep 17 00:00:00 2001 From: YiFei Kuang Date: Tue, 21 Jan 2025 18:06:10 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=B8=88=E5=82=85=E4=BA=8C=E7=BA=A7?= =?UTF-8?q?=E6=8A=80=E8=83=BD=E7=B1=BB=E7=9B=AE=E7=AD=9B=E9=80=89=EF=BC=8C?= =?UTF-8?q?=E5=BE=85=E4=B8=8A=E9=97=A8=E8=B6=85=E6=97=B6=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ghy/web/controller/worker/WorkerController.java | 2 +- .../main/java/com/ghy/quartz/service/impl/OrderServiceImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/worker/WorkerController.java b/ghy-admin/src/main/java/com/ghy/web/controller/worker/WorkerController.java index 186b638e..03aa6c03 100644 --- a/ghy-admin/src/main/java/com/ghy/web/controller/worker/WorkerController.java +++ b/ghy-admin/src/main/java/com/ghy/web/controller/worker/WorkerController.java @@ -169,7 +169,7 @@ public class WorkerController extends BaseController { } // 如果选择了上级类目但未选择最终类目,则查询该类目下所有子类目 if(StringUtils.isNotEmpty(workerListRequest.getCategoryLevel1()) - && workerListRequest.getGoodsCategoryId() == null) { + && StringUtils.isEmpty(workerListRequest.getCategoryLevel2()) && workerListRequest.getGoodsCategoryId() == null) { // 1. 先查找二级类目 GoodsCategory param = new GoodsCategory(); param.setParentCategoryId(Long.valueOf(workerListRequest.getCategoryLevel1())); diff --git a/ghy-quartz/src/main/java/com/ghy/quartz/service/impl/OrderServiceImpl.java b/ghy-quartz/src/main/java/com/ghy/quartz/service/impl/OrderServiceImpl.java index 92afb834..052ee9d9 100644 --- a/ghy-quartz/src/main/java/com/ghy/quartz/service/impl/OrderServiceImpl.java +++ b/ghy-quartz/src/main/java/com/ghy/quartz/service/impl/OrderServiceImpl.java @@ -203,7 +203,7 @@ public class OrderServiceImpl implements OrderService { } } // 未超时的单 - if (order.getOrderStatus().equals(OrderStatus.SERVER.code())) { + else if (order.getOrderStatus().equals(OrderStatus.SERVER.code())) { // 服务中状态要按预计上门时间计算4h超时 Date overTime = DateUtils.addMilliseconds(order.getExpectTimeStart(), 4 * 60 * 60 * 1000); if (overTime.before(now)) {