From b6660fa09a7be7fcf12513b520d6b128ec609a8b Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 24 Jul 2020 15:48:06 +0800
Subject: [PATCH] 20200724 代码提交
---
src/main/resources/templates/febs/views/modules/member/withdrawCoin.html | 25 ++++++++++++++++++-------
src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java | 13 +++++++++++++
src/main/java/com/xcong/excoin/modules/member/vo/MemberCoinWithdrawVo.java | 2 +-
3 files changed, 32 insertions(+), 8 deletions(-)
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 aef4b35..2a876e1 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
@@ -408,6 +408,19 @@
List<MemberCoinWithdrawVo> records = findmemberQuickBuySaleListInPage.getRecords();
if(records != null && records.size() > 0) {
for(MemberCoinWithdrawVo memberCoinWithdrawVo : records) {
+
+ Long memberId = memberCoinWithdrawVo.getMemberId();
+ Map<String, Object> columnMap = new HashMap<>();
+ columnMap.put("member_id", memberId);
+ List<MemberAuthenticationEntity> selectByMap = memberAuthenticationMapper.selectByMap(columnMap );
+ if(selectByMap != null && selectByMap.size() > 0) {
+ MemberAuthenticationEntity memberAuthenticationEntity = selectByMap.get(0);
+ String firstName = memberAuthenticationEntity.getFirstName();
+ String secondName = memberAuthenticationEntity.getSecondName();
+ String realName = firstName + secondName;
+ memberCoinWithdrawVo.setRealName(realName);
+ }
+
BigDecimal amount = memberCoinWithdrawVo.getAmount();
BigDecimal feeAmount = memberCoinWithdrawVo.getFeeAmount();
BigDecimal subtract = amount.subtract(feeAmount);
diff --git a/src/main/java/com/xcong/excoin/modules/member/vo/MemberCoinWithdrawVo.java b/src/main/java/com/xcong/excoin/modules/member/vo/MemberCoinWithdrawVo.java
index b076ff6..bd62514 100644
--- a/src/main/java/com/xcong/excoin/modules/member/vo/MemberCoinWithdrawVo.java
+++ b/src/main/java/com/xcong/excoin/modules/member/vo/MemberCoinWithdrawVo.java
@@ -67,5 +67,5 @@
private String inviteId;
private int accountType;
-
+
}
diff --git a/src/main/resources/templates/febs/views/modules/member/withdrawCoin.html b/src/main/resources/templates/febs/views/modules/member/withdrawCoin.html
index 28a49fd..1f5adcf 100644
--- a/src/main/resources/templates/febs/views/modules/member/withdrawCoin.html
+++ b/src/main/resources/templates/febs/views/modules/member/withdrawCoin.html
@@ -24,6 +24,16 @@
</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 class="layui-inline">
<label class="layui-form-label layui-form-label-sm">内部转账</label>
<div class="layui-input-inline">
<select name="isInsideOption">
@@ -126,8 +136,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() {
@@ -138,15 +147,16 @@
totalRow: true,
cols: [[
{field: 'phone', title: '手机号码', minWidth: 120,align:'left',totalRowText: '合计'},
+ {field: 'realName', title: '姓名', minWidth: 120,align:'left'},
{field: 'email', title: '邮箱', minWidth: 200,align:'left'},
{field: 'accountType', title: '账号类型',
- templet: function(d) {
- if (d.accountType === 1) {
- return "正常账号";
+ templet: function (d) {
+ if (d.accountType === 2) {
+ return '<span style="color:red;">测试账号</span>'
} else {
- return "测试账号";
+ return '<span style="color:green;">正常账号</span>'
}
- }, minWidth: 200,align:'center'},
+ },minWidth: 100,align:'center'},
{field: 'inviteId', title: '邀请码UID', minWidth: 80,align:'center'},
{field: 'symbol', title: '币种', minWidth: 100,align:'center'},
{field: 'isInside', title: '内部转账',
@@ -192,6 +202,7 @@
return {
account: $searchForm.find('input[name="account"]').val().trim(),
status: $searchForm.find("select[name='statusOption']").val(),
+ isTest: $searchForm.find("select[name='isTest']").val(),
isInside: $searchForm.find("select[name='isInsideOption']").val()
};
}
--
Gitblit v1.9.1