Merge remote-tracking branch 'origin/test' into test

2025-12-23 15:34:11 +08:00
parent 7c9c6d6a02 658c7f14b2
commit ed1b6b2ecf
2 changed files with 55 additions and 4 deletions
--- a/cash-service/market-service/src/main/resources/mapper/PpPackageOrderMapper.xml
+++ b/cash-service/market-service/src/main/resources/mapper/PpPackageOrderMapper.xml
@@ -15,10 +15,7 @@
        left join tb_shop_info s on o.shop_id = s.id
        left join pp_package p on o.package_id = p.id
        left join tb_user_info u on o.user_id = u.id
-        where 1=1
-        <if test="shopId != null">
-            and o.shop_id = #{shopId}
-        </if>
+        where o.shop_id = #{shopId}
        <choose>
            <!-- userId为空时：拼接 and o.status != 'ing' -->
            <when test="userId == null or userId == ''">