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 12:03:19 +08:00
parent 64bb24381f
commit 81425c56ef
6 changed files with 55 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/company/common/PayContactsManagementCommon.java
+5
View File
@@ -21,6 +21,11 @@ public class PayContactsManagementCommon {
* 是否需要同步会员系统 1：为是，其他为否
*/
public final static String FLAG_STATUS = "1";
/**
* 删除状态(0为未通过，1为审核通过)只有企业端登录需要判断此字段
*/
public final static String DEL_FLAG = "0";
}
jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java
+5 -5
View File
@@ -250,13 +250,13 @@ public class PayContactsManagementController extends JeroController<PayContactsM
return Result.error("联系人不存在！");
}
// 企业管理员变更需要同步会员项目
if(Objects.equals(payContactsManagement.getRoleCode(),PayContactsManagementCommon.ROLE_CODE2)
&& StringUtils.isBlank(PayContactsManagementCommon.FLAG_STATUS)){
if(Objects.equals(payContactsManagementOld.getRoleCode(),PayContactsManagementCommon.ROLE_CODE2)
&& StringUtils.isBlank(payContactsManagement.getFlagStatus())){
// 调用会员项目接口
MemberInfo memberInfo = new MemberInfo();
memberInfo.setMemberId(payContactsManagementOld.getMemberId());
memberInfo.setUserName(payContactsManagement.getPhone());
memberInfo.setRealname(payContactsManagement.getName());
memberInfo.setCompanyName(payCompanyManagement.getCompanyName());
memberInfo.setId(payContactsManagementOld.getMemberId());
memberInfo.setLiaisonMan(payContactsManagement.getName());
memberInfo.setEmail(payContactsManagement.getEmail());
memberInfo.setMobile(payContactsManagement.getPhone());
memberInfo.setAddress(payContactsManagement.getContactAddress());
jero-boot-incoming-payment/src/main/java/com/jero/company/entity/MemberInfo.java
+4 -7
View File
@@ -18,13 +18,10 @@ public class MemberInfo implements Serializable {
/**会员企业id*/
@ApiModelProperty(value = "会员企业id")
private String memberId;
/**用户名称*/
@ApiModelProperty(value = "用户名")
private String userName;
/**真实姓名*/
@ApiModelProperty(value = "真实姓名")
private String realname;
private String id;
/**单位全称*/
@ApiModelProperty(value = "单位全称")
private String companyName;
/**联系人*/
@ApiModelProperty(value = "联系人")
private String liaisonMan;
jero-boot-incoming-payment/src/main/java/com/jero/company/entity/PayContactsManagement.java
+5
View File
@@ -144,4 +144,9 @@ public class PayContactsManagement implements Serializable {
*/
@TableField(exist = false)
private String flagStatus;
/**
* 删除状态(0为未通过，1为审核通过)只有企业端登录需要判断此字段
*/
@ApiModelProperty(value = "删除状态")
private String delFlag;
}
jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayCompanyManagementServiceImpl.java
+27 -11
View File
@@ -136,7 +136,9 @@ public class PayCompanyManagementServiceImpl extends ServiceImpl<PayCompanyManag
}
payCompanyManagement.setDataSource(PayCompanyManagementCommon.DATA_SOURCE2);
payCompanyManagement.setStatus(PayCompanyManagementCommon.STATUS2);
payCompanyManagement.setRoleCode(PayCompanyManagementCommon.ROLE_CODE1);
if(StringUtils.isBlank(payCompanyManagement.getFlagStatus())){
payCompanyManagement.setRoleCode(PayCompanyManagementCommon.ROLE_CODE1);
}
payCompanyManagementService.save(payCompanyManagement);
@@ -235,10 +237,9 @@ public class PayCompanyManagementServiceImpl extends ServiceImpl<PayCompanyManag
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
int status = PayCompanyManagementCommon.STATUS2;
// 只有财务人员操作不需要重新审核，其他人都需要审核
if(sysUser.getRoleCode().contains(RoleCommon.CWRY)){
if(!Objects.isNull(sysUser) && sysUser.getRoleCode().contains(RoleCommon.CWRY)){
status = PayCompanyManagementCommon.STATUS1;
}
payCompanyManagement.setStatus(status);
PayCompanyManagement payCompanyManagementOld = payCompanyManagementService.getById(payCompanyManagement.getId());
if(Objects.isNull(payCompanyManagementOld)){
throw new JeroBootException("企业不存在!");
@@ -246,12 +247,17 @@ public class PayCompanyManagementServiceImpl extends ServiceImpl<PayCompanyManag
if(!Objects.equals(payCompanyManagementOld.getCompanyName(),payCompanyManagement.getCompanyName())){
throw new JeroBootException("企业名称不可修改!");
}
// 会员企业编辑同步会员系统
if(Objects.equals(payCompanyManagementOld.getRoleCode(),PayCompanyManagementCommon.ROLE_CODE2)
&& StringUtils.isBlank(PayCompanyManagementCommon.FLAG_STATUS)){
&& StringUtils.isBlank(payCompanyManagement.getFlagStatus())){
if(!Objects.equals(payCompanyManagementOld.getCompanyName(),payCompanyManagement.getCompanyName())){
throw new JeroBootException("会员企业名称不可修改!");
}
// 调用会员项目接口
MemberInfo memberInfo = new MemberInfo();
memberInfo.setMemberId(payCompanyManagementOld.getMemberId());
memberInfo.setCompanyName(payCompanyManagement.getCompanyName());
memberInfo.setId(payCompanyManagementOld.getMemberId());
memberInfo.setTaxNo(payCompanyManagement.getDutyCode());
memberInfo.setDepositBank(payCompanyManagement.getOpeningBank());
memberInfo.setBankAccount(payCompanyManagement.getBankAccount());
@@ -259,7 +265,9 @@ public class PayCompanyManagementServiceImpl extends ServiceImpl<PayCompanyManag
memberInfo.setInvoicePhone(payCompanyManagement.getCompanyPhone());
AuthenticationUtils.post("/memberInfo/memberInfo/incomingEdit","",memberInfo);
}
payCompanyManagement.setStatus(payCompanyManagementOld.getStatus());
payCompanyManagement.setStatus(status);
// payCompanyManagement.setStatus(payCompanyManagementOld.getStatus());
payCompanyManagement.setDataSource(payCompanyManagementOld.getDataSource());
try {
// 编辑保存企业前再次校验企业名称是否存在
@@ -322,10 +330,14 @@ public class PayCompanyManagementServiceImpl extends ServiceImpl<PayCompanyManag
}
// 会员企业编辑同步会员系统
if(Objects.equals(payCompanyManagementOld.getRoleCode(),PayCompanyManagementCommon.ROLE_CODE2)
&& StringUtils.isBlank(PayCompanyManagementCommon.FLAG_STATUS)){
&& StringUtils.isBlank(payCompanyManagement.getFlagStatus())){
if(!Objects.equals(payCompanyManagementOld.getCompanyName(),payCompanyManagement.getCompanyName())){
throw new JeroBootException("会员企业名称不可修改!");
}
// 调用会员项目接口
MemberInfo memberInfo = new MemberInfo();
memberInfo.setMemberId(payCompanyManagementOld.getMemberId());
memberInfo.setCompanyName(payCompanyManagement.getCompanyName());
memberInfo.setId(payCompanyManagementOld.getMemberId());
memberInfo.setTaxNo(payCompanyManagement.getDutyCode());
memberInfo.setDepositBank(payCompanyManagement.getOpeningBank());
memberInfo.setBankAccount(payCompanyManagement.getBankAccount());
@@ -333,6 +345,7 @@ public class PayCompanyManagementServiceImpl extends ServiceImpl<PayCompanyManag
memberInfo.setInvoicePhone(payCompanyManagement.getCompanyPhone());
AuthenticationUtils.post("/memberInfo/memberInfo/incomingEdit","",memberInfo);
}
try {
// 编辑保存企业前再次校验企业名称是否存在
LambdaQueryWrapper<PayCompanyManagement> queryWrapper = new LambdaQueryWrapper<>();
@@ -407,9 +420,9 @@ public class PayCompanyManagementServiceImpl extends ServiceImpl<PayCompanyManag
queryPayCompanyManagement.eq(PayCompanyManagement::getCompanyName,payCompanyManagement.getCompanyName());
queryPayCompanyManagement.last("limit 1");
List<PayCompanyManagement> listPayCompanyManagement = payCompanyManagementService.list(queryPayCompanyManagement);
String phone = PasswordUtil.encrypt(payContactsManagement.getPhone());
LambdaQueryWrapper<PayContactsManagement> queryPayContactsManagement = new LambdaQueryWrapper<>();
queryPayContactsManagement.eq(PayContactsManagement::getPhone,payContactsManagement.getPhone());
queryPayContactsManagement.eq(PayContactsManagement::getPhone,phone);
queryPayContactsManagement.last("limit 1");
List<PayContactsManagement> listPayContactsManagement = payContactsManagementService.list(queryPayContactsManagement);
@@ -433,8 +446,11 @@ public class PayCompanyManagementServiceImpl extends ServiceImpl<PayCompanyManag
throw new JeroBootException("此用户已在其他企业下");
}
addMeeting(payCompanyManagement);
payContactsManagement.setDelFlag(PayContactsManagementCommon.DEL_FLAG);
payContactsManagement.setCompanyId(payCompanyManagement.getId());
payContactsManagementService.addMeeting(payContactsManagement);
}else{// 编辑
payContactsManagement.setCompanyId(listPayCompanyManagement.get(0).getId());
// 如果存在用户
if(!CollectionUtils.isEmpty(listPayContactsManagement)){
// 企业不同，返回异常
@@ -453,11 +469,11 @@ public class PayCompanyManagementServiceImpl extends ServiceImpl<PayCompanyManag
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);
}
}else{
payContactsManagement.setDelFlag(PayContactsManagementCommon.DEL_FLAG);
payContactsManagementService.addMeeting(payContactsManagement);
}
payCompanyManagement.setId(listPayCompanyManagement.get(0).getId());
jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayContactsManagementServiceImpl.java
+9 -6
View File
@@ -11,6 +11,7 @@ import com.jero.common.system.api.ISysBaseAPI;
import com.jero.common.system.util.JwtUtil;
import com.jero.common.system.vo.LoginUser;
import com.jero.common.util.*;
import com.jero.company.common.PayCompanyManagementCommon;
import com.jero.company.common.PayContactsManagementCommon;
import com.jero.company.entity.MemberInfo;
import com.jero.company.entity.PayCompanyManagement;
@@ -102,7 +103,9 @@ public class PayContactsManagementServiceImpl extends ServiceImpl<PayContactsMan
}catch (Exception e){
log.error("手机号、邮箱加密异常！",e);
}
payContactsManagement.setRoleCode(PayContactsManagementCommon.ROLE_CODE1);
if(StringUtils.isBlank(payContactsManagement.getFlagStatus())){
payContactsManagement.setRoleCode(PayContactsManagementCommon.ROLE_CODE1);
}
save(payContactsManagement);
}
@@ -128,13 +131,13 @@ public class PayContactsManagementServiceImpl extends ServiceImpl<PayContactsMan
throw new JeroBootException("手机号不可修改！");
}
// 企业管理员变更需要同步会员项目
if(Objects.equals(payContactsManagement.getRoleCode(),PayContactsManagementCommon.ROLE_CODE2)
&& StringUtils.isBlank(PayContactsManagementCommon.FLAG_STATUS)){
if(Objects.equals(payContactsManagementOld.getRoleCode(),PayContactsManagementCommon.ROLE_CODE2)
&& StringUtils.isBlank(payContactsManagement.getFlagStatus())){
// 调用会员项目接口
MemberInfo memberInfo = new MemberInfo();
memberInfo.setMemberId(payContactsManagementOld.getMemberId());
memberInfo.setUserName(payContactsManagement.getPhone());
memberInfo.setRealname(payContactsManagement.getName());
memberInfo.setCompanyName(payCompanyManagement.getCompanyName());
memberInfo.setId(payContactsManagementOld.getMemberId());
memberInfo.setLiaisonMan(payContactsManagement.getName());
memberInfo.setEmail(payContactsManagement.getEmail());
memberInfo.setMobile(payContactsManagement.getPhone());
memberInfo.setAddress(payContactsManagement.getContactAddress());