diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/StoreDao.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/StoreDao.java index e8b33212c..38df12dbf 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/StoreDao.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/StoreDao.java @@ -122,10 +122,10 @@ public class StoreDao { } /** - * 查询拥有门店编码的门店id及编码 + * 查询拥有门店编码且完成开店管理的门店id及编码 */ - public List getExistStoreNumStore(List storeStatus) { - return storeMapper.getExistStoreNumStore(storeStatus); + public List getExistStoreNumAndFinishInvestStore(List storeStatus) { + return storeMapper.getExistStoreNumAndFinishInvestStore(storeStatus); } /** diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/StoreMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/StoreMapper.java index ca85e79b2..f6722b9f8 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/StoreMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/StoreMapper.java @@ -71,9 +71,9 @@ public interface StoreMapper { List getAllStoreIdAndNum(@Param("storeStatus") List storeStatus); /** - * 查询拥有门店编码的门店id及编码 + * 查询拥有门店编码且完成开店管理的门店id及编码 */ - List getExistStoreNumStore(@Param("storeStatus") List storeStatus); + List getExistStoreNumAndFinishInvestStore(@Param("storeStatus") List storeStatus); /** * 查询门店积分 diff --git a/coolstore-partner-dao/src/main/resources/mapper/StoreMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/StoreMapper.xml index a61eac2a6..1036b977d 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/StoreMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/StoreMapper.xml @@ -276,12 +276,14 @@ - + 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 - AND store_status IN + AND a.store_status IN #{item} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/close/impl/CloseStoreServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/close/impl/CloseStoreServiceImpl.java index 1bdd89142..c0a3ae506 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/close/impl/CloseStoreServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/close/impl/CloseStoreServiceImpl.java @@ -326,7 +326,7 @@ public class CloseStoreServiceImpl implements CloseStoreService { userIds.addAll(StringUtils.isNotBlank(v.getHandlerUserIds()) ? Arrays.asList(v.getHandlerUserIds().split(",")) : Collections.emptyList()); } }); - Map userMap = enterpriseUserDAO.getUserMap(new ArrayList<>(userIds)); + Map userMap = enterpriseUserDAO.getUserInfoMap(new ArrayList<>(userIds)); List result = new ArrayList<>(); for (int i = 0; i < list.size(); i++) { CloseStoreAuditRecordDO auditRecordDO = list.get(i); diff --git a/coolstore-partner-web/src/main/java/com/cool/store/job/XxlJobHandler.java b/coolstore-partner-web/src/main/java/com/cool/store/job/XxlJobHandler.java index 419512534..86ae066ea 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/job/XxlJobHandler.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/job/XxlJobHandler.java @@ -889,7 +889,7 @@ public class XxlJobHandler { List updateList = new ArrayList<>(); while (hasNext) { PageHelper.startPage(pageNum, pageSize); - List storeList = storeDao.getExistStoreNumStore(Collections.singletonList(StoreStatusEnum.NOT_OPEN.getValue())); + List storeList = storeDao.getExistStoreNumAndFinishInvestStore(Collections.singletonList(StoreStatusEnum.NOT_OPEN.getValue())); if (CollectionUtils.isEmpty(storeList)) { break; }