diff --git a/coolstore-partner-model/src/main/java/com/cool/store/response/SysStoreAppResponse.java b/coolstore-partner-model/src/main/java/com/cool/store/response/SysStoreAppResponse.java index 31056a3b7..fb8542d83 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/response/SysStoreAppResponse.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/response/SysStoreAppResponse.java @@ -103,9 +103,11 @@ public class SysStoreAppResponse { @ApiModelProperty("大区code") private String bigCode; + @ApiModelProperty("战区id") + private Long fightId; @ApiModelProperty("战区描述") private String fightDesc; - @ApiModelProperty("战区描述") + @ApiModelProperty("战区code") private String fightCode; @ApiModelProperty("战区名称") private String fightName; diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SysStoreAppServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SysStoreAppServiceImpl.java index af4e96d6f..6d7736323 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SysStoreAppServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SysStoreAppServiceImpl.java @@ -145,12 +145,19 @@ public class SysStoreAppServiceImpl implements SysStoreAppService,AuditResultSer Long regionId = pointInfoDO.getRegionId(); RegionDO bigRegion = regionMapper.getBigRegionByRegionId(regionId);//大区 RegionDO fightRegion = regionMapper.getByRegionId(regionId);//战区 - EnterpriseUserDO enterpriseUserDO = userAuthMappingService.getUserByRoleEnumAndRegionId(UserRoleEnum.REGION_MANAGER, bigRegion.getId()); - if (Objects.nonNull(enterpriseUserDO)){ + EnterpriseUserDO regionManager = userAuthMappingService.getUserByRoleEnumAndRegionId(UserRoleEnum.REGION_MANAGER, bigRegion.getId()); + 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 - supervisorDetail.setSupervisorName(enterpriseUserDO.getName()); + supervisorDetail.setSupervisorName(supervisor.getName()); // supervisorId - supervisorDetail.setSupervisorId(enterpriseUserDO.getUserId()); + supervisorDetail.setSupervisorId(supervisor.getUserId()); } if (Objects.nonNull(bigRegion)){ storeDetail.setBigName(bigRegion.getName()); @@ -159,6 +166,7 @@ public class SysStoreAppServiceImpl implements SysStoreAppService,AuditResultSer if (Objects.nonNull(fightRegion)){ storeDetail.setFightName(fightRegion.getName()); storeDetail.setFightCode(fightRegion.getSynDingDeptId()); + storeDetail.setFightId(fightRegion.getId()); } if (Objects.nonNull(systemBuildingShopDO)){ sysStoreAppResponse.setId(systemBuildingShopDO.getId()); @@ -215,10 +223,6 @@ public class SysStoreAppServiceImpl implements SysStoreAppService,AuditResultSer storeDetail.setStoreSecurityDeposit(systemBuildingShopDO.getStoreSecurityDeposit()); // reasons storeDetail.setReasons(systemBuildingShopDO.getReasons()); - // regioGeneral - supervisorDetail.setRegioGeneral(systemBuildingShopDO.getRegioGeneral()); - // regioGeneralId - supervisorDetail.setRegioGeneralId(systemBuildingShopDO.getRegioGeneralId()); } if (Objects.nonNull(lineInfoDO)){ RegionDO byRegionId = regionMapper.getByRegionId(lineInfoDO.getRegionId());