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:32:48 +08:00
parent a55c03f427
commit 659d77e0a3
7 changed files with 31 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/company/common/PayCompanyManagementCommon.java
+4
View File
@@ -29,5 +29,9 @@ public class PayCompanyManagementCommon {
* 企业角色1:普通企业、2：会员企业
*/
public final static String ROLE_CODE2 = "2";
/**
* 是否需要同步会员系统 1：为是，其他为否
*/
public final static String FLAG_STATUS = "1";
}
jero-boot-incoming-payment/src/main/java/com/jero/company/common/PayContactsManagementCommon.java
+6
View File
@@ -17,4 +17,10 @@ public class PayContactsManagementCommon {
* 企业用户角色1:企业联系人、2：企业管理员
*/
public final static String ROLE_CODE2 = "2";
/**
* 是否需要同步会员系统 1：为是，其他为否
*/
public final static String FLAG_STATUS = "1";
}
jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java
+2 -1
View File
@@ -250,7 +250,8 @@ public class PayContactsManagementController extends JeroController<PayContactsM
return Result.error("联系人不存在！");
}
// 企业管理员变更需要同步会员项目
if(Objects.equals(payContactsManagement.getRoleCode(),PayContactsManagementCommon.ROLE_CODE2)){
if(Objects.equals(payContactsManagement.getRoleCode(),PayContactsManagementCommon.ROLE_CODE2)
&& StringUtils.isBlank(PayContactsManagementCommon.FLAG_STATUS)){
// 调用会员项目接口
MemberInfo memberInfo = new MemberInfo();
memberInfo.setMemberId(payContactsManagementOld.getMemberId());
jero-boot-incoming-payment/src/main/java/com/jero/company/entity/PayCompanyManagement.java
+6
View File
@@ -3,6 +3,7 @@ package com.jero.company.entity;
import java.io.Serializable;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.jero.common.aspect.annotation.Dict;
@@ -128,4 +129,9 @@ public class PayCompanyManagement implements Serializable {
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "更新时间")
private Date updateTime;
/**
* 是否需要同步会员系统 1：为是，其他为否
*/
@TableField(exist = false)
private String flagStatus;
}
jero-boot-incoming-payment/src/main/java/com/jero/company/entity/PayContactsManagement.java
+5
View File
@@ -139,4 +139,9 @@ public class PayContactsManagement implements Serializable {
@ApiModelProperty(value = "审核状态（1：通过，2：待审核）")
@TableField(exist = false)
private Integer status;
/**
* 是否需要同步会员系统 1：为是，其他为否
*/
@TableField(exist = false)
private String flagStatus;
}
jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayCompanyManagementServiceImpl.java
+6 -3
View File
@@ -247,7 +247,8 @@ public class PayCompanyManagementServiceImpl extends ServiceImpl<PayCompanyManag
throw new JeroBootException("企业名称不可修改!");
}
// 会员企业编辑同步会员系统
if(Objects.equals(payCompanyManagementOld.getRoleCode(),PayCompanyManagementCommon.ROLE_CODE2)){
if(Objects.equals(payCompanyManagementOld.getRoleCode(),PayCompanyManagementCommon.ROLE_CODE2)
&& StringUtils.isBlank(PayCompanyManagementCommon.FLAG_STATUS)){
// 调用会员项目接口
MemberInfo memberInfo = new MemberInfo();
memberInfo.setMemberId(payCompanyManagementOld.getMemberId());
@@ -320,7 +321,8 @@ public class PayCompanyManagementServiceImpl extends ServiceImpl<PayCompanyManag
throw new JeroBootException("企业不存在!");
}
// 会员企业编辑同步会员系统
if(Objects.equals(payCompanyManagementOld.getRoleCode(),PayCompanyManagementCommon.ROLE_CODE2)){
if(Objects.equals(payCompanyManagementOld.getRoleCode(),PayCompanyManagementCommon.ROLE_CODE2)
&& StringUtils.isBlank(PayCompanyManagementCommon.FLAG_STATUS)){
// 调用会员项目接口
MemberInfo memberInfo = new MemberInfo();
memberInfo.setMemberId(payCompanyManagementOld.getMemberId());
@@ -420,7 +422,8 @@ public class PayCompanyManagementServiceImpl extends ServiceImpl<PayCompanyManag
// if (!StringUtils.isBlank(payContactsManagement.getEmail())){
// payContactsManagement.setEmail(PasswordUtil.decrypt(payContactsManagement.getEmail()));
// }
payCompanyManagement.setFlagStatus(PayCompanyManagementCommon.FLAG_STATUS);
payContactsManagement.setFlagStatus(PayContactsManagementCommon.FLAG_STATUS);
payCompanyManagement.setRoleCode(PayCompanyManagementCommon.ROLE_CODE2);
payContactsManagement.setRoleCode(PayContactsManagementCommon.ROLE_CODE2);
// 新增
jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayContactsManagementServiceImpl.java
+2 -1
View File
@@ -128,7 +128,8 @@ public class PayContactsManagementServiceImpl extends ServiceImpl<PayContactsMan
throw new JeroBootException("手机号不可修改！");
}
// 企业管理员变更需要同步会员项目
if(Objects.equals(payContactsManagement.getRoleCode(),PayContactsManagementCommon.ROLE_CODE2)){
if(Objects.equals(payContactsManagement.getRoleCode(),PayContactsManagementCommon.ROLE_CODE2)
&& StringUtils.isBlank(PayContactsManagementCommon.FLAG_STATUS)){
// 调用会员项目接口
MemberInfo memberInfo = new MemberInfo();
memberInfo.setMemberId(payContactsManagementOld.getMemberId());