From e7bb47f02386b1e84229103a5e88aa3f88da8885 Mon Sep 17 00:00:00 2001 From: cb <275647614@qq.com> Date: Tue, 21 Oct 2025 18:07:34 +0800 Subject: [PATCH] no message --- .../web/controller/order/OrderController.java | 6 +++ .../order/OrderDetailController.java | 1 + .../order/OrderMasterController.java | 1 + .../ghy/web/pojo/vo/OrderStandardDetail.java | 3 ++ .../com/ghy/order/domain/OrderDetail.java | 6 +++ .../service/impl/OrderMasterServiceImpl.java | 5 ++- .../mapper/order/OrderDetailMapper.xml | 10 ++++- .../mapper/order/OrderMasterMapper.xml | 37 ++++++++++++++++++- 8 files changed, 63 insertions(+), 6 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 5d14c64c..d675e14a 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 @@ -493,6 +493,9 @@ public class OrderController extends BaseController { od.setExpectTimeStart(om.getExpectTimeStart()); od.setExpectTimeEnd(om.getExpectTimeEnd()); od.setWorkBeginTime(new Date()); + // 将主单的客户备注和订单图片复制到子单 + // od.setCustomerRemark(om.getCustomerRemark()); + od.setOrderImages(om.getOrderImages()); // 将主单的师傅备注复制到子单 if(request.getWorkerId().equals(om.getWorkerId())) { od.setWorkerRemark(om.getWorkerRemark()); @@ -1638,6 +1641,7 @@ public class OrderController extends BaseController { detailOrderList.stream().forEach(detail -> { AfterServiceRecord afterServiceRecordQry = new AfterServiceRecord(); afterServiceRecordQry.setOrderDetailId(detail.getId()); + afterServiceRecordQry.setExcludeAfterServiceFinished(Boolean.TRUE); List records = afterServiceRecordService .selectAfterServiceRecordList(afterServiceRecordQry); // 检查子单师傅ID是否与主单师傅ID一致且有售后记录 @@ -1992,6 +1996,7 @@ public class OrderController extends BaseController { detailOrderList.stream().forEach(detail -> { AfterServiceRecord afterServiceRecordQry = new AfterServiceRecord(); afterServiceRecordQry.setOrderDetailId(detail.getId()); + afterServiceRecordQry.setExcludeAfterServiceFinished(Boolean.TRUE); List records = afterServiceRecordService .selectAfterServiceRecordList(afterServiceRecordQry); // 检查子单师傅ID是否与主单师傅ID一致且有售后记录 @@ -2266,6 +2271,7 @@ public class OrderController extends BaseController { // 售后记录 AfterServiceRecord afterServiceRecord = new AfterServiceRecord(); afterServiceRecord.setOrderDetailId(detail.getId()); + afterServiceRecord.setExcludeAfterServiceFinished(true); List afterServiceRecordList =afterServiceRecordService.selectAfterServiceRecordList(afterServiceRecord); orderListResponse.setShowAfterServiceRecord( 1); 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 4fe2ec8f..f7894789 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 @@ -567,6 +567,7 @@ public class OrderDetailController extends BaseController { orderListResponse.setWorkFinishTime(detail.getWorkFinishTime()); orderListResponse.setRemark(goods.getRemark()); orderListResponse.setCustomerRemark(orderMaster.getRemark()); + orderListResponse.setOrderImages(detail.getOrderImages()); orderListResponse.setFinishImgList(finishImgList); orderListResponse.setWorkerRemark(detail.getRemark()); orderListResponse.setAfterServiceRecordList(afterServiceRecordList); 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 f212d909..24292a75 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 @@ -1802,6 +1802,7 @@ public class OrderMasterController extends BaseController { } OrderStandardDetail orderStandardDetail = new OrderStandardDetail(); + orderStandardDetail.setOrderImages(orderDetail.getOrderImages()); orderStandardDetail.setHandoverImages(orderDetail.getHandoverImages()); orderStandardDetail.setHandoverRemark(orderDetail.getHandoverRemark()); orderStandardDetail.setDeliveryType(orderDetail.getDeliveryType()); diff --git a/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderStandardDetail.java b/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderStandardDetail.java index 58799ac9..5f078ca7 100644 --- a/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderStandardDetail.java +++ b/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderStandardDetail.java @@ -126,4 +126,7 @@ public class OrderStandardDetail { private String handoverRemark; + + private String orderImages; + } 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 fb91cf10..bd629898 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 @@ -298,6 +298,12 @@ public class OrderDetail extends BaseEntity { @Excel(name = "快递单号") private String trackingNumber; + /** + * 订单图片 - 客户下单时上传的图片 + */ + @Excel(name = "订单图片") + private String orderImages; + //是否立即发货 private Integer isQuicklyDelivery; } 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 7771252d..9a399629 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 @@ -112,8 +112,9 @@ public class OrderMasterServiceImpl implements OrderMasterService { OrderMaster oldOrder = this.selectById(orderMaster.getId()); if ((orderMaster.getOrderStatus() != null && !Objects.equals(oldOrder.getOrderStatus(), orderMaster.getOrderStatus())) || orderMaster.getExpectTimeStart() != null && orderMaster.getExpectTimeStart().compareTo(new Date()) > 0) { - // 状态变更或者预约时间大于当前时间便清除超时状态 - orderMaster.setTimeout(0); + + orderMaster.setTimeout(0); + } 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 4e1976cb..0b384b60 100644 --- a/ghy-order/src/main/resources/mapper/order/OrderDetailMapper.xml +++ b/ghy-order/src/main/resources/mapper/order/OrderDetailMapper.xml @@ -49,6 +49,7 @@ + @@ -93,7 +94,8 @@ delivery_type, delivery_remark, delivery_images, - tracking_number + tracking_number, + order_images FROM order_detail @@ -140,7 +142,8 @@ od.delivery_type, od.delivery_remark, od.delivery_images, - od.tracking_number + od.tracking_number, + od.order_images 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 @@ -424,6 +427,7 @@ delivery_remark = #{deliveryRemark}, delivery_images = #{deliveryImages}, tracking_number = #{trackingNumber}, + order_images = #{orderImages}, update_time = SYSDATE() WHERE id = #{id} @@ -493,6 +497,7 @@ delivery_remark, delivery_images, tracking_number, + order_images, expect_time_start, expect_time_end, work_begin_time, @@ -523,6 +528,7 @@ #{deliveryRemark}, #{deliveryImages}, #{trackingNumber}, + #{orderImages}, #{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 ca9f1935..ec6aa56f 100644 --- a/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml +++ b/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml @@ -362,7 +362,17 @@ - AND om.timeout_ = #{timeout} + AND ( + om.timeout_ = #{timeout} + OR ( + #{timeout} = 1 + AND EXISTS ( + SELECT 1 FROM order_detail od + WHERE od.order_master_id = om.id + AND od.timeout_ = 1 + ) + ) + ) AND om.is_call = #{isCall} @@ -477,6 +487,19 @@ AND om.create_by = #{createBy} + + AND ( + om.timeout_ = #{timeout} + OR ( + #{timeout} = 1 + AND EXISTS ( + SELECT 1 FROM order_detail od + WHERE od.order_master_id = om.id + AND od.timeout_ = 1 + ) + ) + ) + @@ -754,7 +777,17 @@ from order_master om where 1 = 1 - AND om.timeout_ = #{timeout} + AND ( + om.timeout_ = #{timeout} + OR ( + #{timeout} = 1 + AND EXISTS ( + SELECT 1 FROM order_detail od + WHERE od.order_master_id = om.id + AND od.timeout_ = 1 + ) + ) + ) AND om.is_call = #{isCall}