From 78fae6519d70f30cae9f943037a9896b67cc05a0 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 21 Jul 2020 12:41:16 +0800
Subject: [PATCH] 20200721 代码提交
---
src/main/java/com/xcong/excoin/modules/member/entity/MemberCoinWithdrawEntity.java | 5 +++++
src/main/resources/mapper/modules/MemberCoinWithdrawMapper.xml | 3 +++
src/main/resources/templates/febs/views/modules/member/withdrawCoinAlone.html | 11 +++++++++++
3 files changed, 19 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/member/entity/MemberCoinWithdrawEntity.java b/src/main/java/com/xcong/excoin/modules/member/entity/MemberCoinWithdrawEntity.java
index 0da4e59..f789160 100644
--- a/src/main/java/com/xcong/excoin/modules/member/entity/MemberCoinWithdrawEntity.java
+++ b/src/main/java/com/xcong/excoin/modules/member/entity/MemberCoinWithdrawEntity.java
@@ -63,6 +63,11 @@
*/
@TableField(exist = false)
private String account;
+ /**
+ * 查询条件：是否为测试账号
+ */
+ @TableField(exist = false)
+ private String isTest;
}
diff --git a/src/main/resources/mapper/modules/MemberCoinWithdrawMapper.xml b/src/main/resources/mapper/modules/MemberCoinWithdrawMapper.xml
index 7936b41..2edabbf 100644
--- a/src/main/resources/mapper/modules/MemberCoinWithdrawMapper.xml
+++ b/src/main/resources/mapper/modules/MemberCoinWithdrawMapper.xml
@@ -38,6 +38,9 @@
<if test="record.isInside!=null and record.isInside!=''">
and s.is_inside= #{record.isInside}
</if>
+ <if test="record.isTest!=null and record.isTest!=''">
+ and m.account_type= #{record.isTest}
+ </if>
<if test="record.status!=null and record.status!=''">
and s.status= #{record.status}
</if>
diff --git a/src/main/resources/templates/febs/views/modules/member/withdrawCoinAlone.html b/src/main/resources/templates/febs/views/modules/member/withdrawCoinAlone.html
index 3befb6d..cd9f9e1 100644
--- a/src/main/resources/templates/febs/views/modules/member/withdrawCoinAlone.html
+++ b/src/main/resources/templates/febs/views/modules/member/withdrawCoinAlone.html
@@ -33,6 +33,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">
@@ -146,6 +156,7 @@
account: $searchForm.find('input[name="account"]').val().trim(),
status: $searchForm.find("select[name='statusOption']").val(),
isInside: $searchForm.find("select[name='isInsideOption']").val()
+ isTest: $searchForm.find("select[name='isTest']").val()
};
}
--
Gitblit v1.9.1