From 7572b8dbd4c41ca9b6437a032da2aa1a0fdd5444 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 17 May 2021 18:18:09 +0800
Subject: [PATCH] 20210517 云顶
---
src/main/java/com/xcong/excoin/modules/member/entity/MemberEntity.java | 4 ++++
src/main/java/com/xcong/excoin/modules/yunding/entity/BasicSettingEntity.java | 2 +-
src/main/resources/templates/febs/views/modules/member/member.html | 1 +
src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java | 8 ++++++++
src/main/java/com/xcong/excoin/modules/yunding/entity/BasicLevelSettingEntity.java | 2 +-
5 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/member/entity/MemberEntity.java b/src/main/java/com/xcong/excoin/modules/member/entity/MemberEntity.java
index eb9dde0..d5771f3 100644
--- a/src/main/java/com/xcong/excoin/modules/member/entity/MemberEntity.java
+++ b/src/main/java/com/xcong/excoin/modules/member/entity/MemberEntity.java
@@ -130,6 +130,10 @@
*/
private Integer agentLevel;
+
+ @TableField(exist = false)
+ private String agentName;
+
/**
* 实名认证状态 0-审核未通过 1-审核通过 2-等待审核
*/
diff --git a/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java b/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java
index a51a67a..6c74a62 100644
--- a/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java
@@ -45,6 +45,8 @@
import com.xcong.excoin.modules.member.vo.MemberQuickBuySaleVo;
import com.xcong.excoin.modules.member.vo.MemberQuickSaleVo;
+import com.xcong.excoin.modules.yunding.entity.BasicLevelSettingEntity;
+import com.xcong.excoin.modules.yunding.mapper.BasicLevelSettingMapper;
import lombok.RequiredArgsConstructor;
import java.math.BigDecimal;
import java.text.DecimalFormat;
@@ -90,6 +92,8 @@
private final MemberAuthenticationMapper memberAuthenticationMapper;
private final AgentFriendRelationMapper agentFriendRelationMapper;
+
+ private final BasicLevelSettingMapper basicLevelSettingMapper;
@Override
public IPage<AgentFriendRelationEntity> findAgentInfoListInPage(AgentFriendRelationEntity agentFriendRelationEntity,
@@ -206,6 +210,10 @@
String firstName = (memberEntitys.getFirstName() == null ? "" : memberEntitys.getFirstName());
String secondName = (memberEntitys.getSecondName() == null ? "" : memberEntitys.getSecondName());
memberEntitys.setRealName(firstName+secondName);
+ if (memberEntitys.getAgentLevel() != null) {
+ BasicLevelSettingEntity agent = basicLevelSettingMapper.selectById(memberEntitys.getAgentLevel().longValue());
+ memberEntitys.setAgentName(agent.getName());
+ }
}
}
return selectMemberListInPage;
diff --git a/src/main/java/com/xcong/excoin/modules/yunding/entity/BasicLevelSettingEntity.java b/src/main/java/com/xcong/excoin/modules/yunding/entity/BasicLevelSettingEntity.java
index 7481017..e31f47f 100644
--- a/src/main/java/com/xcong/excoin/modules/yunding/entity/BasicLevelSettingEntity.java
+++ b/src/main/java/com/xcong/excoin/modules/yunding/entity/BasicLevelSettingEntity.java
@@ -9,7 +9,7 @@
//会员级别设置表
@Data
-@TableName("basic_level_setting")
+@TableName("yd_basic_level_setting")
public class BasicLevelSettingEntity {
private static final long serialVersionUID = 1L;
diff --git a/src/main/java/com/xcong/excoin/modules/yunding/entity/BasicSettingEntity.java b/src/main/java/com/xcong/excoin/modules/yunding/entity/BasicSettingEntity.java
index ae9355f..86e18a6 100644
--- a/src/main/java/com/xcong/excoin/modules/yunding/entity/BasicSettingEntity.java
+++ b/src/main/java/com/xcong/excoin/modules/yunding/entity/BasicSettingEntity.java
@@ -9,7 +9,7 @@
//基础参数设置表
@Data
-@TableName("basic_setting")
+@TableName("yd_basic_setting")
public class BasicSettingEntity {
private static final long serialVersionUID = 1L;
diff --git a/src/main/resources/templates/febs/views/modules/member/member.html b/src/main/resources/templates/febs/views/modules/member/member.html
index 9aeb17c..018d4e0 100644
--- a/src/main/resources/templates/febs/views/modules/member/member.html
+++ b/src/main/resources/templates/febs/views/modules/member/member.html
@@ -177,6 +177,7 @@
//{field: 'realName', title: '姓名', minWidth: 100,align:'left'},
{field: 'inviteId', title: '邀请码UID', minWidth: 80,align:'center'},
{field: 'refererId', title: '上级邀请码UID', minWidth: 80,align:'center'},
+ {field: 'agentName', title: '代理', minWidth: 80,align:'center'},
{field: 'isTrader', title: '状态',
templet: function (d) {
if (d.isTrader === 1) {
--
Gitblit v1.9.1