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-15 18:05:11 +08:00
parent e8805ee6bc
commit 4b908f33a3
3 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
coolstore-partner-dao/src/main/resources/mapper/BigRegionMapper.xml
View File

@@ -23,7 +23,8 @@
select DISTINCT select DISTINCT
region_id as regionId, region_id as regionId,
region_name as regionName, region_name as regionName,
group_name as groupName group_name as groupName,
store_manage_region_id as storeManageRegionId
FROM `xfsg_big_region` FROM `xfsg_big_region`
<where> <where>
<if test="keyword!=null and keyword !=''"> <if test="keyword!=null and keyword !=''">

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

@@ -1205,11 +1205,15 @@ public class DataHandlerServerImpl implements DataHandlerServer {
errorList.add(errorDTO); errorList.add(errorDTO);
continue; continue;
} }
if (bigRegionDTO.getStoreManageRegionId()==null){ if (bigRegionDTO.getStoreManageRegionId()!=null){
regionDO = manageRegionMap.get(name); regionDO = manageRegionMap.get(name);
}else{ }else{
regionDO= branchStoreManageMap.get(name); regionDO= branchStoreManageMap.get(name);
} }
if (shopInfoDO.getId()==313){
log.info("bigRegionDTO:{}",JSONObject.toJSONString(bigRegionDTO));
log.info("regionDO:{}",JSONObject.toJSONString(regionDO));
}
if (Objects.isNull(regionDO)){ if (Objects.isNull(regionDO)){
log.info("门店所属管理区域未找到 shopId：{}",shopInfoDO.getId()); log.info("门店所属管理区域未找到 shopId：{}",shopInfoDO.getId());
ImportOaOldShopDataErrorDTO errorDTO = new ImportOaOldShopDataErrorDTO(shopInfoDO.getShopCode(), "门店所属管理区域未找到"); ImportOaOldShopDataErrorDTO errorDTO = new ImportOaOldShopDataErrorDTO(shopInfoDO.getShopCode(), "门店所属管理区域未找到");

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

@@ -172,6 +172,8 @@ public class RegionServiceImpl implements RegionService {
BigRegionDO byRegionId = bigRegionDAO.getByRegionId(regionId); BigRegionDO byRegionId = bigRegionDAO.getByRegionId(regionId);
if (byRegionId.getStoreManageRegionId()==null){ if (byRegionId.getStoreManageRegionId()==null){
regionId=byRegionId.getRegionId(); regionId=byRegionId.getRegionId();
}else {
regionId=byRegionId.getStoreManageRegionId();
} }
return regionMapper.getSubRegionByParentIdAndRegionType(regionId,"path"); return regionMapper.getSubRegionByParentIdAndRegionType(regionId,"path");
} }