From f12121c4571a8d38241dea0744fa144135814589 Mon Sep 17 00:00:00 2001
From: cb <275647614@qq.com>
Date: Thu, 4 Sep 2025 15:27:43 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8D=95=E7=8B=AC=E7=9A=84?=
 =?UTF-8?q?=E5=94=AE=E5=90=8E=E7=BA=A0=E7=BA=B7=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ghy/web/controller/order/OrderDetailController.java   | 8 +++++++-
 .../ghy/web/controller/order/OrderMasterController.java   | 8 +++++++-
 .../src/main/resources/mapper/order/OrderDetailMapper.xml | 4 ++++
 .../src/main/resources/mapper/order/OrderMasterMapper.xml | 4 ++++
 4 files changed, 22 insertions(+), 2 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 f98d5a3b..5cae2b4a 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
@@ -139,7 +139,13 @@ public class OrderDetailController extends BaseController {
     @PostMapping("/list")
     @ResponseBody
     public TableDataInfo list(OrderDetail orderDetail) {
-        if (orderDetail.getSearchAfterList() !=null && orderDetail.getSearchAfterList()) {
+        // 检查是否是售后纠纷查询
+        if (orderDetail.getOrderStatusName() != null && "售后纠纷".equals(orderDetail.getOrderStatusName())) {
+            // 直接使用afterServiceStatus字段查询售后纠纷订单
+            orderDetail.setAfterServiceStatus(1);
+            orderDetail.setOrderStatus(null); // 清除orderStatus条件，避免冲突
+        } else if (orderDetail.getSearchAfterList() !=null && orderDetail.getSearchAfterList()) {
+            // 保持原有的售后查询逻辑
             List<?> rows = this.afterServiceList(orderDetail).getRows();
             StringBuilder detailIds = new StringBuilder();
             if(CollectionUtils.isNotEmpty(rows)){
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 e5178f96..1940348c 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
@@ -1742,7 +1742,13 @@ public class OrderMasterController extends BaseController {
     @PostMapping("/list")
     @ResponseBody
     public TableDataInfo list(OrderMaster orderMaster) {
-        if (orderMaster.getSearchAfterList() !=null && orderMaster.getSearchAfterList()) {
+        // 检查是否是售后纠纷查询
+        if (orderMaster.getOrderStatusName() != null && "售后纠纷".equals(orderMaster.getOrderStatusName())) {
+            // 直接使用afterServiceStatus字段查询售后纠纷订单
+            orderMaster.setAfterServiceStatus(1);
+            orderMaster.setOrderStatus(null); // 清除orderStatus条件，避免冲突
+        } else if (orderMaster.getSearchAfterList() !=null && orderMaster.getSearchAfterList()) {
+            // 保持原有的售后查询逻辑
             List<?> rows = this.afterList(orderMaster).getRows();
             StringBuilder masterIds = new StringBuilder();
             if(CollectionUtils.isNotEmpty(rows)){
diff --git a/ghy-order/src/main/resources/mapper/order/OrderDetailMapper.xml b/ghy-order/src/main/resources/mapper/order/OrderDetailMapper.xml
index 0c5a4bfa..e6d891a6 100644
--- a/ghy-order/src/main/resources/mapper/order/OrderDetailMapper.xml
+++ b/ghy-order/src/main/resources/mapper/order/OrderDetailMapper.xml
@@ -30,6 +30,7 @@
         <result property="updateBy" column="update_by"/>
         <result property="updateTime" column="update_time"/>
         <result property="remark" column="remark"/>
+        <result property="afterServiceStatus" column="after_service_status"/>
         <result property="handoverImages" column="handover_images"/>
         <result property="handoverRemark" column="handover_remark"/>
         <result property="confirmStartTime" column="confirm_start_time"/>
@@ -211,6 +212,9 @@
             <if test="workBeginTimeEnd != null">
                 AND od.work_begin_time &lt;= #{workBeginTimeEnd}
             </if>
+            <if test="afterServiceStatus != null">
+                AND od.after_service_status = #{afterServiceStatus}
+            </if>
             <if test="orderDetailIds != null">
                 AND od.id in ( ${orderDetailIds} )
             </if>
diff --git a/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml b/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml
index 6c89d469..73ab9c6f 100644
--- a/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml
+++ b/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml
@@ -30,6 +30,7 @@
         <result property="updateBy"          column="update_by"/>
         <result property="updateTime"        column="update_time"/>
         <result property="remark"            column="remark"/>
+        <result property="afterServiceStatus" column="after_service_status"/>
         <result property="goodsId"           column="goods_id"/>
         <result property="goodsBrand"           column="goods_brand"/>
         <result property="goodsSpecification"           column="goods_specification"/>
@@ -314,6 +315,9 @@
             <if test="updateTimeEnd != null">
                 AND om.update_time &lt;= #{updateTimeEnd}
             </if>
+            <if test="afterServiceStatus != null">
+                AND om.after_service_status = #{afterServiceStatus}
+            </if>
             <if test="orderMasterIds != null and orderMasterIds != ''">
                 AND om.id in (${orderMasterIds})
             </if>