Merge branch 'master' into cc_20251112_wallet

2025-11-19 16:45:05 +08:00
parent ff9be4e61b 9e4acf66f4
commit 082e044b5a
21 changed files with 61 additions and 20 deletions
--- a/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml
@@ -281,7 +281,9 @@
        left join store_${enterpriseId} b on a.shop_code = b.store_num
        where a.shop_code is not null
        and a.shop_code !=''
-        and b.store_id is not null and a.id in
+        and b.store_id is not null
+        and b.is_delete = 'effective'
+        and a.id in
        <foreach collection="shopIds" item="shopId" separator="," open="(" close=")">
            #{shopId}
        </foreach>