suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge #123 into master from cc_20260511_fix_bug

Browse Source 
fix:闭店审批用户列表问题修复&未开业门店更新试营业需要完成开店管理

* cc_20260511_fix_bug: (2 commits squashed)

  - fix:闭店审批用户列表问题修复

  - fix:未开业门店更新试营业需要完成开店管理

Signed-off-by: 王非凡 <accounts_67eba0c5fee9c49c80c8e2b4@mail.teambition.com>
Merged-by: 正新 <accounts_6964c7bcd2a2c377c5bbd01b@mail.teambition.com>

CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/123
This commit is contained in:
王非凡
2026-05-11 10:24:00 +00:00
committed by 正新
parent b517bfa957
commit 0d65a1c4e9
5 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
coolstore-partner-dao/src/main/resources/mapper/StoreMapper.xml
View File

@@ -276,12 +276,14 @@
</if>
</select>
<select id="getExistStoreNumStore" resultType="com.cool.store.entity.StoreDO">
SELECT store_id, store_num
FROM store_${enterpriseId}
WHERE is_delete = 'effective' AND store_num IS NOT NULL AND store_num != ''
<select id="getExistStoreNumAndFinishInvestStore" resultType="com.cool.store.entity.StoreDO">
SELECT a.store_id, a.store_num
FROM store_${enterpriseId} a
INNER JOIN xfsg_shop_info b ON a.store_num = b.shop_code
WHERE a.is_delete = 'effective' AND a.store_num IS NOT NULL AND a.store_num != ''
AND b.shop_status = 1
<if test="storeStatus != null and !storeStatus.isEmpty()">
AND store_status IN
AND a.store_status IN
<foreach item="item" collection="storeStatus" separator="," open="(" close=")">
#{item}
</foreach>