From 205063364d593940daf332ac5bdd5ebed0e57bc0 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 21 Jul 2020 16:21:38 +0800
Subject: [PATCH] 20200721 代码提交
---
src/main/java/com/xcong/excoin/modules/member/entity/MemberEntity.java | 8 ++++++++
src/main/resources/templates/febs/views/modules/member/memberAlone.html | 26 +++++++++++++++++++++-----
src/main/resources/mapper/modules/MemberMapper.xml | 15 +++------------
3 files changed, 32 insertions(+), 17 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 5e3ea1c..8a8f337 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
@@ -144,8 +144,10 @@
* 是否设置预估强平价系数 0-否1-是
*/
private Integer isForce;
+
@TableField(exist = false)
private String account;
+
@TableField(exist = false)
private String firstName;
@@ -165,4 +167,10 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@TableField(exist = false)
private Date endTime;
+
+ /**
+ * 查询条件：账号类型
+ */
+ @TableField(exist = false)
+ private String isTest;
}
diff --git a/src/main/resources/mapper/modules/MemberMapper.xml b/src/main/resources/mapper/modules/MemberMapper.xml
index 752c68c..1062c1a 100644
--- a/src/main/resources/mapper/modules/MemberMapper.xml
+++ b/src/main/resources/mapper/modules/MemberMapper.xml
@@ -40,22 +40,13 @@
member m
LEFT JOIN member_authentication a ON m.id = a.member_id
<where>
- FIND_IN_SET('22015141', m.referer_ids)
+ ( FIND_IN_SET('22015141', m.referer_ids) or m.id = 10)
<if test="record != null" >
- <if test="record.startTime!=null">
- and m.create_time >=#{record.startTime}
- </if>
- <if test="record.endTime!=null">
- and #{record.endTime} >= m.create_time
- </if>
<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.accountStatus!=null">
- and m.account_status = #{record.accountStatus}
- </if>
- <if test="record.accountType != null" >
- and m.account_type = #{record.accountType}
+ <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}
diff --git a/src/main/resources/templates/febs/views/modules/member/memberAlone.html b/src/main/resources/templates/febs/views/modules/member/memberAlone.html
index 2c2dee5..4c9044d 100644
--- a/src/main/resources/templates/febs/views/modules/member/memberAlone.html
+++ b/src/main/resources/templates/febs/views/modules/member/memberAlone.html
@@ -23,6 +23,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">
@@ -52,13 +62,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'),
@@ -88,8 +96,7 @@
// 刷新按钮
$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() {
@@ -113,6 +120,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) {
@@ -136,6 +151,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