记得上下班打卡 | git大法好，push需谨慎

Skip to content

L
liquidnet-bus-v1
Commit 66f3d2d0 authored by GaoHu's avatar GaoHu
Browse files
Options

审核通过代理修改

parent 021b574d
Show whitespace changes
Inline Side-by-side
Showing with 43 additions and 29 deletions
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/dto/SmileUserCheckVo.java
View file @ 66f3d2d0
......@@ -3,6 +3,8 @@ package com.liquidnet.client.admin.zhengzai.smile.dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotNull;
/**
* <p>
*
......@@ -28,12 +30,14 @@ public class SmileUserCheckVo {
* 用户id
*/
@ApiModelProperty(value = "用户uid", example = "")
@NotNull(message = "用户uid不能为空")
private String uid;
/**
* 代理类型（1：总代，2：普代,4：驳回审核）
*/
@ApiModelProperty(value = "代理类型（1：总代，2：普代,4：驳回审核）", example = "")
@NotNull(message = "代理类型不能为空")
private Integer type;
/**
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/service/impl/SmileUserServiceImpl.java
View file @ 66f3d2d0
......@@ -72,14 +72,14 @@ public class SmileUserServiceImpl extends ServiceImpl<SmileUserMapper, SmileUser
//从redis获取学校名称
String schoolName = (String) smileRedisUtils.get(SmileRedisConst.SMILE_SCHOOL.concat(":").concat(schoolId));
if (StringUtils.isEmpty(schoolName)){
if (StringUtils.isEmpty(schoolName)) {
//查询数据库
LambdaQueryWrapper<SmileSchool> queryWrapper = Wrappers.lambdaQuery(SmileSchool.class);
queryWrapper.eq(SmileSchool::getId, schoolId);
SmileSchool smileSchool = smileSchoolMapper.selectOne(queryWrapper);
schoolName = smileSchool.getName();
//缓存redis中
smileRedisUtils.set(SmileRedisConst.SMILE_SCHOOL.concat(":").concat(schoolId),smileSchool.getName());
smileRedisUtils.set(SmileRedisConst.SMILE_SCHOOL.concat(":").concat(schoolId), smileSchool.getName());
}
return schoolName;
}
......@@ -134,7 +134,7 @@ public class SmileUserServiceImpl extends ServiceImpl<SmileUserMapper, SmileUser
SmileUserVO smileUserVO = getSmileUserVOFromRedis(uid);
//修改黑名单
smileUserMapper.updateUserStateById(uid, state);
updateRedisSetUser(smileUserVO,uid,state);
updateRedisSetUser(smileUserVO, uid, state);
return AjaxResult.success();
}
......@@ -160,7 +160,7 @@ public class SmileUserServiceImpl extends ServiceImpl<SmileUserMapper, SmileUser
if (smileUserCheckVo.getType().equals(4)) {
//申请被驳回
smileUserMapper.updateUserCheckByUid(smileUserCheckVo.getUid(), smileUserCheckVo.getType(), smileUserCheckVo.getReason());
updateRedisSetUser(smileUserVO,smileUserCheckVo.getUid(),smileUserCheckVo.getReason());
updateRedisSetUser(smileUserVO, smileUserCheckVo.getUid(), smileUserCheckVo.getReason());
} else {
//查询代理信息 查询组织是否有总代 没有则设置 有则返回异常
LambdaQueryWrapper<SmileOrganization> orgQueryWrapper = Wrappers.lambdaQuery(SmileOrganization.class);
......@@ -169,29 +169,39 @@ public class SmileUserServiceImpl extends ServiceImpl<SmileUserMapper, SmileUser
SmileOrganization smileOrganization = smileOrganizationMapper.selectOne(orgQueryWrapper);
//通过审核
//判断是否是总代
if (smileOrganization != null && smileUserCheckVo.getType().equals(1)) {
if (smileOrganization != null && !StringUtils.isEmpty(smileUserCheckVo.getUid())) {
if (smileUserCheckVo.getType().equals(1)) {
//总代
if (smileOrganization != null && StringUtils.isEmpty(smileOrganization.getAgentId())) {
//没有总代 修改代理
smileOrganization.setUpdatedDate(LocalDateTime.now());
smileOrganization.setAgentId(smileUserCheckVo.getUid());
smileOrganizationMapper.updateById(smileOrganization);
userCheck(smileUserCheckVo, smileUserVO, smileOrganization);
return AjaxResult.success();
} else {
//有总代
return AjaxResult.warn("该分组已经存在总代身份");
}
}else {
return AjaxResult.warn("组织不存在");
}
if (smileUserCheckVo.getType().equals(2)) {
//普代添加
userCheck(smileUserCheckVo, smileUserVO, smileOrganization);
return AjaxResult.success();
}
}
}
return AjaxResult.warn("参数错误");
}
private void userCheck(SmileUserCheckVo smileUserCheckVo, SmileUserVO smileUserVO, SmileOrganization smileOrganization) {
//更新redis
updateRedisSetUser(smileUserVO,smileUserCheckVo.getUid(),
updateRedisSetUser(smileUserVO, smileUserCheckVo.getUid(),
smileUserCheckVo.getOrgId(),
smileUserCheckVo.getType(),
StringUtils.isEmpty(smileOrganization.getAgentId())?smileOrganization.getAgentId():smileUserCheckVo.getUid());
StringUtils.isEmpty(smileOrganization.getAgentId()) ? smileOrganization.getAgentId() : smileUserCheckVo.getUid());
//修改user代理 id 开启代理
smileUserMapper.updateUserByUid(smileUserCheckVo.getUid(), smileUserCheckVo.getOrgId(), smileUserCheckVo.getType(),smileOrganization.getAgentId());
}
return AjaxResult.success();
smileUserMapper.updateUserByUid(smileUserCheckVo.getUid(), smileUserCheckVo.getOrgId(), smileUserCheckVo.getType(), smileOrganization.getAgentId());
}
private SmileUserVO getSmileUserVOFromRedis(String uid) {
......@@ -213,7 +223,7 @@ public class SmileUserServiceImpl extends ServiceImpl<SmileUserMapper, SmileUser
}
//更新redis中的用户数据
private void updateRedisSetUser(SmileUserVO smileUserVO,String uid,Long orgId,Integer type,String agentId) {
private void updateRedisSetUser(SmileUserVO smileUserVO, String uid, Long orgId, Integer type, String agentId) {
//组织id
if (StringUtils.isNotNull(orgId)) smileUserVO.setOrgId(orgId);
//代理 代理类型（0：未审核，1：总代，2：普代，3：未认证）
......@@ -229,13 +239,13 @@ public class SmileUserServiceImpl extends ServiceImpl<SmileUserMapper, SmileUser
}
//跟新redis中的用户 0：正常，1：黑名单
private void updateRedisSetUser(SmileUserVO smileUserVO,String uid,Integer state){
private void updateRedisSetUser(SmileUserVO smileUserVO, String uid, Integer state) {
SmileUserVO smileUserVO1 = (SmileUserVO) smileRedisUtils.get(SmileRedisConst.SMILE_USER + uid);
if (StringUtils.isNotNull(smileUserVO1)){
if (StringUtils.isNotNull(smileUserVO1)) {
smileUserVO1.setState(state);
//存入redis中
smileRedisUtils.set(SmileRedisConst.SMILE_USER + uid, smileUserVO1);
}else {
} else {
//状态 0：正常，1：黑名单
if (StringUtils.isNotNull(state)) smileUserVO.setState(state);
//存入redis中
......@@ -245,7 +255,7 @@ public class SmileUserServiceImpl extends ServiceImpl<SmileUserMapper, SmileUser
}
//审核失败插入原因
private void updateRedisSetUser(SmileUserVO smileUserVO,String uid,String reason){
private void updateRedisSetUser(SmileUserVO smileUserVO, String uid, String reason) {
//审核失败原因
if (StringUtils.isNotNull(reason)) smileUserVO.setErrorReason(reason);
//存入redis中
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment