From 373f08dd87acf015d0c70356cd6a9ad44e5cc470 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 15 Jun 2020 17:48:46 +0800
Subject: [PATCH] modify
---
src/main/resources/templates/febs/views/modules/agent/agent.html | 2 +-
src/main/java/com/xcong/excoin/modules/agent/service/impl/AgentServiceImpl.java | 16 ++++++++++++----
2 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/agent/service/impl/AgentServiceImpl.java b/src/main/java/com/xcong/excoin/modules/agent/service/impl/AgentServiceImpl.java
index bc8fccd..b07af97 100644
--- a/src/main/java/com/xcong/excoin/modules/agent/service/impl/AgentServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/agent/service/impl/AgentServiceImpl.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.xcong.excoin.common.entity.FebsConstant;
+import com.xcong.excoin.common.entity.FebsResponse;
import com.xcong.excoin.common.entity.QueryRequest;
import com.xcong.excoin.common.exception.FebsException;
import com.xcong.excoin.common.utils.Md5Util;
@@ -131,6 +132,15 @@
@Transactional(rollbackFor = Exception.class)
@Override
public void editAgent(AgentUser agentUser, User user) {
+ if (FebsConstant.USER_TYPE_ADMIN.equals(user.getType())) {
+ user.setInviteId(FebsConstant.DEFAULT_REFERER_ID);
+ }
+
+ AgentFriendRelationEntity agentFriendRelationEntity = agentFriendRelationMapper.selectAgentFriendRelationByUserId(agentUser.getId());
+ if (!user.getInviteId().equals(agentFriendRelationEntity.getRefererId())) {
+ throw new FebsException("不是该用户直接上级，无法修改");
+ }
+
if (!FebsConstant.USER_TYPE_ADMIN.equals(user.getType())) {
AgentFriendRelationEntity friendRelationEntity = agentFriendRelationMapper.selectAgentFriendRelationByUserId(user.getUserId());
if (agentUser.getReturnRatio().compareTo(friendRelationEntity.getReturnRatio()) > 0) {
@@ -144,9 +154,7 @@
editUser.setAgentName(agentUser.getName());
userMapper.updateById(editUser);
- AgentFriendRelationEntity relationEntity = new AgentFriendRelationEntity();
- relationEntity.setUserId(agentUser.getId());
- relationEntity.setReturnRatio(agentUser.getReturnRatio());
- agentFriendRelationMapper.updateByUserId(relationEntity);
+ agentFriendRelationEntity.setReturnRatio(agentUser.getReturnRatio());
+ agentFriendRelationMapper.updateById(agentFriendRelationEntity);
}
}
diff --git a/src/main/resources/templates/febs/views/modules/agent/agent.html b/src/main/resources/templates/febs/views/modules/agent/agent.html
index 32f3d9d..cb809ae 100644
--- a/src/main/resources/templates/febs/views/modules/agent/agent.html
+++ b/src/main/resources/templates/febs/views/modules/agent/agent.html
@@ -248,7 +248,7 @@
{field: 'name', title: '代理姓名', minWidth: 100, align: 'center'},
{field: 'account', title: '代理账号', minWidth: 100, align: 'center'},
{field: 'inviteId', title: '代理UID', minWidth: 100, align: 'center'},
- {field: 'phone', title: '联系方式', minWidth: 130, align: 'center'},
+ {field: 'telphone', title: '联系方式', minWidth: 130, align: 'center'},
// {field: 'email', title: '邮箱', minWidth: 180, align: 'center'},
{field: 'refererId', title: '上级UID', minWidth: 100, align: 'center'},
{title: '是否实名', templet: '#certify-status', minWidth: 100, align: 'center'},
--
Gitblit v1.9.1