From 65ca7bf9aa7486bd72f28bdf3648779012f5841d Mon Sep 17 00:00:00 2001 From: cb <275647614@qq.com> Date: Sat, 30 Aug 2025 08:54:52 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=BB=E5=8D=95=E5=92=8C?= =?UTF-8?q?=E5=AD=90=E5=8D=95=E7=9A=84=E5=B8=88=E5=82=85=E5=A4=87=E6=B3=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../order/OrderDetailController.java | 27 +++++++++++++++++ .../order/OrderMasterController.java | 29 +++++++++++++++++++ .../templates/order/orderManager.html | 2 +- .../com/ghy/order/domain/OrderDetail.java | 4 +++ .../com/ghy/order/domain/OrderMaster.java | 5 ++++ .../ghy/order/service/OrderDetailService.java | 11 +++++++ .../ghy/order/service/OrderMasterService.java | 12 ++++++++ .../service/impl/OrderDetailServiceImpl.java | 20 +++++++++++++ .../service/impl/OrderMasterServiceImpl.java | 27 +++++++++++++++++ .../mapper/order/OrderDetailMapper.xml | 10 +++++-- .../mapper/order/OrderMasterMapper.xml | 10 +++++-- 11 files changed, 152 insertions(+), 5 deletions(-) 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 bc0d323e..f98d5a3b 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 @@ -1569,4 +1569,31 @@ public class OrderDetailController extends BaseController { return AjaxResult.error("退回失败: " + e.getMessage()); } } + + /** + * 保存子单师傅备注 + */ + @PostMapping("/saveWorkerRemark") + @ResponseBody + public AjaxResult saveDetailWorkerRemark(@RequestBody OrderDetail orderDetail) { + try { + if (orderDetail.getWorkerRemark() == null || orderDetail.getWorkerRemark().trim().isEmpty()) { + return AjaxResult.error("师傅备注不能为空"); + } + + if (orderDetail.getId() == null) { + return AjaxResult.error("子单ID不能为空"); + } + + int result = orderDetailService.saveDetailWorkerRemark(orderDetail.getId(), orderDetail.getWorkerRemark()); + if (result > 0) { + return AjaxResult.success("子单师傅备注保存成功"); + } else { + return AjaxResult.error("子单师傅备注保存失败"); + } + } catch (Exception e) { + logger.error("保存子单师傅备注失败", e); + return AjaxResult.error("保存子单师傅备注失败：" + e.getMessage()); + } + } } diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java index c095f8a7..44e1328d 100644 --- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java +++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java @@ -2255,4 +2255,33 @@ public class OrderMasterController extends BaseController { return toAjax(orderMasterService.updateOrderMasterAddressById(orderMaster)); } + + + /** + * 保存主单师傅备注 + */ + @PostMapping("/saveMasterWorkerRemark") + @ResponseBody + public AjaxResult saveMasterWorkerRemark(@RequestBody OrderMaster orderMaster) { + try { + if (orderMaster.getWorkerRemark() == null || orderMaster.getWorkerRemark().trim().isEmpty()) { + return AjaxResult.error("师傅备注不能为空"); + } + + if (orderMaster.getId() == null) { + return AjaxResult.error("主单ID不能为空"); + } + + int result = orderMasterService.saveMasterWorkerRemark(orderMaster.getId(), orderMaster.getWorkerRemark()); + if (result > 0) { + return AjaxResult.success("主单师傅备注保存成功"); + } else { + return AjaxResult.error("主单师傅备注保存失败"); + } + } catch (Exception e) { + logger.error("保存主单师傅备注失败", e); + return AjaxResult.error("保存主单师傅备注失败：" + e.getMessage()); + } + } + } diff --git a/ghy-admin/src/main/resources/templates/order/orderManager.html b/ghy-admin/src/main/resources/templates/order/orderManager.html index 61762999..396bc620 100644 --- a/ghy-admin/src/main/resources/templates/order/orderManager.html +++ b/ghy-admin/src/main/resources/templates/order/orderManager.html @@ -85,7 +85,7 @@ /* 表格最小宽度 */ #bootstrap-table { - min-width: 2000px; + min-width: 1000px; } diff --git a/ghy-order/src/main/java/com/ghy/order/domain/OrderDetail.java b/ghy-order/src/main/java/com/ghy/order/domain/OrderDetail.java index 502cf8e2..71a68272 100644 --- a/ghy-order/src/main/java/com/ghy/order/domain/OrderDetail.java +++ b/ghy-order/src/main/java/com/ghy/order/domain/OrderDetail.java @@ -245,4 +245,8 @@ public class OrderDetail extends BaseEntity { */ private String returnImages; + /** + * 师傅备注 + */ + private String workerRemark; } 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 d902cd4f..59552908 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 @@ -318,4 +318,9 @@ public class OrderMaster extends BaseEntity { * 退单图片 */ private String returnImages; + + /** + * 师傅备注 + */ + private String workerRemark; } diff --git a/ghy-order/src/main/java/com/ghy/order/service/OrderDetailService.java b/ghy-order/src/main/java/com/ghy/order/service/OrderDetailService.java index 2482ceb6..b9d9ad48 100644 --- a/ghy-order/src/main/java/com/ghy/order/service/OrderDetailService.java +++ b/ghy-order/src/main/java/com/ghy/order/service/OrderDetailService.java @@ -224,4 +224,15 @@ public interface OrderDetailService { * @return 成功条数 */ int returnOrder(Long orderDetailId); + + int updateOrderDetailAddressById(OrderDetail orderDetail); + + /** + * 保存子单师傅备注 + * + * @param orderDetailId 子订单ID + * @param workerRemark 师傅备注 + * @return 成功条数 + */ + int saveDetailWorkerRemark(Long orderDetailId, String workerRemark); } diff --git a/ghy-order/src/main/java/com/ghy/order/service/OrderMasterService.java b/ghy-order/src/main/java/com/ghy/order/service/OrderMasterService.java index b2bce175..9079aaab 100644 --- a/ghy-order/src/main/java/com/ghy/order/service/OrderMasterService.java +++ b/ghy-order/src/main/java/com/ghy/order/service/OrderMasterService.java @@ -7,6 +7,7 @@ import com.ghy.order.pojo.dto.OrderMasterStatisticsDTO; import com.ghy.order.request.AppOrderRequest; import com.ghy.order.request.OrderChangePriceReq; import com.huifu.adapay.core.exception.BaseAdaPayException; +import com.ghy.order.domain.OrderDetail; import java.util.Collection; import java.util.List; @@ -192,4 +193,15 @@ public interface OrderMasterService { int updateOrderMasterAddressById(OrderMaster orderMaster); + int returnOrder(Long orderMasterId, String returnReason, String returnReasonDetail, String returnImages); + + /** + * 保存主单师傅备注 + * + * @param orderMasterId 主订单ID + * @param workerRemark 师傅备注 + * @return 成功条数 + */ + int saveMasterWorkerRemark(Long orderMasterId, String workerRemark); + } diff --git a/ghy-order/src/main/java/com/ghy/order/service/impl/OrderDetailServiceImpl.java b/ghy-order/src/main/java/com/ghy/order/service/impl/OrderDetailServiceImpl.java index 05ea271b..0782fc82 100644 --- a/ghy-order/src/main/java/com/ghy/order/service/impl/OrderDetailServiceImpl.java +++ b/ghy-order/src/main/java/com/ghy/order/service/impl/OrderDetailServiceImpl.java @@ -1550,4 +1550,24 @@ public class OrderDetailServiceImpl implements OrderDetailService { return num; } + + @Override + public int saveDetailWorkerRemark(Long orderDetailId, String workerRemark) { + logger.info("保存子单师傅备注，子单ID：{}，师傅备注：{}", orderDetailId, workerRemark); + + OrderDetail orderDetail = new OrderDetail(); + orderDetail.setId(orderDetailId); + orderDetail.setWorkerRemark(workerRemark); + + int result = orderDetailMapper.updateOrderDetail(orderDetail); + logger.info("更新子单师傅备注，子单ID：{}，结果：{}", orderDetailId, result); + + return result; + } + + @Override + public int updateOrderDetailAddressById(OrderDetail orderDetail) { + logger.info("更新子单地址信息，子单ID：{}", orderDetail.getId()); + return orderDetailMapper.updateOrderDetail(orderDetail); + } } diff --git a/ghy-order/src/main/java/com/ghy/order/service/impl/OrderMasterServiceImpl.java b/ghy-order/src/main/java/com/ghy/order/service/impl/OrderMasterServiceImpl.java index 364371e6..04863e6c 100644 --- a/ghy-order/src/main/java/com/ghy/order/service/impl/OrderMasterServiceImpl.java +++ b/ghy-order/src/main/java/com/ghy/order/service/impl/OrderMasterServiceImpl.java @@ -118,6 +118,20 @@ public class OrderMasterServiceImpl implements OrderMasterService { return orderMasterMapper.updateOrderMaster(orderMaster); } + @Override + public int saveMasterWorkerRemark(Long orderMasterId, String workerRemark) { + logger.info("保存主单师傅备注，主单ID：{}，师傅备注：{}", orderMasterId, workerRemark); + + OrderMaster orderMaster = new OrderMaster(); + orderMaster.setId(orderMasterId); + orderMaster.setWorkerRemark(workerRemark); + + int result = orderMasterMapper.updateOrderMaster(orderMaster); + logger.info("更新主单师傅备注，主单ID：{}，结果：{}", orderMasterId, result); + + return result; + } + @Override public List selectOrderMasterList(OrderMaster orderMaster) { return orderMasterMapper.selectOrderMasterList(orderMaster); @@ -775,5 +789,18 @@ public class OrderMasterServiceImpl implements OrderMasterService { return orderMasterMapper.updateOrderMasterAddressById(orderMaster); } + @Override + public int returnOrder(Long orderMasterId, String returnReason, String returnReasonDetail, String returnImages) { + logger.info("主单退单，订单ID：{}，退单原因：{}，退单原因详情：{}，退单图片：{}", + orderMasterId, returnReason, returnReasonDetail, returnImages); + + OrderMaster orderMaster = new OrderMaster(); + orderMaster.setId(orderMasterId); + orderMaster.setReturnReason(returnReason); + orderMaster.setReturnReasonDetail(returnReasonDetail); + orderMaster.setReturnImages(returnImages); + + return orderMasterMapper.updateOrderMaster(orderMaster); + } } diff --git a/ghy-order/src/main/resources/mapper/order/OrderDetailMapper.xml b/ghy-order/src/main/resources/mapper/order/OrderDetailMapper.xml index 4bd1af2d..0c5a4bfa 100644 --- a/ghy-order/src/main/resources/mapper/order/OrderDetailMapper.xml +++ b/ghy-order/src/main/resources/mapper/order/OrderDetailMapper.xml @@ -40,6 +40,7 @@ + @@ -76,7 +77,8 @@ delay_count, return_reason, return_reason_detail, - return_images + return_images, + worker_remark FROM order_detail @@ -115,7 +117,8 @@ od.delay_count, od.return_reason, od.return_reason_detail, - od.return_images + od.return_images, + od.worker_remark FROM order_detail od LEFT JOIN order_master om ON om.id = od.order_master_id LEFT JOIN customer_address ca ON ca.customer_address_id = om.address_id @@ -385,6 +388,7 @@ return_reason = #{returnReason}, return_reason_detail = #{returnReasonDetail}, return_images = #{returnImages}, + worker_remark = #{workerRemark}, update_time = SYSDATE() WHERE id = #{id} @@ -447,6 +451,7 @@ return_reason, return_reason_detail, return_images, + worker_remark, expect_time_start, expect_time_end, work_begin_time, @@ -470,6 +475,7 @@ #{returnReason}, #{returnReasonDetail}, #{returnImages}, + #{workerRemark}, #{expectTimeStart}, #{expectTimeEnd}, #{workBeginTime}, diff --git a/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml b/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml index 51f1240c..6c89d469 100644 --- a/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml +++ b/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml @@ -68,6 +68,7 @@ + @@ -133,7 +134,8 @@ original_worker_id, return_reason, return_reason_detail, - return_images + return_images, + worker_remark FROM order_master @@ -199,7 +201,8 @@ om.original_worker_id, om.return_reason, om.return_reason_detail, - om.return_images + om.return_images, + om.worker_remark FROM order_master om LEFT JOIN customer_address ca ON ca.customer_address_id = om.address_id LEFT JOIN goods g ON g.goods_id = om.goods_id @@ -508,6 +511,7 @@ return_reason = #{returnReason}, return_reason_detail = #{returnReasonDetail}, return_images = #{returnImages}, + worker_remark = #{workerRemark}, update_time = SYSDATE() WHERE id = #{id} @@ -579,6 +583,7 @@ return_reason, return_reason_detail, return_images, + worker_remark, create_time )VALUES( #{deptId}, @@ -631,6 +636,7 @@ #{returnReason}, #{returnReasonDetail}, #{returnImages}, + #{workerRemark}, SYSDATE() )