From 17d7dfe6c62ca0e85afcb96617bb16ed66c79504 Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Sat, 20 Dec 2025 17:23:39 +0800
Subject: [PATCH] =?UTF-8?q?account=E7=9A=84=20updateChain3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../czg/account/service/ShopUserService.java   |  2 +-
 .../main/resources/mapper/GbOrderMapper.xml    | 18 +++++++++++++++---
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopUserService.java b/cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopUserService.java
index bef8dd060..75ddf0f26 100644
--- a/cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopUserService.java
+++ b/cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopUserService.java
@@ -24,7 +24,7 @@ public interface ShopUserService extends IService<ShopUser> {
 
     @Override
     default UpdateChain<ShopUser> updateChain() {
-        return new UpdateChain<>(getMapper());
+        return new CzgUpdateChain<>(getMapper());
     }
 
     /**
diff --git a/cash-service/order-service/src/main/resources/mapper/GbOrderMapper.xml b/cash-service/order-service/src/main/resources/mapper/GbOrderMapper.xml
index 298c36d92..2e183be66 100644
--- a/cash-service/order-service/src/main/resources/mapper/GbOrderMapper.xml
+++ b/cash-service/order-service/src/main/resources/mapper/GbOrderMapper.xml
@@ -21,7 +21,12 @@
             AND detail.group_order_no = #{param.groupOrderNo}
         </if>
         <if test="param.status != null">
-            AND detail.STATUS = #{param.status}
+            <if test="param.status == '退款'">
+                AND (detail.STATUS = '退款中' or detail.STATUS = '已退款')
+            </if>
+            <if test="param.status != '退款'">
+                AND detail.STATUS = #{param.status}
+            </if>
         </if>
         <if test="param.userId != null">
             AND detail.user_id = #{param.userId}
@@ -55,7 +60,12 @@
             AND detail.group_order_no = #{param.groupOrderNo}
         </if>
         <if test="param.status != null">
-            AND detail.STATUS = #{param.status}
+            <if test="param.status == '退款'">
+                AND (detail.STATUS = '退款中' or detail.STATUS = '已退款')
+            </if>
+            <if test="param.status != '退款'">
+                AND detail.STATUS = #{param.status}
+            </if>
         </if>
         <if test="param.userId != null">
             AND detail.user_id = #{param.userId}
@@ -68,7 +78,9 @@
         </if>
         order by
         <if test="param.status != null">
-            detail.`status` desc,detail.pay_time desc,
+            <if test="param.status == '退款'">
+                detail.`status` desc,detail.pay_time desc,
+            </if>
         </if>
         detail.create_time desc
     </select>