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

Merge branch 'master' into cc_20250723_Decoration

Browse Source 
# Conflicts:
#	coolstore-partner-web/src/main/java/com/cool/store/controller/webb/OpenApiController.java
This commit is contained in:
shuo.wang
2025-07-24 15:29:31 +08:00
parent 34f46d97ee 4ba6266f5c
commit 9fa0d19cd4
10 changed files with 50 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
coolstore-partner-service/src/main/java/com/cool/store/service/StoreService.java
View File

@@ -5,6 +5,8 @@ import com.cool.store.dto.store.StoreUserPositionDTO;
import com.cool.store.response.MiniShopsResponse;
import com.github.pagehelper.PageInfo;
import java.util.List;
/**
* @Author suzhuhong
* @Date 2025/5/13 9:56
@@ -23,6 +25,6 @@ public interface StoreService {
PageInfo<MiniShopsResponse> getStoreListByMobile(String mobile,Integer pageNum,Integer pageSize,String storeName,String storeNum);
PageInfo<StoreUserPositionDTO> getStoreUser(Integer pageSize, Integer pageNum);
List<StoreUserPositionDTO> getStoreUser(List<String> storeCodeList);
}

13
coolstore-partner-service/src/main/java/com/cool/store/service/impl/StoreServiceImpl.java
View File

@@ -110,15 +110,13 @@ public class StoreServiceImpl implements StoreService {
}
@Override
public PageInfo<StoreUserPositionDTO> getStoreUser(Integer pageSize, Integer pageNum) {
if (pageSize>=100){
public List<StoreUserPositionDTO> getStoreUser(List<String> storeCodeList) {
if (CollectionUtils.isNotEmpty(storeCodeList)&&storeCodeList.size()>=100){
throw new ServiceException(ErrorCodeEnum.ERROR_MESSAGE,"单次最多获取100条门店数据");
}
PageHelper.startPage(pageNum,pageSize);
List<StoreDO> list = storeDao.list();
PageInfo info = new PageInfo<>(list);
List<StoreDO> list = storeDao.getStoreNumByStoreCodes(storeCodeList);
if (CollectionUtils.isEmpty(list)){
return info;
return new ArrayList<>();
}
List<StoreUserPositionDTO> result = new ArrayList<>();
list.forEach(x->{
@@ -143,8 +141,7 @@ public class StoreServiceImpl implements StoreService {
storeUserPositionDTO.setUserList(userList);
result.add(storeUserPositionDTO);
});
info.setList(result);
return info;
return result;
}

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

@@ -98,7 +98,7 @@ public class SyncMainSysServerImpl implements SyncMainSysServer {
BigRegionDO byRegionId = bigRegionDAO.getByRegionId(shopInfo.getRegionId());
if (byRegionId != null) {
requestBody.setStore_area(byRegionId.getStoreManageRegionId() == null
? shopInfo.getRegionId().toString() : shopInfo.getManagerRegionId().toString());
? shopInfo.getRegionId().toString() : byRegionId.getStoreManageRegionId().toString());
} else {
requestBody.setStore_area(shopInfo.getRegionId().toString());
}