数据处理

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

View File

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

View File

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