From 81e102ff4138d70c0cb4f30f05f995b2aa3694e3 Mon Sep 17 00:00:00 2001
From: gong <1157756119@qq.com>
Date: Tue, 23 Dec 2025 13:35:42 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=9F=A5=E8=AF=A2=20bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/mapper/PpPackageOrderMapper.xml   | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/cash-service/market-service/src/main/resources/mapper/PpPackageOrderMapper.xml b/cash-service/market-service/src/main/resources/mapper/PpPackageOrderMapper.xml
index 489fc33e2..d5f1b2419 100644
--- a/cash-service/market-service/src/main/resources/mapper/PpPackageOrderMapper.xml
+++ b/cash-service/market-service/src/main/resources/mapper/PpPackageOrderMapper.xml
@@ -19,9 +19,15 @@
         <if test="shopId != null">
             and o.shop_id = #{shopId}
         </if>
-        <if test="userId != null">
-            and o.user_id = #{userId} and o.status != 'ing'
-        </if>
+        <choose>
+            <!-- userId为空时：拼接 and o.status != 'ing' -->
+            <when test="userId == null or userId == ''">
+                and o.status != 'ing'
+            </when>
+            <otherwise>
+                and o.user_id = #{userId}
+            </otherwise>
+        </choose>
         <if test="param.orderNo != null">
             and o.order_no = #{param.orderNo}
         </if>