From 5d5f67ef078b1a4343244750fb79a213a235488c Mon Sep 17 00:00:00 2001 From: cb <275647614@qq.com> Date: Fri, 21 Nov 2025 17:41:04 +0800 Subject: [PATCH] no message --- .../com/ghy/web/controller/order/OrderController.java | 4 +++- .../controller/worker/WorkerCertificationController.java | 2 ++ .../templates/worker/certification/certification.html | 4 ++++ .../src/main/java/com/ghy/order/domain/OrderMaster.java | 7 +++++++ .../service/impl/AfterServiceRecordServiceImpl.java | 9 ++++++--- .../java/com/ghy/worker/domain/WorkerCertification.java | 2 ++ .../mapper/worker/WorkerCertificationMapper.xml | 6 +++++- 7 files changed, 29 insertions(+), 5 deletions(-) diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java index 5820f874..6d717308 100644 --- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java +++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java @@ -1250,7 +1250,9 @@ public class OrderController extends BaseController { List list = orderDetailService.selectOrderDetailList(orderDetailReq); long size = list.stream() .filter(order -> order.getOrderStatus() != 6) // 先过滤状态不等于6的订单 - .filter(order -> order.getOrderStatus() != 5).count(); + .filter(order -> order.getOrderStatus() != 5) + .filter(order->order.getOrderType()==1&&order.getOrderStatus()!=OrderStatus.GOING.code()) + .count(); count += size; logger.info("子单超时数量{}", count); List allList = new ArrayList<>(); diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/worker/WorkerCertificationController.java b/ghy-admin/src/main/java/com/ghy/web/controller/worker/WorkerCertificationController.java index 071bc07a..1caa18e7 100644 --- a/ghy-admin/src/main/java/com/ghy/web/controller/worker/WorkerCertificationController.java +++ b/ghy-admin/src/main/java/com/ghy/web/controller/worker/WorkerCertificationController.java @@ -162,6 +162,8 @@ public class WorkerCertificationController extends BaseController @ResponseBody @Transactional(rollbackFor = Exception.class) public AjaxResult appAddCertify(@RequestBody WorkerCertification request) { + Worker worker = workerService.selectById(request.getWorkerId()); + request.setWorkerPhone(worker != null ? worker.getPhone() : null); // 将师傅状态设置为冻结 // Worker worker = new Worker(); // worker.setWorkerId(request.getWorkerId()); diff --git a/ghy-admin/src/main/resources/templates/worker/certification/certification.html b/ghy-admin/src/main/resources/templates/worker/certification/certification.html index 403639eb..3a9538f2 100644 --- a/ghy-admin/src/main/resources/templates/worker/certification/certification.html +++ b/ghy-admin/src/main/resources/templates/worker/certification/certification.html @@ -77,6 +77,10 @@ title: '师傅者id', visible: false }, + { + field: 'workerPhone', + title: '手机号' + }, { field: 'name', title: '真实姓名' diff --git a/ghy-order/src/main/java/com/ghy/order/domain/OrderMaster.java b/ghy-order/src/main/java/com/ghy/order/domain/OrderMaster.java index 4a14c1cf..39c3f2d3 100644 --- a/ghy-order/src/main/java/com/ghy/order/domain/OrderMaster.java +++ b/ghy-order/src/main/java/com/ghy/order/domain/OrderMaster.java @@ -383,4 +383,11 @@ public class OrderMaster extends BaseEntity { private Integer pageSize; private Integer pageNum; + + /** + * 仅用于前端/接口参数传递： + * true = 查询结果要展开到当前城市下的所有街道 + * false/null = 保持原样 + */ + private Boolean showAllStreet; } diff --git a/ghy-order/src/main/java/com/ghy/order/service/impl/AfterServiceRecordServiceImpl.java b/ghy-order/src/main/java/com/ghy/order/service/impl/AfterServiceRecordServiceImpl.java index cfd7f841..89942c42 100644 --- a/ghy-order/src/main/java/com/ghy/order/service/impl/AfterServiceRecordServiceImpl.java +++ b/ghy-order/src/main/java/com/ghy/order/service/impl/AfterServiceRecordServiceImpl.java @@ -289,8 +289,10 @@ public class AfterServiceRecordServiceImpl implements IAfterServiceRecordService log.info("客户是否同意{}，客户操作{}",one.equals(param.getCustomerFinalCheck()),param); log.info("修改后的售后订单{}",orderDetail); + Boolean isCustomerFinalCheck = param.getCustomerFinalCheck()==null; + // 新增：处理客户同意上门重做方案 - if (param.getCustomerAgreeRedo() != null) { + if (param.getCustomerAgreeRedo() != null&&isCustomerFinalCheck) { afterServiceRecord.setCustomerAgreeRedo(param.getCustomerAgreeRedo()); if (param.getUpdateBy() != null) { afterServiceRecord.setUpdateBy(param.getUpdateBy()); @@ -302,7 +304,7 @@ public class AfterServiceRecordServiceImpl implements IAfterServiceRecordService } // 新增：处理师傅重做/补做完成 - if (param.getWorkerFeedbackResult() != null && param.getWorkerFeedbackResult().equals(3L)) { + if (isCustomerFinalCheck&¶m.getWorkerFeedbackResult() != null && param.getWorkerFeedbackResult().equals(3L)) { afterServiceRecord.setWorkerFeedbackResult(3L); afterServiceRecord.setRedoCompleteTime(new Date()); if (param.getRedoCompleteRemark() != null) { @@ -320,7 +322,7 @@ public class AfterServiceRecordServiceImpl implements IAfterServiceRecordService } // 新增：处理师傅反馈结果为0或1时，设置redoCompleteTime为当前时间+36小时 - if (param.getWorkerFeedbackResult() != null && (param.getWorkerFeedbackResult().equals(0L) || param.getWorkerFeedbackResult().equals(1L))) { + if (isCustomerFinalCheck&¶m.getWorkerFeedbackResult() != null && (param.getWorkerFeedbackResult().equals(0L) || param.getWorkerFeedbackResult().equals(1L))) { afterServiceRecord.setWorkerFeedbackResult(param.getWorkerFeedbackResult()); // 设置当前时间推后36小时 // Calendar calendar = Calendar.getInstance(); @@ -590,6 +592,7 @@ public class AfterServiceRecordServiceImpl implements IAfterServiceRecordService afterServiceRecord.setUpdateBy(param.getUpdateBy()); } afterServiceRecord.setRedoCompleteTime(null); + afterServiceRecord.setWorkerResendPlanTime(null); // 设置客户操作时间 afterServiceRecord.setCustomerOperationTime(new Date()); afterServiceRecordMapper.updateAfterServiceRecord(afterServiceRecord); diff --git a/ghy-worker/src/main/java/com/ghy/worker/domain/WorkerCertification.java b/ghy-worker/src/main/java/com/ghy/worker/domain/WorkerCertification.java index 097942b0..45c8d929 100644 --- a/ghy-worker/src/main/java/com/ghy/worker/domain/WorkerCertification.java +++ b/ghy-worker/src/main/java/com/ghy/worker/domain/WorkerCertification.java @@ -114,4 +114,6 @@ public class WorkerCertification extends BaseEntity // province，city，country三者的合并名称 private String mergerName; + private String workerPhone; + } diff --git a/ghy-worker/src/main/resources/mapper/worker/WorkerCertificationMapper.xml b/ghy-worker/src/main/resources/mapper/worker/WorkerCertificationMapper.xml index 9f794912..2b9e9871 100644 --- a/ghy-worker/src/main/resources/mapper/worker/WorkerCertificationMapper.xml +++ b/ghy-worker/src/main/resources/mapper/worker/WorkerCertificationMapper.xml @@ -30,10 +30,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + - select worker_certification_id, worker_id, surname, name, id_card_num, id_card_url_1, id_card_url_2, brand_name, company_size, company_name, business_license_num, business_license_url, company_province_id, company_city_id, company_country_id, company_address, legal_persion_name, legal_persion_phone_num, other_serv, status, create_by, create_time, update_by, update_time, remark from worker_certification + select worker_certification_id, worker_id, surname, name, id_card_num, id_card_url_1, id_card_url_2, brand_name, company_size, company_name, business_license_num, business_license_url, company_province_id, company_city_id, company_country_id, company_address, legal_persion_name, legal_persion_phone_num, other_serv, status, create_by, create_time, update_by, update_time, remark, worker_phone from worker_certification