clunt
/
ghy-all
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

fix: 师傅二级技能类目筛选，待上门超时问题

This commit is contained in:
YiFei Kuang 2025-01-21 18:06:10 +08:00
parent 934afa402a
commit 2549dcd977
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ghy-admin/src/main/java/com/ghy/web/controller/worker/WorkerController.java
View File

@ -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()));

2
ghy-quartz/src/main/java/com/ghy/quartz/service/impl/OrderServiceImpl.java
View File

@ -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)) {