diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ApplyLicenseServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ApplyLicenseServiceImpl.java index bcd9045eb..74d69306b 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ApplyLicenseServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ApplyLicenseServiceImpl.java @@ -190,8 +190,20 @@ public class ApplyLicenseServiceImpl implements ApplyLicenseService { } submitLicenseResponse.setProcessRecords(listByShopIdAndType); } - //2.未查到证照信息,所以查询鲜丰的默认值(只要鲜丰接口内有值,总是优先使用鲜丰数据) ShopInfoDO shopInfoDO = shopInfoMapper.selectByPrimaryKey(shopId); + SystemBuildingShopDO systemBuildingShopDO = systemBuildingShopMapper.selectByShopId(shopId); + if (Objects.nonNull(systemBuildingShopDO) && Objects.nonNull(systemBuildingShopDO.getSupervisorId())){ + EnterpriseUserDO userInfoByJobnumber = enterpriseUserMapper.getUserInfoByJobnumber(systemBuildingShopDO.getSupervisorId()); + if (Objects.nonNull(userInfoByJobnumber)){ + submitLicenseResponse.setApprover(userInfoByJobnumber.getName()+"_"+userInfoByJobnumber.getJobnumber()); + } + }else { + EnterpriseUserDO enterpriseUserDO = userAuthMappingService.hierarchicalSearch(UserRoleEnum.SUPERVISION, shopInfoDO.getRegionId()); + if (Objects.nonNull(enterpriseUserDO)){ + submitLicenseResponse.setApprover(enterpriseUserDO.getName()+"_"+enterpriseUserDO.getJobnumber()); + } + } + //2.未查到证照信息,所以查询鲜丰的默认值(只要鲜丰接口内有值,总是优先使用鲜丰数据) if (Objects.nonNull(shopInfoDO.getStoreNum()) && StringUtil.isNotBlank(shopInfoDO.getStoreNum())) { GetStoreInfoByCodeResponse storeInfoCode = coolStoreStartFlowService.getStoreInfoCode(shopInfoDO.getStoreNum()); if (Objects.nonNull(storeInfoCode.getData()) @@ -208,20 +220,6 @@ public class ApplyLicenseServiceImpl implements ApplyLicenseService { } } - SystemBuildingShopDO systemBuildingShopDO = systemBuildingShopMapper.selectByShopId(shopId); - if (Objects.nonNull(systemBuildingShopDO) && Objects.nonNull(systemBuildingShopDO.getSupervisorId())){ - EnterpriseUserDO userInfoByJobnumber = enterpriseUserMapper.getUserInfoByJobnumber(systemBuildingShopDO.getSupervisorId()); - if (Objects.nonNull(userInfoByJobnumber)){ - submitLicenseResponse.setApprover(userInfoByJobnumber.getName()+"_"+userInfoByJobnumber.getJobnumber()); - } - }else { - EnterpriseUserDO enterpriseUserDO = userAuthMappingService.hierarchicalSearch(UserRoleEnum.SUPERVISION, shopInfoDO.getRegionId()); - if (Objects.nonNull(enterpriseUserDO)){ - submitLicenseResponse.setApprover(enterpriseUserDO.getName()+"_"+enterpriseUserDO.getJobnumber()); - } - } - - //3.既没有提交数据,也没有在鲜丰端查到证照信息,则返回空自由填写 return submitLicenseResponse; }