diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/FranchiseAgreementRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/FranchiseAgreementRequest.java index bc1f711e8..6588133a2 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/FranchiseAgreementRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/FranchiseAgreementRequest.java @@ -435,4 +435,9 @@ public class FranchiseAgreementRequest { * 装修合同业务分类,默认:3121375929356587766 */ private String zxhtywfl; + + /** + * 法定代表人或负责人 + */ + private String fddbr; } 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 44c3c5293..6443ccc59 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 @@ -119,7 +119,12 @@ public class ApplyLicenseServiceImpl implements ApplyLicenseService { List userAuthByMappingIds = userAuthMappingMapper.getUserAuthByMappingIds(Collections.singletonList(String.valueOf(regionId))); if (CollectionUtils.isNotEmpty(userAuthByMappingIds)) { List sendUserIds = userAuthByMappingIds.stream().map(UserAuthMappingDO::getUserId).collect(Collectors.toList()); - sendUsers.addAll(sendUserIds); + if (CollectionUtils.isNotEmpty(sendUserIds)){ + sendUsers = enterpriseUserRoleMapper.getUserIdsByRoleIds(Collections.singletonList("130000000"), sendUserIds); + if (CollectionUtils.isNotEmpty(sendUsers)){ + sendUsers.addAll(sendUserIds); + } + } } } else { sendUsers.add(shopInfoDO.getSupervisorUserId()); diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java index bc754d051..00ab416a6 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java @@ -291,6 +291,7 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu .yyzzfyj(temp) .zhihang(linePayDO.getBranchBankName()) .zqyty(SignTypeEnum.getWorkflowStageByCode(request.getSignType()).getSap()) + .fddbr(licenseTransactDO.getLicenseLegalPerson()) .build(); }