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

更改督导逻辑

Browse Source
This commit is contained in:
guohb
2024-06-05 20:58:56 +08:00
parent fa5f9f7467
commit f6fcdcd6d8
1 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
coolstore-partner-service/src/main/java/com/cool/store/service/impl/ApplyLicenseServiceImpl.java
View File

@@ -17,10 +17,7 @@ import com.cool.store.request.SubmitLicenseRequest;
import com.cool.store.response.GetStoreInfoByCodeResponse; import com.cool.store.response.GetStoreInfoByCodeResponse;
import com.cool.store.response.LicenseListResponse; import com.cool.store.response.LicenseListResponse;
import com.cool.store.response.SubmitLicenseResponse; import com.cool.store.response.SubmitLicenseResponse;
import com.cool.store.service.ApplyLicenseService; import com.cool.store.service.*;
import com.cool.store.service.CoolStoreStartFlowService;
import com.cool.store.service.PreparationService;
import com.cool.store.service.SysStoreAppService;
import com.cool.store.utils.RedisUtilPool; import com.cool.store.utils.RedisUtilPool;
import com.cool.store.utils.StringUtil; import com.cool.store.utils.StringUtil;
import com.cool.store.utils.poi.StringUtils; import com.cool.store.utils.poi.StringUtils;
@@ -93,6 +90,9 @@ public class ApplyLicenseServiceImpl implements ApplyLicenseService {
@Resource @Resource
EnterpriseUserMapper enterpriseUserMapper; EnterpriseUserMapper enterpriseUserMapper;
@Resource
UserAuthMappingService userAuthMappingService;
@Override @Override
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
@@ -209,10 +209,19 @@ public class ApplyLicenseServiceImpl implements ApplyLicenseService {
} }
SystemBuildingShopDO systemBuildingShopDO = systemBuildingShopMapper.selectByShopId(shopId); SystemBuildingShopDO systemBuildingShopDO = systemBuildingShopMapper.selectByShopId(shopId);
if (Objects.nonNull(systemBuildingShopDO.getSupervisorId())){
EnterpriseUserDO userInfoByJobnumber = enterpriseUserMapper.getUserInfoByJobnumber(systemBuildingShopDO.getSupervisorId()); EnterpriseUserDO userInfoByJobnumber = enterpriseUserMapper.getUserInfoByJobnumber(systemBuildingShopDO.getSupervisorId());
if (Objects.nonNull(userInfoByJobnumber)){ if (Objects.nonNull(userInfoByJobnumber)){
submitLicenseResponse.setApprover(userInfoByJobnumber.getName()+"_"+userInfoByJobnumber.getJobnumber()); 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.既没有提交数据，也没有在鲜丰端查到证照信息，则返回空自由填写 //3.既没有提交数据，也没有在鲜丰端查到证照信息，则返回空自由填写
return submitLicenseResponse; return submitLicenseResponse;
} }