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

数据处理

Browse Source
This commit is contained in:
shuo.wang
2025-07-14 17:15:06 +08:00
parent 87eeb43a77
commit bd8d91fdb8
5 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
coolstore-partner-dao/src/main/java/com/cool/store/dao/RegionDao.java
View File

@@ -32,6 +32,9 @@ public class RegionDao {
public RegionNode getRegionByRegionId( String regionId) { public RegionNode getRegionByRegionId( String regionId) {
if (StringUtils.isBlank(regionId)) {
return null;
}
return regionMapper.getRegionByRegionId( regionId); return regionMapper.getRegionByRegionId( regionId);
} }

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

@@ -1165,9 +1165,9 @@ public class DataHandlerServerImpl implements DataHandlerServer {
shopInfoDO.setManagerRegionId(isCreateStoreDTO.getPid()); shopInfoDO.setManagerRegionId(isCreateStoreDTO.getPid());
updateList.add(shopInfoDO); updateList.add(shopInfoDO);
} }
List<BigRegionDTO> bigRegionDTOS = bigRegionDAO.queryBigRegion(new QueryBigRegionRequest()); List<BigRegionDTO> bigRegionDTOS = bigRegionDAO.queryAllBigRegion(null);
Map<Long, BigRegionDTO> bigRegionDTOMap = bigRegionDTOS.stream().collect(Collectors.toMap(BigRegionDTO::getRegionId, x -> x)); Map<Long, BigRegionDTO> bigRegionDTOMap = bigRegionDTOS.stream().collect(Collectors.toMap(BigRegionDTO::getRegionId, x -> x));
//XX大区 //XX大区 正烧鸡
List<Long> storeManageIds = bigRegionDTOS.stream().filter(x -> x.getStoreManageRegionId() != null).map(BigRegionDTO::getStoreManageRegionId).collect(Collectors.toList()); List<Long> storeManageIds = bigRegionDTOS.stream().filter(x -> x.getStoreManageRegionId() != null).map(BigRegionDTO::getStoreManageRegionId).collect(Collectors.toList());
//加盟分部 //加盟分部
List<Long> branchStoreManageIds = bigRegionDTOS.stream().filter(x -> x.getStoreManageRegionId() == null).map(BigRegionDTO::getRegionId).collect(Collectors.toList()); List<Long> branchStoreManageIds = bigRegionDTOS.stream().filter(x -> x.getStoreManageRegionId() == null).map(BigRegionDTO::getRegionId).collect(Collectors.toList());

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

@@ -391,8 +391,8 @@ public class ShopServiceImpl implements ShopService {
} }
EnterpriseUserDO invest = enterpriseUserDAO.getUserInfoById(shopInfo.getInvestmentManager()); EnterpriseUserDO invest = enterpriseUserDAO.getUserInfoById(shopInfo.getInvestmentManager());
List<ScheduleDTO> shopContractActualCompletionTime = shopStageInfoDAO.getScheduleList(Collections.singletonList(shopId)); List<ScheduleDTO> shopContractActualCompletionTime = shopStageInfoDAO.getScheduleList(Collections.singletonList(shopId));
RegionNode shopRegion = regionMapper.getRegionByRegionId(shopInfo.getRegionId().toString()); RegionNode shopRegion = regionDao.getRegionByRegionId(shopInfo.getRegionId().toString());
RegionNode mapperRegionByRegionId = regionMapper.getRegionByRegionId(shopInfo.getManagerRegionId().toString()); RegionNode mapperRegionByRegionId = regionDao.getRegionByRegionId(shopInfo.getManagerRegionId().toString());
String wantShopArea = hyOpenAreaInfoDAO.selectNameMapById(shopInfo.getWantShopAreaId()); String wantShopArea = hyOpenAreaInfoDAO.selectNameMapById(shopInfo.getWantShopAreaId());
HyOpenAreaInfoDO hyOpenAreaInfoDO = hyOpenAreaInfoDAO.selectById(shopInfo.getWantShopAreaId()); HyOpenAreaInfoDO hyOpenAreaInfoDO = hyOpenAreaInfoDAO.selectById(shopInfo.getWantShopAreaId());
BranchShopDetailResponse response = new BranchShopDetailResponse(); BranchShopDetailResponse response = new BranchShopDetailResponse();

6
coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java
View File

@@ -44,6 +44,8 @@ import static com.cool.store.enums.point.ShopSubStageStatusEnum.*;
@Slf4j @Slf4j
public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResultService { public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResultService {
@Resource
private RegionDao regionDao;
@Resource @Resource
private PointInfoDAO pointInfoDAO; private PointInfoDAO pointInfoDAO;
@Resource @Resource
@@ -461,9 +463,9 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu
//证照办理 //证照办理
LicenseTransactDO licenseTransactDO = applyLicenseMapper.selectByShopId(shopId); LicenseTransactDO licenseTransactDO = applyLicenseMapper.selectByShopId(shopId);
RegionDO regionInfo = regionMapper.getByRegionId(shopInfoDO.getRegionId()); RegionDO regionInfo = regionDao.selectById(shopInfoDO.getRegionId());
RegionDO managerRegion = regionMapper.getByRegionId(shopInfoDO.getManagerRegionId()); RegionDO managerRegion = regionDao.selectById(shopInfoDO.getManagerRegionId());
// if (Objects.nonNull(pointInfoDO)) { // if (Objects.nonNull(pointInfoDO)) {

7
coolstore-partner-web/src/main/java/com/cool/store/controller/webb/DataHandlerController.java
View File

@@ -177,4 +177,11 @@ public class DataHandlerController {
public ResponseResult<Boolean> franchiseFeeDateHandler(@RequestParam("pageSize") Integer pageSize, @RequestParam("pageNum") Integer pageNum){ public ResponseResult<Boolean> franchiseFeeDateHandler(@RequestParam("pageSize") Integer pageSize, @RequestParam("pageNum") Integer pageNum){
return ResponseResult.success(dataHandlerServer.franchiseFeeDateHandler(pageSize,pageNum)); return ResponseResult.success(dataHandlerServer.franchiseFeeDateHandler(pageSize,pageNum));
} }
@ApiOperation("门店数据初始化")
@GetMapping("/dataHandlerCreateStore")
public ResponseResult<Boolean> dataHandlerCreateStore(){
dataHandlerServer.dataHandlerCreateStore();
return ResponseResult.success(true);
}
} }