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

polymerization

Browse Source
This commit is contained in:
guohb
2024-04-30 11:04:41 +08:00
parent 9f26532ea0
commit 0de512acb9
2 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
coolstore-partner-model/src/main/java/com/cool/store/response/SysStoreAppResponse.java
View File

@@ -103,9 +103,11 @@ public class SysStoreAppResponse {
@ApiModelProperty("大区code") @ApiModelProperty("大区code")
private String bigCode; private String bigCode;
@ApiModelProperty("战区id")
private Long fightId;
@ApiModelProperty("战区描述") @ApiModelProperty("战区描述")
private String fightDesc; private String fightDesc;
@ApiModelProperty("战区描述") @ApiModelProperty("战区code")
private String fightCode; private String fightCode;
@ApiModelProperty("战区名称") @ApiModelProperty("战区名称")
private String fightName; private String fightName;

20
coolstore-partner-service/src/main/java/com/cool/store/service/impl/SysStoreAppServiceImpl.java
View File

@@ -145,12 +145,19 @@ public class SysStoreAppServiceImpl implements SysStoreAppService,AuditResultSer
Long regionId = pointInfoDO.getRegionId(); Long regionId = pointInfoDO.getRegionId();
RegionDO bigRegion = regionMapper.getBigRegionByRegionId(regionId);//大区 RegionDO bigRegion = regionMapper.getBigRegionByRegionId(regionId);//大区
RegionDO fightRegion = regionMapper.getByRegionId(regionId);//战区 RegionDO fightRegion = regionMapper.getByRegionId(regionId);//战区
EnterpriseUserDO enterpriseUserDO = userAuthMappingService.getUserByRoleEnumAndRegionId(UserRoleEnum.REGION_MANAGER, bigRegion.getId()); EnterpriseUserDO regionManager = userAuthMappingService.getUserByRoleEnumAndRegionId(UserRoleEnum.REGION_MANAGER, bigRegion.getId());
if (Objects.nonNull(enterpriseUserDO)){ EnterpriseUserDO supervisor = userAuthMappingService.getUserByRoleEnumAndRegionId(UserRoleEnum.SUPERVISION, fightRegion.getId());
if (Objects.nonNull(regionManager)){
// regioGeneral
supervisorDetail.setRegioGeneral(regionManager.getName());
// regioGeneralId
supervisorDetail.setRegioGeneralId(regionManager.getUserId());
}
if (Objects.nonNull(supervisor)){
// supervisorName // supervisorName
supervisorDetail.setSupervisorName(enterpriseUserDO.getName()); supervisorDetail.setSupervisorName(supervisor.getName());
// supervisorId // supervisorId
supervisorDetail.setSupervisorId(enterpriseUserDO.getUserId()); supervisorDetail.setSupervisorId(supervisor.getUserId());
} }
if (Objects.nonNull(bigRegion)){ if (Objects.nonNull(bigRegion)){
storeDetail.setBigName(bigRegion.getName()); storeDetail.setBigName(bigRegion.getName());
@@ -159,6 +166,7 @@ public class SysStoreAppServiceImpl implements SysStoreAppService,AuditResultSer
if (Objects.nonNull(fightRegion)){ if (Objects.nonNull(fightRegion)){
storeDetail.setFightName(fightRegion.getName()); storeDetail.setFightName(fightRegion.getName());
storeDetail.setFightCode(fightRegion.getSynDingDeptId()); storeDetail.setFightCode(fightRegion.getSynDingDeptId());
storeDetail.setFightId(fightRegion.getId());
} }
if (Objects.nonNull(systemBuildingShopDO)){ if (Objects.nonNull(systemBuildingShopDO)){
sysStoreAppResponse.setId(systemBuildingShopDO.getId()); sysStoreAppResponse.setId(systemBuildingShopDO.getId());
@@ -215,10 +223,6 @@ public class SysStoreAppServiceImpl implements SysStoreAppService,AuditResultSer
storeDetail.setStoreSecurityDeposit(systemBuildingShopDO.getStoreSecurityDeposit()); storeDetail.setStoreSecurityDeposit(systemBuildingShopDO.getStoreSecurityDeposit());
// reasons // reasons
storeDetail.setReasons(systemBuildingShopDO.getReasons()); storeDetail.setReasons(systemBuildingShopDO.getReasons());
// regioGeneral
supervisorDetail.setRegioGeneral(systemBuildingShopDO.getRegioGeneral());
// regioGeneralId
supervisorDetail.setRegioGeneralId(systemBuildingShopDO.getRegioGeneralId());
} }
if (Objects.nonNull(lineInfoDO)){ if (Objects.nonNull(lineInfoDO)){
RegionDO byRegionId = regionMapper.getByRegionId(lineInfoDO.getRegionId()); RegionDO byRegionId = regionMapper.getByRegionId(lineInfoDO.getRegionId());