From 722652a9069ef59bde0edc7ef81407d4b41b6779 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 22 Jul 2020 11:17:58 +0800
Subject: [PATCH] 20200722 代码提交
---
src/main/resources/templates/febs/views/modules/member/memberTest.html | 28 +++++++++++---
src/main/java/com/xcong/excoin/modules/member/mapper/MemberMapper.java | 2 +
src/main/java/com/xcong/excoin/modules/member/service/IMemberService.java | 2 +
src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java | 16 ++++++++
src/main/java/com/xcong/excoin/modules/member/controller/MemberController.java | 6 +++
src/main/resources/mapper/modules/MemberMapper.xml | 24 ++++++++++++
6 files changed, 72 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/member/controller/MemberController.java b/src/main/java/com/xcong/excoin/modules/member/controller/MemberController.java
index 4a6893c..c03b9d5 100644
--- a/src/main/java/com/xcong/excoin/modules/member/controller/MemberController.java
+++ b/src/main/java/com/xcong/excoin/modules/member/controller/MemberController.java
@@ -65,6 +65,12 @@
return new FebsResponse().success().data(data);
}
+ @GetMapping("getListTest")
+ public FebsResponse getListTest(MemberEntity member, QueryRequest request) {
+ Map<String, Object> data = getDataTable(memberService.findMemberListTestInPage(member, request));
+ return new FebsResponse().success().data(data);
+ }
+
@GetMapping("memberAlone")
public FebsResponse memberAlone(MemberEntity member, QueryRequest request) {
Map<String, Object> data = getDataTable(memberService.findMemberAloneInPage(member, request));
diff --git a/src/main/java/com/xcong/excoin/modules/member/mapper/MemberMapper.java b/src/main/java/com/xcong/excoin/modules/member/mapper/MemberMapper.java
index aa618b5..8c93717 100644
--- a/src/main/java/com/xcong/excoin/modules/member/mapper/MemberMapper.java
+++ b/src/main/java/com/xcong/excoin/modules/member/mapper/MemberMapper.java
@@ -183,5 +183,7 @@
String selectDLZCForBasicAllDataAlone();
IPage<MemberAccountInfoVo> findMemberAccountInfoAloneListInPage(Page<MemberEntity> page, @Param("record")MemberEntity memberEntity);
+
+ IPage<MemberEntity> findMemberListTestInPage(Page<MemberEntity> page, @Param("record")MemberEntity member);
}
diff --git a/src/main/java/com/xcong/excoin/modules/member/service/IMemberService.java b/src/main/java/com/xcong/excoin/modules/member/service/IMemberService.java
index f42a644..c2b1bb4 100644
--- a/src/main/java/com/xcong/excoin/modules/member/service/IMemberService.java
+++ b/src/main/java/com/xcong/excoin/modules/member/service/IMemberService.java
@@ -80,4 +80,6 @@
IPage<MemberDataInfoVo> findMemberDataInfoAllAloneListInPage(MemberEntity memberEntity, QueryRequest request);
+ IPage<MemberEntity> findMemberListTestInPage(MemberEntity member, QueryRequest request);
+
}
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 67faba7..e4d12b1 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
@@ -1027,4 +1027,20 @@
return selectMemberListInPage;
}
+
+ @Override
+ public IPage<MemberEntity> findMemberListTestInPage(MemberEntity member, QueryRequest request) {
+ Page<MemberEntity> page = new Page<>(request.getPageNum(), request.getPageSize());
+ IPage<MemberEntity> selectMemberListInPage = this.baseMapper.findMemberListTestInPage(page, member);
+ List<MemberEntity> records = selectMemberListInPage.getRecords();
+ if(records != null && records.size() > 0) {
+ for(MemberEntity memberEntitys : records) {
+ String firstName = (memberEntitys.getFirstName() == null ? "" : memberEntitys.getFirstName());
+ String secondName = (memberEntitys.getSecondName() == null ? "" : memberEntitys.getSecondName());
+ memberEntitys.setRealName(firstName+secondName);
+ }
+ }
+ return selectMemberListInPage;
+ }
+
}
diff --git a/src/main/resources/mapper/modules/MemberMapper.xml b/src/main/resources/mapper/modules/MemberMapper.xml
index 99f77d7..b217c1d 100644
--- a/src/main/resources/mapper/modules/MemberMapper.xml
+++ b/src/main/resources/mapper/modules/MemberMapper.xml
@@ -56,6 +56,30 @@
order by m.create_time desc
</select>
+ <select id="findMemberListTestInPage" resultType="com.xcong.excoin.modules.member.entity.MemberEntity">
+ SELECT
+ *
+ FROM
+ member m
+ LEFT JOIN member_authentication a ON m.id = a.member_id
+ <where>
+ m.id NOT IN (
+ select id from member where (FIND_IN_SET('22015141', referer_ids) OR id = 10))
+ <if test="record != null" >
+ <if test="record.account!=null and record.account!=''">
+ and (m.phone = #{record.account} or m.email = #{record.account} or m.invite_id=#{record.account})
+ </if>
+ <if test="record.isTest!=null and record.isTest!=''">
+ and m.account_type= #{record.isTest}
+ </if>
+ <if test="record.certifyStatus != null and record.certifyStatus!=''">
+ and m.certify_status = #{record.certifyStatus}
+ </if>
+ </if>
+ </where>
+ order by m.create_time desc
+ </select>
+
<select id="findMemberAccountInfoListInPage" resultType="com.xcong.excoin.modules.trademanage.vo.MemberAccountInfoVo">
SELECT
m.id,
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 c9ab116..6c10196 100644
--- a/src/main/resources/templates/febs/views/modules/member/memberTest.html
+++ b/src/main/resources/templates/febs/views/modules/member/memberTest.html
@@ -24,6 +24,16 @@
</select>
</div>
</div>
+ <div class="layui-inline">
+ <label class="layui-form-label layui-form-label-sm">账号类型</label>
+ <div class="layui-input-inline">
+ <select name="isTest">
+ <option value=""></option>
+ <option value="1">正常账号</option>
+ <option value="2">测试账号</option>
+ </select>
+ </div>
+ </div>
</div>
</div>
<div class="layui-col-md2 layui-col-sm12 layui-col-xs12 table-action-area">
@@ -53,13 +63,11 @@
<!-- 表格操作栏 end -->
<script data-th-inline="none" type="text/javascript">
// 引入组件并初始化
- layui.use(['dropdown', 'jquery', 'laydate', 'form', 'table', 'febs', 'treeSelect'], function () {
+ layui.use([ 'jquery', 'form', 'table', 'febs'], function () {
var $ = layui.jquery,
- laydate = layui.laydate,
febs = layui.febs,
form = layui.form,
table = layui.table,
- dropdown = layui.dropdown,
$view = $('#febs-user'),
$query = $view.find('#query'),
$reset = $view.find('#reset'),
@@ -89,15 +97,14 @@
// 刷新按钮
$reset.on('click', function () {
$searchForm[0].reset();
- sortObject.type = 'null';
- tableIns.reload({where: getQueryParams(), page: {curr: 1}, initSort: sortObject});
+ tableIns.reload({where: getQueryParams(), page: {curr: 1}});
});
function initTable() {
tableIns = febs.table.init({
elem: $view.find('table'),
id: 'userTable',
- url: ctx + 'member/getList',
+ url: ctx + 'member/getListTest',
cols: [[
{field: 'phone', title: '手机号', minWidth: 100,align:'left'},
{field: 'email', title: '邮箱', minWidth: 200,align:'left'},
@@ -114,6 +121,14 @@
return ''
}
}, minWidth: 80,align:'center'},
+ {field: 'accountType', title: '账号类型',
+ templet: function (d) {
+ if (d.accountType === 2) {
+ return '<span style="color:red;">测试账号</span>'
+ } else {
+ return '<span style="color:green;">正常账号</span>'
+ }
+ },minWidth: 100,align:'center'},
{field: 'refererId', title: '审核状态',
templet: function (d) {
if (d.certifyStatus === 0) {
@@ -137,6 +152,7 @@
function getQueryParams() {
return {
account: $searchForm.find('input[name="account"]').val().trim(),
+ isTest: $searchForm.find("select[name='isTest']").val(),
certifyStatus: $searchForm.find("select[name='certifyStatus']").val(),
};
}
--
Gitblit v1.9.1