LK/income_payments_management
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

新增角色体系：包含企业联系人、企业管理员

Browse Source
This commit is contained in:
liangqitao
2021-12-13 19:25:52 +08:00
parent 8ba3ff1494
commit a55c03f427
2 changed files with 38 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/company/entity/MemberInfo.java
-3
View File
@@ -25,9 +25,6 @@ public class MemberInfo implements Serializable {
/**真实姓名*/
@ApiModelProperty(value = "真实姓名")
private String realname;
/**单位全称*/
@ApiModelProperty(value = "单位全称")
private String companyName;
/**联系人*/
@ApiModelProperty(value = "联系人")
private String liaisonMan;
jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayCompanyManagementServiceImpl.java
+38 -5
View File
@@ -12,9 +12,12 @@ import com.jero.common.enums.ManagementMessageEnums;
import com.jero.common.exception.JeroBootException;
import com.jero.common.service.SendMessageService;
import com.jero.common.system.vo.LoginUser;
import com.jero.common.util.AuthenticationUtils;
import com.jero.common.util.PasswordUtil;
import com.jero.common.util.ValidUtil;
import com.jero.company.common.PayCompanyManagementCommon;
import com.jero.company.common.PayContactsManagementCommon;
import com.jero.company.entity.MemberInfo;
import com.jero.company.entity.PayCompanyAndContactsManagement;
import com.jero.company.entity.PayCompanyManagement;
import com.jero.company.entity.PayContactsManagement;
@@ -240,13 +243,21 @@ public class PayCompanyManagementServiceImpl extends ServiceImpl<PayCompanyManag
if(Objects.isNull(payCompanyManagementOld)){
throw new JeroBootException("企业不存在!");
}
// 会员企业编辑同步会员系统
if(Objects.equals(payCompanyManagementOld.getRoleCode(),PayCompanyManagementCommon.ROLE_CODE2)){
// todo 同步会员系统
}
if(!Objects.equals(payCompanyManagementOld.getCompanyName(),payCompanyManagement.getCompanyName())){
throw new JeroBootException("企业名称不可修改!");
}
// 会员企业编辑同步会员系统
if(Objects.equals(payCompanyManagementOld.getRoleCode(),PayCompanyManagementCommon.ROLE_CODE2)){
// 调用会员项目接口
MemberInfo memberInfo = new MemberInfo();
memberInfo.setMemberId(payCompanyManagementOld.getMemberId());
memberInfo.setTaxNo(payCompanyManagement.getDutyCode());
memberInfo.setDepositBank(payCompanyManagement.getOpeningBank());
memberInfo.setBankAccount(payCompanyManagement.getBankAccount());
memberInfo.setInvoiceAddress(payCompanyManagement.getCompanyAddress());
memberInfo.setInvoicePhone(payCompanyManagement.getCompanyPhone());
AuthenticationUtils.post("/memberInfo/memberInfo/incomingEdit","",memberInfo);
}
payCompanyManagement.setStatus(payCompanyManagementOld.getStatus());
payCompanyManagement.setDataSource(payCompanyManagementOld.getDataSource());
try {
@@ -310,7 +321,15 @@ public class PayCompanyManagementServiceImpl extends ServiceImpl<PayCompanyManag
}
// 会员企业编辑同步会员系统
if(Objects.equals(payCompanyManagementOld.getRoleCode(),PayCompanyManagementCommon.ROLE_CODE2)){
// todo 同步会员系统
// 调用会员项目接口
MemberInfo memberInfo = new MemberInfo();
memberInfo.setMemberId(payCompanyManagementOld.getMemberId());
memberInfo.setTaxNo(payCompanyManagement.getDutyCode());
memberInfo.setDepositBank(payCompanyManagement.getOpeningBank());
memberInfo.setBankAccount(payCompanyManagement.getBankAccount());
memberInfo.setInvoiceAddress(payCompanyManagement.getCompanyAddress());
memberInfo.setInvoicePhone(payCompanyManagement.getCompanyPhone());
AuthenticationUtils.post("/memberInfo/memberInfo/incomingEdit","",memberInfo);
}
try {
// 编辑保存企业前再次校验企业名称是否存在
@@ -402,6 +421,8 @@ public class PayCompanyManagementServiceImpl extends ServiceImpl<PayCompanyManag
// payContactsManagement.setEmail(PasswordUtil.decrypt(payContactsManagement.getEmail()));
// }
payCompanyManagement.setRoleCode(PayCompanyManagementCommon.ROLE_CODE2);
payContactsManagement.setRoleCode(PayContactsManagementCommon.ROLE_CODE2);
// 新增
if(CollectionUtils.isEmpty(listPayCompanyManagement)){
// 新增，如果存在用户，返回异常
@@ -417,6 +438,18 @@ public class PayCompanyManagementServiceImpl extends ServiceImpl<PayCompanyManag
if(!Objects.equals(listPayContactsManagement.get(0).getCompanyId(),listPayCompanyManagement.get(0).getId())){
throw new JeroBootException("此用户已在其他企业下");
}else{
LambdaQueryWrapper<PayContactsManagement> queryPayContactsManagementNew = new LambdaQueryWrapper<>();
queryPayContactsManagementNew.eq(PayContactsManagement::getCompanyId,listPayCompanyManagement.get(0).getId());
queryPayContactsManagementNew.eq(PayContactsManagement::getRoleCode,PayCompanyManagementCommon.ROLE_CODE2);
List<PayContactsManagement> listPayContactsManagementNew = payContactsManagementService.list(queryPayContactsManagementNew);
// 已经存在会员用户，变更会员用户
if(!CollectionUtils.isEmpty(listPayContactsManagementNew)
&& !Objects.equals(listPayContactsManagementNew.get(0).getPhone(),PasswordUtil.encrypt(payCompanyManagement.getCompanyPhone()))){
LambdaUpdateWrapper<PayContactsManagement> updatePayContactsManagement = new LambdaUpdateWrapper<>();
updatePayContactsManagement.eq(PayContactsManagement::getId,listPayContactsManagementNew.get(0).getId());
updatePayContactsManagement.set(PayContactsManagement::getRoleCode,PayContactsManagementCommon.ROLE_CODE1);
payContactsManagementService.update(updatePayContactsManagement);
}
payContactsManagement.setCompanyId(listPayCompanyManagement.get(0).getId());
payContactsManagement.setId(listPayContactsManagement.get(0).getId());
payContactsManagementService.contactsEdit(payContactsManagement);