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

6
coolstore-partner-dao/src/main/java/com/cool/store/dao/StoreDao.java
View File

@@ -122,10 +122,10 @@ public class StoreDao {
} }
/** /**
* 查询拥有门店编码的门店id及编码 * 查询拥有门店编码且完成开店管理的门店id及编码
*/ */
public List<StoreDO> getExistStoreNumStore(List<String> storeStatus) { public List<StoreDO> getExistStoreNumAndFinishInvestStore(List<String> storeStatus) {
return storeMapper.getExistStoreNumStore(storeStatus); return storeMapper.getExistStoreNumAndFinishInvestStore(storeStatus);
} }
/** /**

4
coolstore-partner-dao/src/main/java/com/cool/store/mapper/StoreMapper.java
View File

@@ -71,9 +71,9 @@ public interface StoreMapper {
List<StoreDO> getAllStoreIdAndNum(@Param("storeStatus") List<String> storeStatus); List<StoreDO> getAllStoreIdAndNum(@Param("storeStatus") List<String> storeStatus);
/** /**
* 查询拥有门店编码的门店id及编码 * 查询拥有门店编码且完成开店管理的门店id及编码
*/ */
List<StoreDO> getExistStoreNumStore(@Param("storeStatus") List<String> storeStatus); List<StoreDO> getExistStoreNumAndFinishInvestStore(@Param("storeStatus") List<String> storeStatus);
/** /**
* 查询门店积分 * 查询门店积分

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

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

2
coolstore-partner-service/src/main/java/com/cool/store/service/close/impl/CloseStoreServiceImpl.java
View File

@@ -326,7 +326,7 @@ public class CloseStoreServiceImpl implements CloseStoreService {
userIds.addAll(StringUtils.isNotBlank(v.getHandlerUserIds()) ? Arrays.asList(v.getHandlerUserIds().split(",")) : Collections.emptyList()); userIds.addAll(StringUtils.isNotBlank(v.getHandlerUserIds()) ? Arrays.asList(v.getHandlerUserIds().split(",")) : Collections.emptyList());
} }
}); });
Map<String, EnterpriseUserDO> userMap = enterpriseUserDAO.getUserMap(new ArrayList<>(userIds)); Map<String, EnterpriseUserDO> userMap = enterpriseUserDAO.getUserInfoMap(new ArrayList<>(userIds));
List<AuditInfoResponse> result = new ArrayList<>(); List<AuditInfoResponse> result = new ArrayList<>();
for (int i = 0; i < list.size(); i++) { for (int i = 0; i < list.size(); i++) {
CloseStoreAuditRecordDO auditRecordDO = list.get(i); CloseStoreAuditRecordDO auditRecordDO = list.get(i);

2
coolstore-partner-web/src/main/java/com/cool/store/job/XxlJobHandler.java
View File

@@ -889,7 +889,7 @@ public class XxlJobHandler {
List<StoreExtendSoftOpenDTO> updateList = new ArrayList<>(); List<StoreExtendSoftOpenDTO> updateList = new ArrayList<>();
while (hasNext) { while (hasNext) {
PageHelper.startPage(pageNum, pageSize); PageHelper.startPage(pageNum, pageSize);
List<StoreDO> storeList = storeDao.getExistStoreNumStore(Collections.singletonList(StoreStatusEnum.NOT_OPEN.getValue())); List<StoreDO> storeList = storeDao.getExistStoreNumAndFinishInvestStore(Collections.singletonList(StoreStatusEnum.NOT_OPEN.getValue()));
if (CollectionUtils.isEmpty(storeList)) { if (CollectionUtils.isEmpty(storeList)) {
break; break;
} }