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-14 14:27:52 +08:00
parent afa1a62108
commit f988e3111a
4 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java
+3 -3
View File
@@ -252,9 +252,6 @@ public class PayContactsManagementController extends JeroController<PayContactsM
// 企业管理员变更需要同步会员项目
if(Objects.equals(payContactsManagementOld.getRoleCode(),PayContactsManagementCommon.ROLE_CODE2)
&& StringUtils.isBlank(payContactsManagement.getFlagStatus())){
if(!Objects.equals(payContactsManagementOld.getCompanyId(),payContactsManagement.getCompanyId())){
return Result.error("会员人员不可变更企业！");
}
// 调用会员项目接口
MemberInfo memberInfo = new MemberInfo();
memberInfo.setCompanyName(payCompanyManagement.getCompanyName());
@@ -317,6 +314,9 @@ public class PayContactsManagementController extends JeroController<PayContactsM
updatePayContactsManagement.set(PayContactsManagement::getContactAddress,payContactsManagement.getContactAddress());
updatePayContactsManagement.set(PayContactsManagement::getPostalCode,payContactsManagement.getPostalCode());
updatePayContactsManagement.set(PayContactsManagement::getRemarks,payContactsManagement.getRemarks());
if(!Objects.equals(payContactsManagementOld.getCompanyId(),payContactsManagement.getCompanyId())){
updatePayContactsManagement.set(PayContactsManagement::getRoleCode,PayContactsManagementCommon.ROLE_CODE1);
}
payContactsManagementService.update(updatePayContactsManagement);
// payContactsManagementService.updateById(payContactsManagement);
return Result.OK("编辑成功!");
jero-boot-incoming-payment/src/main/java/com/jero/company/entity/PayContactsManagement.java
+1
View File
@@ -58,6 +58,7 @@ public class PayContactsManagement implements Serializable {
/**企业用户角色1:企业联系人、2：企业管理员*/
// @Excel(name = "企业用户角色", width = 15)
@ApiModelProperty(value = "企业用户角色")
@Dict(dicCode = "company_role")
private String roleCode;
/**性别（1:男，2:女）*/
@Excel(name = "性别", width = 15,dicCode="sex")
jero-boot-incoming-payment/src/main/java/com/jero/company/mapper/xml/PayContactsManagementMapper.xml
+1
View File
@@ -8,6 +8,7 @@
pcm.company_id AS companyId,
pcm1.company_name AS companyName,
pcm.name,
pcm.role_code,
pcm.gender,
pcm.post,
pcm.phone,
jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayContactsManagementServiceImpl.java
+9 -6
View File
@@ -125,18 +125,17 @@ public class PayContactsManagementServiceImpl extends ServiceImpl<PayContactsMan
if(Objects.isNull(payContactsManagementOld)){
throw new JeroBootException("联系人不存在！");
}
if(!Objects.equals(payContactsManagementOld.getName(),payContactsManagement.getName())){
if(!Objects.equals(payContactsManagementOld.getName(),payContactsManagement.getName())
&& StringUtils.isBlank(payContactsManagement.getFlagStatus())){
throw new JeroBootException("姓名不可修改！");
}
if(!Objects.equals(PasswordUtil.decrypt(payContactsManagementOld.getPhone()),payContactsManagement.getPhone())){
if(!Objects.equals(PasswordUtil.decrypt(payContactsManagementOld.getPhone()),payContactsManagement.getPhone())
&& StringUtils.isBlank(payContactsManagement.getFlagStatus())){
throw new JeroBootException("手机号不可修改！");
}
// 企业管理员变更需要同步会员项目
if(Objects.equals(payContactsManagementOld.getRoleCode(),PayContactsManagementCommon.ROLE_CODE2)
&& StringUtils.isBlank(payContactsManagement.getFlagStatus())){
if(!Objects.equals(payContactsManagementOld.getCompanyId(),payContactsManagement.getCompanyId())){
throw new JeroBootException("会员人员不可变更企业！");
}
// 调用会员项目接口
MemberInfo memberInfo = new MemberInfo();
memberInfo.setCompanyName(payCompanyManagement.getCompanyName());
@@ -186,6 +185,7 @@ public class PayContactsManagementServiceImpl extends ServiceImpl<PayContactsMan
}catch (Exception e){
log.error("手机号、邮箱加密异常！",e);
}
LambdaUpdateWrapper<PayContactsManagement> updatePayContactsManagement = new LambdaUpdateWrapper<>();
updatePayContactsManagement.eq(PayContactsManagement::getId,payContactsManagement.getId());
updatePayContactsManagement.set(PayContactsManagement::getCompanyName,payContactsManagement.getCompanyName());
@@ -198,9 +198,12 @@ public class PayContactsManagementServiceImpl extends ServiceImpl<PayContactsMan
updatePayContactsManagement.set(PayContactsManagement::getContactAddress,payContactsManagement.getContactAddress());
updatePayContactsManagement.set(PayContactsManagement::getPostalCode,payContactsManagement.getPostalCode());
updatePayContactsManagement.set(PayContactsManagement::getRemarks,payContactsManagement.getRemarks());
// 变更企业，求改企业联系人为普通联系人
if(!StringUtils.isBlank(payContactsManagement.getRoleCode())){
updatePayContactsManagement.set(PayContactsManagement::getRoleCode,payContactsManagement.getRoleCode());
}
update(updatePayContactsManagement);
// payContactsManagementService.updateById(payContactsManagement);
}
@Override