From 77008d11da960c63d71b05a667edba5f1b419517 Mon Sep 17 00:00:00 2001 From: cb <275647614@qq.com> Date: Wed, 29 Oct 2025 11:17:34 +0800 Subject: [PATCH] no message --- .../web/controller/order/OrderController.java | 5 ++- .../order/OrderDetailController.java | 11 +++++- .../impl/AfterServiceRecordServiceImpl.java | 37 ++++++++++++++++++- 3 files changed, 49 insertions(+), 4 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 e02babbd..85614966 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 @@ -1455,7 +1455,10 @@ public class OrderController extends BaseController { return o2.getCreateTime().compareTo(o1.getCreateTime()); // 都没有超时时间，按创建时间倒序 } } else { - return o2.getUpdateTime().compareTo(o1.getUpdateTime()); + // 如果updateTime为null，则使用createTime代替 + Date o1Time = o1.getUpdateTime() != null ? o1.getUpdateTime() : o1.getCreateTime(); + Date o2Time = o2.getUpdateTime() != null ? o2.getUpdateTime() : o2.getCreateTime(); + return o2Time.compareTo(o1Time); } } }); diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java index 781e5b09..35f1eb7e 100644 --- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java +++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java @@ -855,9 +855,16 @@ public class OrderDetailController extends BaseController { orderListResponse.setConfirmStartTime(detail.getConfirmStartTime()); orderListResponse.setDeliveryType(orderMaster.getDeliveryType()); orderListResponse.setWorkerRemark(detail.getWorkerRemark()); - + orderListResponse.setServiceCancelled(orderMaster.getServiceCancelled()); orderListResponse.setOrderType(orderMaster.getOrderType()); - orderListResponse.setHasServiceOrder(orderMaster.getHasServiceOrder()); + // 判断子单和主单的师傅id是否一致且主单的hasServiceOrder字段为1 + if (detail.getWorkerId() != null && orderMaster.getWorkerId() != null + && detail.getWorkerId().equals(orderMaster.getWorkerId()) + && orderMaster.getHasServiceOrder() != null && orderMaster.getHasServiceOrder() == 1) { + orderListResponse.setHasServiceOrder(1); + } else { + orderListResponse.setHasServiceOrder(0); + } Shop shop = shopService.getShop(goods.getShopId()); 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 4df92b0b..37c4c0ab 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 @@ -621,6 +621,37 @@ public class AfterServiceRecordServiceImpl implements IAfterServiceRecordService return AjaxResult.success("重做/补做完成状态已更新"); } + // 新增：处理师傅反馈结果为0或1时，设置redoCompleteTime为当前时间+36小时 + // if (param.getWorkerFeedbackResult() != null && (param.getWorkerFeedbackResult().equals(0L) || param.getWorkerFeedbackResult().equals(1L))) { + // afterServiceRecord.setWorkerFeedbackResult(param.getWorkerFeedbackResult()); + // // 设置当前时间推后36小时 + // Calendar calendar = Calendar.getInstance(); + // calendar.setTime(new Date()); + // calendar.add(Calendar.HOUR_OF_DAY, 36); + // afterServiceRecord.setRedoCompleteTime(calendar.getTime()); + + // // 处理师傅反馈相关字段 + // if (param.getWorkerFeedbackReasonType() != null) { + // afterServiceRecord.setWorkerFeedbackReasonType(param.getWorkerFeedbackReasonType()); + // } + // if (param.getWorkerFeedbackReason() != null) { + // afterServiceRecord.setWorkerFeedbackReason(param.getWorkerFeedbackReason()); + // } + // if (param.getWorkerFeedbackImages() != null) { + // afterServiceRecord.setWorkerFeedbackImages(param.getWorkerFeedbackImages()); + // } + // if (param.getAgreedRefund() != null) { + // afterServiceRecord.setAgreedRefund(param.getAgreedRefund()); + // } + // if (param.getUpdateBy() != null) { + // afterServiceRecord.setUpdateBy(param.getUpdateBy()); + // } + + // afterServiceRecordMapper.updateAfterServiceRecord(afterServiceRecord); + // log.info("商品售后-师傅反馈结果为{}，记录ID：{}，redoCompleteTime设置为：{}", param.getWorkerFeedbackResult(), param.getId(), afterServiceRecord.getRedoCompleteTime()); + // return AjaxResult.success("师傅反馈结果已更新"); + // } + // 新增：处理师傅重发/补发方案 if (param.getWorkerResendPlan() != null) { // 验证快递/物流方式必须提供单号 @@ -659,7 +690,10 @@ public class AfterServiceRecordServiceImpl implements IAfterServiceRecordService if (param.getWorkerReceiveStatus() != null && param.getWorkerAgreeType() != null) { afterServiceRecord.setWorkerReceiveStatus(param.getWorkerReceiveStatus()); afterServiceRecord.setWorkerAgreeType(param.getWorkerAgreeType()); - + Calendar calendar = Calendar.getInstance(); + calendar.setTime(new Date()); + calendar.add(Calendar.HOUR_OF_DAY, 36); + afterServiceRecord.setRedoCompleteTime(calendar.getTime()); // 处理师傅反馈相关字段 if (param.getWorkerFeedbackReasonType() != null) { afterServiceRecord.setWorkerFeedbackReasonType(param.getWorkerFeedbackReasonType()); @@ -1498,6 +1532,7 @@ public class AfterServiceRecordServiceImpl implements IAfterServiceRecordService // 设置师傅收货确认 afterServiceRecord.setWorkerReceiveConfirm(1); // 1-已收货 + afterServiceRecord.setWorkerReceiveStatus(3); // 3-已确认收货 afterServiceRecord.setUpdateTime(new Date()); // 根据师傅同意处理方式决定是否执行退款