From 01d332096c9d0c26313e882109582cf02f5bff06 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 24 Jul 2020 11:01:31 +0800
Subject: [PATCH] 20200724 代码提交
---
src/main/java/com/xcong/excoin/modules/member/entity/MemberAccountMoneyChangeEntity.java | 6 ++++++
src/main/java/com/xcong/excoin/modules/trademanage/service/impl/TradeManageServiceImpl.java | 17 +++++++++++++++++
src/main/resources/templates/febs/views/modules/trademanage/agentReturnInfo.html | 29 +++++++++++++++++++++++------
src/main/resources/mapper/modules/MemberAccountMoneyChangeMapper.xml | 3 +++
4 files changed, 49 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/member/entity/MemberAccountMoneyChangeEntity.java b/src/main/java/com/xcong/excoin/modules/member/entity/MemberAccountMoneyChangeEntity.java
index c10aad7..6eee710 100644
--- a/src/main/java/com/xcong/excoin/modules/member/entity/MemberAccountMoneyChangeEntity.java
+++ b/src/main/java/com/xcong/excoin/modules/member/entity/MemberAccountMoneyChangeEntity.java
@@ -86,4 +86,10 @@
*/
@TableField(exist = false)
private String realName;
+
+ /**
+ * 查询条件：账号类型
+ */
+ @TableField(exist = false)
+ private String isTest;
}
diff --git a/src/main/java/com/xcong/excoin/modules/trademanage/service/impl/TradeManageServiceImpl.java b/src/main/java/com/xcong/excoin/modules/trademanage/service/impl/TradeManageServiceImpl.java
index 728a692..24e4eb0 100644
--- a/src/main/java/com/xcong/excoin/modules/trademanage/service/impl/TradeManageServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/trademanage/service/impl/TradeManageServiceImpl.java
@@ -145,6 +145,23 @@
MemberAccountMoneyChangeEntity memberAccountMoneyChangeEntity, QueryRequest request) {
Page<MemberAccountMoneyChangeEntity> page = new Page<>(request.getPageNum(), request.getPageSize());
IPage<MemberAccountMoneyChangeEntity> findMemberAccountInfoListInPage = memberAccountMoneyChangeMapper.findMemberAccountInfoListInPage(page, memberAccountMoneyChangeEntity);
+
+ List<MemberAccountMoneyChangeEntity> records = findMemberAccountInfoListInPage.getRecords();
+ if(CollUtil.isNotEmpty(records)) {
+ for(MemberAccountMoneyChangeEntity memberAccountMoneyChangeEntitys : records) {
+ Long memberId = memberAccountMoneyChangeEntitys.getMemberId();
+ Map<String, Object> columnMap = new HashMap<>();
+ columnMap.put("member_id", memberId);
+ List<MemberAuthenticationEntity> selectByMap = memberAuthenticationMapper.selectByMap(columnMap );
+ if(CollUtil.isNotEmpty(selectByMap)) {
+ MemberAuthenticationEntity memberAuthenticationEntity = selectByMap.get(0);
+ String firstName = memberAuthenticationEntity.getFirstName();
+ String secondName = memberAuthenticationEntity.getSecondName();
+ String realName = firstName + secondName;
+ memberAccountMoneyChangeEntitys.setRealName(realName);
+ }
+ }
+ }
return findMemberAccountInfoListInPage;
}
diff --git a/src/main/resources/mapper/modules/MemberAccountMoneyChangeMapper.xml b/src/main/resources/mapper/modules/MemberAccountMoneyChangeMapper.xml
index a922e2a..8301cc9 100644
--- a/src/main/resources/mapper/modules/MemberAccountMoneyChangeMapper.xml
+++ b/src/main/resources/mapper/modules/MemberAccountMoneyChangeMapper.xml
@@ -23,6 +23,9 @@
<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>
</where>
ORDER BY s.create_time DESC
diff --git a/src/main/resources/templates/febs/views/modules/trademanage/agentReturnInfo.html b/src/main/resources/templates/febs/views/modules/trademanage/agentReturnInfo.html
index dfc762b..7675759 100644
--- a/src/main/resources/templates/febs/views/modules/trademanage/agentReturnInfo.html
+++ b/src/main/resources/templates/febs/views/modules/trademanage/agentReturnInfo.html
@@ -12,6 +12,16 @@
<input type="text" placeholder="手机号/邮箱/邀请码" name="account" 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">
@@ -33,14 +43,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,
- treeSelect = layui.treeSelect,
- dropdown = layui.dropdown,
$view = $('#febs-user'),
$query = $view.find('#query'),
$reset = $view.find('#reset'),
@@ -62,8 +69,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() {
@@ -74,6 +80,7 @@
totalRow: true,
cols: [[
{field: 'phone', title: '手机号', minWidth: 100,align:'left',totalRowText: '合计'},
+ {field: 'realName', title: '姓名', minWidth: 120,align:'left'},
{field: 'email', title: '邮箱', minWidth: 200,align:'left'},
{field: 'inviteId', title: '邀请码UID', minWidth: 80,align:'center'},
{field: 'symbol', title: '币种', minWidth: 80,align:'center'},
@@ -92,6 +99,15 @@
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: 'type', title: '类型',
templet: function (d) {
if (d.type === 1) {
@@ -112,6 +128,7 @@
function getQueryParams() {
return {
account: $searchForm.find('input[name="account"]').val().trim(),
+ isTest: $searchForm.find("select[name='isTest']").val(),
};
}
--
Gitblit v1.9.1