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 18:58:18 +08:00
parent 27eddcf7a8
commit 1d3d05e710
7 changed files with 71 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayCompanyManagementController.java
+4 -3
View File
@@ -25,6 +25,7 @@ import com.jero.common.util.PasswordUtil;
import com.jero.common.util.ValidUtil;
import com.jero.common.util.oConvertUtils;
import com.jero.company.common.PayCompanyManagementCommon;
import com.jero.company.entity.PayCompanyAndContactsManagement;
import com.jero.company.entity.PayCompanyManagement;
import com.jero.company.entity.PayContactsManagement;
import com.jero.company.service.IPayCompanyManagementService;
@@ -878,13 +879,13 @@ public class PayCompanyManagementController extends JeroController<PayCompanyMan
/**
* 会员系统同步数据
*
* @param info 会员系统同步数据
* @param payCompanyAndContactsManagement 会员系统同步数据
* @return
*/
@ApiOperation(value="企业管理-会员系统同步数据", notes="企业管理-会员系统同步数据")
@PostMapping(value = "/saveOrEdit")
public Result<?> saveOrEdit(@RequestParam("info") String info) {
payCompanyManagementService.saveOrEdit(info);
public Result<?> saveOrEdit(@RequestBody PayCompanyAndContactsManagement payCompanyAndContactsManagement) {
payCompanyManagementService.saveOrEdit(payCompanyAndContactsManagement);
return Result.OK("同步成功!");
}
jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java
+16 -8
View File
@@ -19,12 +19,10 @@ import com.jero.common.exception.JeroBootException;
import com.jero.common.system.base.controller.JeroController;
import com.jero.common.system.query.QueryGenerator;
import com.jero.common.system.vo.LoginUser;
import com.jero.common.util.ImportExcelUtil;
import com.jero.common.util.PasswordUtil;
import com.jero.common.util.ValidUtil;
import com.jero.common.util.oConvertUtils;
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;
import com.jero.company.entity.PayContactsManagement;
import com.jero.company.service.IPayCompanyManagementService;
@@ -251,6 +249,19 @@ public class PayContactsManagementController extends JeroController<PayContactsM
if(Objects.isNull(payContactsManagementOld)){
return Result.error("联系人不存在！");
}
// 企业管理员变更需要同步会员项目
if(Objects.equals(payContactsManagement.getRoleCode(),PayContactsManagementCommon.ROLE_CODE2)){
// 调用会员项目接口
MemberInfo memberInfo = new MemberInfo();
memberInfo.setMemberId(payContactsManagementOld.getMemberId());
memberInfo.setUserName(payContactsManagement.getPhone());
memberInfo.setRealname(payContactsManagement.getName());
memberInfo.setEmail(payContactsManagement.getEmail());
memberInfo.setMobile(payContactsManagement.getPhone());
memberInfo.setAddress(payContactsManagement.getContactAddress());
memberInfo.setPostcode(payContactsManagement.getPostalCode());
AuthenticationUtils.post("/memberInfo/memberInfo/incomingEdit","",memberInfo);
}
try {
String phone = PasswordUtil.encrypt(payContactsManagement.getPhone());
// 编辑保存联系人前再次校验手机号是否存在
@@ -289,6 +300,7 @@ public class PayContactsManagementController extends JeroController<PayContactsM
}catch (Exception e){
log.error("手机号、邮箱加密异常！",e);
}
LambdaUpdateWrapper<PayContactsManagement> updatePayContactsManagement = new LambdaUpdateWrapper<>();
updatePayContactsManagement.eq(PayContactsManagement::getId,payContactsManagement.getId());
updatePayContactsManagement.set(PayContactsManagement::getCompanyName,payContactsManagement.getCompanyName());
@@ -302,10 +314,6 @@ public class PayContactsManagementController extends JeroController<PayContactsM
updatePayContactsManagement.set(PayContactsManagement::getPostalCode,payContactsManagement.getPostalCode());
updatePayContactsManagement.set(PayContactsManagement::getRemarks,payContactsManagement.getRemarks());
payContactsManagementService.update(updatePayContactsManagement);
// 企业管理员变更需要同步会员项目
if(Objects.equals(payContactsManagement.getRoleCode(),PayContactsManagementCommon.ROLE_CODE2)){
// todo 调用会员项目接口
}
// payContactsManagementService.updateById(payContactsManagement);
return Result.OK("编辑成功!");
}
jero-boot-incoming-payment/src/main/java/com/jero/company/entity/MemberInfo.java
+15
View File
@@ -16,6 +16,9 @@ import java.io.Serializable;
public class MemberInfo implements Serializable {
private static final long serialVersionUID = 1L;
/**会员企业id*/
@ApiModelProperty(value = "会员企业id")
private String memberId;
/**用户名称*/
@ApiModelProperty(value = "用户名")
private String userName;
@@ -46,4 +49,16 @@ public class MemberInfo implements Serializable {
/**税号*/
@ApiModelProperty(value = "税号")
private String taxNo;
/**开户银行*/
@ApiModelProperty(value = "开户银行")
private String depositBank;
/**入会申请表文件id*/
@ApiModelProperty(value = "银行账户")
private String bankAccount;
/**发票地址*/
@ApiModelProperty(value = "单位地址")
private String invoiceAddress;
/**发票电话*/
@ApiModelProperty(value = "电话号码")
private String invoicePhone;
}
jero-boot-incoming-payment/src/main/java/com/jero/company/entity/PayContactsManagement.java
+3
View File
@@ -38,6 +38,9 @@ public class PayContactsManagement implements Serializable {
@TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty(value = "主键")
private String id;
/**会员企业id*/
@ApiModelProperty(value = "会员企业id")
private String memberId;
/**企业id*/
@ApiModelProperty(value = "企业id")
@Size(max = 32, message = "企业id长度不能大于32个字符")
jero-boot-incoming-payment/src/main/java/com/jero/company/service/IPayCompanyManagementService.java
+2 -1
View File
@@ -2,6 +2,7 @@ package com.jero.company.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.jero.company.entity.PayCompanyAndContactsManagement;
import com.jero.company.entity.PayCompanyManagement;
import java.util.List;
@@ -96,6 +97,6 @@ public interface IPayCompanyManagementService extends IService<PayCompanyManagem
/**
* 会员系统同步数据
*/
void saveOrEdit(String info);
void saveOrEdit(PayCompanyAndContactsManagement payCompanyAndContactsManagement);
}
jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayCompanyManagementServiceImpl.java
+16 -10
View File
@@ -1,5 +1,6 @@
package com.jero.company.service.impl;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
@@ -369,7 +370,12 @@ public class PayCompanyManagementServiceImpl extends ServiceImpl<PayCompanyManag
}
@Override
public void saveOrEdit(String info) {
@Transactional
public void saveOrEdit(PayCompanyAndContactsManagement payCompanyAndContactsManagement) {
if(Objects.isNull(payCompanyAndContactsManagement)){
throw new JeroBootException("数据为空！");
}
String info = JSON.toJSONString(payCompanyAndContactsManagement);
PayCompanyManagement payCompanyManagement = JSONObject.parseObject(info,PayCompanyManagement.class);
PayContactsManagement payContactsManagement = JSONObject.parseObject(info,PayContactsManagement.class);
if(Objects.isNull(payCompanyManagement) || Objects.isNull(payContactsManagement)){
@@ -386,15 +392,15 @@ public class PayCompanyManagementServiceImpl extends ServiceImpl<PayCompanyManag
queryPayContactsManagement.last("limit 1");
List<PayContactsManagement> listPayContactsManagement = payContactsManagementService.list(queryPayContactsManagement);
if(!StringUtils.isBlank(payCompanyManagement.getCompanyPhone())){
payCompanyManagement.setCompanyPhone(PasswordUtil.decrypt(payCompanyManagement.getCompanyPhone()));
}
if (!StringUtils.isBlank(payContactsManagement.getPhone())){
payContactsManagement.setPhone(PasswordUtil.decrypt(payContactsManagement.getPhone()));
}
if (!StringUtils.isBlank(payContactsManagement.getEmail())){
payContactsManagement.setEmail(PasswordUtil.decrypt(payContactsManagement.getEmail()));
}
// if(!StringUtils.isBlank(payCompanyManagement.getCompanyPhone())){
// payCompanyManagement.setCompanyPhone(PasswordUtil.decrypt(payCompanyManagement.getCompanyPhone()));
// }
// if (!StringUtils.isBlank(payContactsManagement.getPhone())){
// payContactsManagement.setPhone(PasswordUtil.decrypt(payContactsManagement.getPhone()));
// }
// if (!StringUtils.isBlank(payContactsManagement.getEmail())){
// payContactsManagement.setEmail(PasswordUtil.decrypt(payContactsManagement.getEmail()));
// }
// 新增
if(CollectionUtils.isEmpty(listPayCompanyManagement)){
jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayContactsManagementServiceImpl.java
+15 -4
View File
@@ -12,6 +12,7 @@ import com.jero.common.system.util.JwtUtil;
import com.jero.common.system.vo.LoginUser;
import com.jero.common.util.*;
import com.jero.company.common.PayContactsManagementCommon;
import com.jero.company.entity.MemberInfo;
import com.jero.company.entity.PayCompanyManagement;
import com.jero.company.entity.PayContactsManagement;
import com.jero.company.mapper.PayContactsManagementMapper;
@@ -126,6 +127,19 @@ public class PayContactsManagementServiceImpl extends ServiceImpl<PayContactsMan
if(!Objects.equals(PasswordUtil.decrypt(payContactsManagementOld.getPhone()),payContactsManagement.getPhone())){
throw new JeroBootException("手机号不可修改！");
}
// 企业管理员变更需要同步会员项目
if(Objects.equals(payContactsManagement.getRoleCode(),PayContactsManagementCommon.ROLE_CODE2)){
// 调用会员项目接口
MemberInfo memberInfo = new MemberInfo();
memberInfo.setMemberId(payContactsManagementOld.getMemberId());
memberInfo.setUserName(payContactsManagement.getPhone());
memberInfo.setRealname(payContactsManagement.getName());
memberInfo.setEmail(payContactsManagement.getEmail());
memberInfo.setMobile(payContactsManagement.getPhone());
memberInfo.setAddress(payContactsManagement.getContactAddress());
memberInfo.setPostcode(payContactsManagement.getPostalCode());
AuthenticationUtils.post("/memberInfo/memberInfo/incomingEdit","",memberInfo);
}
try {
String phone = PasswordUtil.encrypt(payContactsManagement.getPhone());
// 编辑保存联系人前再次校验手机号是否存在
@@ -178,10 +192,7 @@ public class PayContactsManagementServiceImpl extends ServiceImpl<PayContactsMan
updatePayContactsManagement.set(PayContactsManagement::getRemarks,payContactsManagement.getRemarks());
update(updatePayContactsManagement);
// payContactsManagementService.updateById(payContactsManagement);
// 企业管理员变更需要同步会员项目
if(Objects.equals(payContactsManagement.getRoleCode(),PayContactsManagementCommon.ROLE_CODE2)){
// todo 调用会员项目接口
}
}
@Override