From c69f78fa82c93d958171e9c550a031bdf1dc1c98 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 21 Jul 2020 13:14:47 +0800
Subject: [PATCH] 20200721 代码提交
---
src/main/java/com/xcong/excoin/modules/member/entity/MemberCoinChargeEntity.java | 6 ++++++
src/main/resources/mapper/modules/MemberCoinChargeMapper.xml | 5 ++++-
src/main/java/com/xcong/excoin/modules/member/vo/MemberCoinChargeVo.java | 2 ++
src/main/resources/templates/febs/views/modules/member/applyCoinAlone.html | 19 +++++++++++++++++++
4 files changed, 31 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/member/entity/MemberCoinChargeEntity.java b/src/main/java/com/xcong/excoin/modules/member/entity/MemberCoinChargeEntity.java
index 8e72ecc..bdb624a 100644
--- a/src/main/java/com/xcong/excoin/modules/member/entity/MemberCoinChargeEntity.java
+++ b/src/main/java/com/xcong/excoin/modules/member/entity/MemberCoinChargeEntity.java
@@ -61,5 +61,11 @@
*/
@TableField(exist = false)
private String account;
+
+ /**
+ * 查询条件：账号类型
+ */
+ @TableField(exist = false)
+ private String isTest;
}
diff --git a/src/main/java/com/xcong/excoin/modules/member/vo/MemberCoinChargeVo.java b/src/main/java/com/xcong/excoin/modules/member/vo/MemberCoinChargeVo.java
index db67597..ef7b485 100644
--- a/src/main/java/com/xcong/excoin/modules/member/vo/MemberCoinChargeVo.java
+++ b/src/main/java/com/xcong/excoin/modules/member/vo/MemberCoinChargeVo.java
@@ -68,5 +68,7 @@
* 真实姓名
*/
private String realName;
+
+ private int accountType;
}
diff --git a/src/main/resources/mapper/modules/MemberCoinChargeMapper.xml b/src/main/resources/mapper/modules/MemberCoinChargeMapper.xml
index 3df87e0..27c074a 100644
--- a/src/main/resources/mapper/modules/MemberCoinChargeMapper.xml
+++ b/src/main/resources/mapper/modules/MemberCoinChargeMapper.xml
@@ -20,7 +20,7 @@
<select id="findmemberApplyCoinAloneInPage" resultType="com.xcong.excoin.modules.member.vo.MemberCoinChargeVo">
select * from member_coin_charge s left join member m on m.id = s.member_id
<where>
- s.member_id in (select id from member where FIND_IN_SET('22015141', referer_ids))
+ (s.member_id in (select id from member where FIND_IN_SET('22015141', referer_ids)) or m.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})
@@ -28,6 +28,9 @@
<if test="record.address!=null and record.address!=''">
and s.address=#{record.address}
</if>
+ <if test="record.isTest!=null and record.isTest!=''">
+ and m.account_type= #{record.isTest}
+ </if>
</if>
</where>
order by s.create_time desc
diff --git a/src/main/resources/templates/febs/views/modules/member/applyCoinAlone.html b/src/main/resources/templates/febs/views/modules/member/applyCoinAlone.html
index f586d09..83bc665 100644
--- a/src/main/resources/templates/febs/views/modules/member/applyCoinAlone.html
+++ b/src/main/resources/templates/febs/views/modules/member/applyCoinAlone.html
@@ -17,6 +17,16 @@
<input type="text" placeholder="充币地址" name="address" autocomplete="off" class="layui-input">
</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">
@@ -98,6 +108,14 @@
{field: 'lastAmount', title: '本次余额', minWidth: 100,align:'center'},
{field: 'address', title: '平台钱包地址', minWidth: 280,align:'center'},
{field: 'createTime', title: '创建时间', minWidth: 200,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: 'status', title: '状态',
templet: function (d) {
if (d.status === 1) {
@@ -115,6 +133,7 @@
return {
account: $searchForm.find('input[name="account"]').val().trim(),
address: $searchForm.find('input[name="address"]').val().trim(),
+ isTest: $searchForm.find("select[name='isTest']").val()
};
}
--
Gitblit v1.9.1