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

# Conflicts:
#	coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopInfoDAO.java
#	coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopInfoMapper.java
This commit is contained in:
苏竹红
2025-04-11 10:29:06 +08:00
28 changed files with 318 additions and 73 deletions

View File

@@ -438,6 +438,13 @@
from xfsg_shop_info
where deleted = 0 and line_id = #{lineId} and shop_code is not null
</select>
<select id="currentShopWhetherOpen" resultType="com.cool.store.response.MiniShopsResponse">
select a.shop_name as shopName,
a.shop_code as shopCode
from xfsg_shop_info a
inner join store_${eid} b on a.shop_code = b.store_num
where a.id = #{shopId}
</select>
<select id="getShopIdList" resultType="java.lang.String">
select id