From d5035b6d201f091e72470744932ecdeb54a5d2be Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 15 Jul 2020 10:06:38 +0800
Subject: [PATCH] 20200715 代码提交
---
src/main/java/com/xcong/excoin/modules/member/entity/MemberEntity.java | 8 +++++++-
src/main/resources/templates/febs/views/modules/member/memberTest.html | 1 +
src/main/resources/templates/febs/views/modules/member/member.html | 1 +
src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java | 11 ++++++++++-
src/main/resources/mapper/modules/MemberMapper.xml | 18 +++++++++++-------
5 files changed, 30 insertions(+), 9 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 03fc7df..6638570 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
@@ -146,7 +146,13 @@
private Integer isForce;
@TableField(exist = false)
- private String account;
+ private String firstName;
+
+ @TableField(exist = false)
+ private String secondName;
+
+ @TableField(exist = false)
+ private String realName;
@TableField(exist = false)
private BigDecimal coinNumber;
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 f3e672d..d486529 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
@@ -181,7 +181,16 @@
@Override
public IPage<MemberEntity> findMemberListInPage(MemberEntity memberEntity, QueryRequest request) {
Page<MemberEntity> page = new Page<>(request.getPageNum(), request.getPageSize());
- return this.baseMapper.selectMemberListInPage(page, memberEntity);
+ IPage<MemberEntity> selectMemberListInPage = this.baseMapper.selectMemberListInPage(page, memberEntity);
+ List<MemberEntity> records = selectMemberListInPage.getRecords();
+ if(records != null && records.size() > 0) {
+ for(MemberEntity memberEntitys : records) {
+ String firstName = memberEntitys.getFirstName();
+ String secondName = memberEntitys.getSecondName();
+ memberEntitys.setRealName(firstName+secondName);
+ }
+ }
+ return selectMemberListInPage;
}
@Override
diff --git a/src/main/resources/mapper/modules/MemberMapper.xml b/src/main/resources/mapper/modules/MemberMapper.xml
index 5038ed9..bdf67a3 100644
--- a/src/main/resources/mapper/modules/MemberMapper.xml
+++ b/src/main/resources/mapper/modules/MemberMapper.xml
@@ -3,26 +3,30 @@
<mapper namespace="com.xcong.excoin.modules.member.mapper.MemberMapper">
<select id="selectMemberListInPage" resultType="com.xcong.excoin.modules.member.entity.MemberEntity">
- select * from member
+ SELECT
+ *
+ FROM
+ member m
+ LEFT JOIN member_authentication a ON m.id = a.member_id
<where>
<if test="record != null" >
<if test="record.startTime!=null">
- and create_time >=#{record.startTime}
+ and m.create_time >=#{record.startTime}
</if>
<if test="record.endTime!=null">
- and #{record.endTime} >= create_time
+ and #{record.endTime} >= m.create_time
</if>
<if test="record.account!=null and record.account!=''">
- and (phone = #{record.account} or email = #{record.account} or invite_id=#{record.account})
+ and (m.phone = #{record.account} or m.email = #{record.account} or m.invite_id=#{record.account})
</if>
<if test="record.accountStatus!=null">
- and account_status = #{record.accountStatus}
+ and m.account_status = #{record.accountStatus}
</if>
<if test="record.accountType != null" >
- and account_type = #{record.accountType}
+ and m.account_type = #{record.accountType}
</if>
<if test="record.certifyStatus != null">
- and certify_status = #{record.certifyStatus}
+ and m.certify_status = #{record.certifyStatus}
</if>
</if>
</where>
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 56ae69f..4d807d3 100644
--- a/src/main/resources/templates/febs/views/modules/member/member.html
+++ b/src/main/resources/templates/febs/views/modules/member/member.html
@@ -128,6 +128,7 @@
cols: [[
{field: 'phone', title: '手机号', minWidth: 100,align:'left'},
{field: 'email', title: '邮箱', minWidth: 200,align:'left'},
+ {field: 'realName', title: '姓名', minWidth: 200,align:'left'},
{field: 'inviteId', title: '邀请码UID', minWidth: 80,align:'center'},
{field: 'refererId', title: '上级邀请码UID', minWidth: 80,align:'center'},
{field: 'accountType', title: '账号类型',
diff --git a/src/main/resources/templates/febs/views/modules/member/memberTest.html b/src/main/resources/templates/febs/views/modules/member/memberTest.html
index f9d32d4..c9ab116 100644
--- a/src/main/resources/templates/febs/views/modules/member/memberTest.html
+++ b/src/main/resources/templates/febs/views/modules/member/memberTest.html
@@ -101,6 +101,7 @@
cols: [[
{field: 'phone', title: '手机号', minWidth: 100,align:'left'},
{field: 'email', title: '邮箱', minWidth: 200,align:'left'},
+ {field: 'realName', title: '姓名', minWidth: 200,align:'left'},
{field: 'inviteId', title: '邀请码UID', minWidth: 80,align:'center'},
{field: 'refererId', title: '上级邀请码UID', minWidth: 80,align:'center'},
{field: 'refererId', title: '账号状态',
--
Gitblit v1.9.1