From ce4f3caa070073e2b42eff32193436ee7d2d949b Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 23 Jul 2020 10:10:21 +0800
Subject: [PATCH] 20200723 代码提交
---
src/main/java/com/xcong/excoin/modules/member/controller/ViewController.java | 11 ++
src/main/resources/templates/febs/views/modules/member/applyCoinAloneTest.html | 141 +++++++++++++++++++++++++++++++++++
src/main/java/com/xcong/excoin/modules/member/service/IMemberService.java | 2
src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java | 25 ++++++
src/main/resources/mapper/modules/MemberCoinChargeMapper.xml | 19 ++++
src/main/java/com/xcong/excoin/modules/member/controller/MemberController.java | 10 ++
src/main/java/com/xcong/excoin/modules/member/mapper/MemberCoinChargeMapper.java | 3
7 files changed, 210 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/member/controller/MemberController.java b/src/main/java/com/xcong/excoin/modules/member/controller/MemberController.java
index f6b01b0..fb647d0 100644
--- a/src/main/java/com/xcong/excoin/modules/member/controller/MemberController.java
+++ b/src/main/java/com/xcong/excoin/modules/member/controller/MemberController.java
@@ -153,6 +153,7 @@
Map<String, Object> data = getDataTable(memberService.findMemberApplyCoinListInPage(memberCoinChargeEntity, request));
return new FebsResponse().success().data(data);
}
+
/**
* 充币记录---列表alone
*/
@@ -163,6 +164,15 @@
}
/**
+ * 充币记录---列表
+ */
+ @GetMapping("memberApplyCoinTest")
+ public FebsResponse memberApplyCoinTest(MemberCoinChargeEntity memberCoinChargeEntity, QueryRequest request) {
+ Map<String, Object> data = getDataTable(memberService.findMemberApplyCoinAloneTestInPage(memberCoinChargeEntity, request));
+ return new FebsResponse().success().data(data);
+ }
+
+ /**
* 提币记录---列表
*/
@GetMapping("memberWithdrawCoin")
diff --git a/src/main/java/com/xcong/excoin/modules/member/controller/ViewController.java b/src/main/java/com/xcong/excoin/modules/member/controller/ViewController.java
index af28cab..076e8cc 100644
--- a/src/main/java/com/xcong/excoin/modules/member/controller/ViewController.java
+++ b/src/main/java/com/xcong/excoin/modules/member/controller/ViewController.java
@@ -168,10 +168,19 @@
* 充币记录---alone
* @return
*/
+ @GetMapping("applyCoinAloneTest")
+ @RequiresPermissions("applyCoinAloneTest:view")
+ public String applyCoinAloneTest() {
+ return FebsUtil.view("modules/member/applyCoinAloneTest");
+ }
+ /**
+ * 充币记录---alone
+ * @return
+ */
@GetMapping("applyCoinAlone")
@RequiresPermissions("applyCoinAlone:view")
public String applyCoinAlone() {
- return FebsUtil.view("modules/member/applyCoinAlone");
+ return FebsUtil.view("modules/member/applyCoinAlone");
}
/**
diff --git a/src/main/java/com/xcong/excoin/modules/member/mapper/MemberCoinChargeMapper.java b/src/main/java/com/xcong/excoin/modules/member/mapper/MemberCoinChargeMapper.java
index 0fd7df4..be0f58b 100644
--- a/src/main/java/com/xcong/excoin/modules/member/mapper/MemberCoinChargeMapper.java
+++ b/src/main/java/com/xcong/excoin/modules/member/mapper/MemberCoinChargeMapper.java
@@ -18,4 +18,7 @@
IPage<MemberCoinChargeVo> findmemberApplyCoinAloneInPage(Page<MemberCoinChargeEntity> page,
@Param("record")MemberCoinChargeEntity memberCoinChargeEntity);
+ IPage<MemberCoinChargeVo> findMemberApplyCoinAloneTestInPage(Page<MemberCoinChargeEntity> page,
+ @Param("record")MemberCoinChargeEntity memberCoinChargeEntity);
+
}
diff --git a/src/main/java/com/xcong/excoin/modules/member/service/IMemberService.java b/src/main/java/com/xcong/excoin/modules/member/service/IMemberService.java
index 5dea151..3b4e815 100644
--- a/src/main/java/com/xcong/excoin/modules/member/service/IMemberService.java
+++ b/src/main/java/com/xcong/excoin/modules/member/service/IMemberService.java
@@ -85,4 +85,6 @@
IPage<MemberCoinWithdrawVo> findMemberWithdrawCoinTestListInPage(MemberCoinWithdrawEntity memberCoinWithdrawEntity,
QueryRequest request);
+ IPage<MemberCoinChargeVo> findMemberApplyCoinAloneTestInPage(MemberCoinChargeEntity memberCoinChargeEntity, QueryRequest request);
+
}
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 e438082..64ea437 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
@@ -1074,4 +1074,29 @@
return findmemberQuickBuySaleListInPage;
}
+
+ @Override
+ public IPage<MemberCoinChargeVo> findMemberApplyCoinAloneTestInPage(MemberCoinChargeEntity memberCoinChargeEntity,
+ QueryRequest request) {
+ Page<MemberCoinChargeEntity> page = new Page<>(request.getPageNum(), request.getPageSize());
+ IPage<MemberCoinChargeVo> findmemberQuickBuySaleListInPage = memberCoinChargeMapper.findMemberApplyCoinAloneTestInPage(page, memberCoinChargeEntity);
+ List<MemberCoinChargeVo> records = findmemberQuickBuySaleListInPage.getRecords();
+ if(records != null && records.size() > 0) {
+ for(MemberCoinChargeVo memberCoinChargeVo : records) {
+ Long memberId = memberCoinChargeVo.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;
+ memberCoinChargeVo.setRealName(realName);
+ }
+ }
+ }
+ return findmemberQuickBuySaleListInPage;
+ }
+
}
diff --git a/src/main/resources/mapper/modules/MemberCoinChargeMapper.xml b/src/main/resources/mapper/modules/MemberCoinChargeMapper.xml
index 27c074a..e590317 100644
--- a/src/main/resources/mapper/modules/MemberCoinChargeMapper.xml
+++ b/src/main/resources/mapper/modules/MemberCoinChargeMapper.xml
@@ -36,6 +36,25 @@
order by s.create_time desc
</select>
+ <select id="findMemberApplyCoinAloneTestInPage" 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 not 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})
+ </if>
+ <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
+ </select>
+
<select id="selectCBByMemberId" resultType="java.lang.String">
select IFNULL(sum(amount),'0') from member_coin_charge where member_id = #{memberId}
</select>
diff --git a/src/main/resources/templates/febs/views/modules/member/applyCoinAloneTest.html b/src/main/resources/templates/febs/views/modules/member/applyCoinAloneTest.html
new file mode 100644
index 0000000..64032fc
--- /dev/null
+++ b/src/main/resources/templates/febs/views/modules/member/applyCoinAloneTest.html
@@ -0,0 +1,141 @@
+<div class="layui-fluid layui-anim febs-anim" id="febs-user" lay-title="充币">
+ <div class="layui-row febs-container">
+ <div class="layui-col-md12">
+ <div class="layui-card">
+ <div class="layui-card-body febs-table-full">
+ <form class="layui-form layui-table-form" lay-filter="user-table-form">
+ <div class="layui-row">
+ <div class="layui-col-md10">
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input type="text" placeholder="手机号/邮箱/邀请码" name="account" autocomplete="off" class="layui-input">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <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">
+ <div class="layui-btn layui-btn-sm layui-btn-primary febs-button-blue-plain table-action" id="query">
+ <i class="layui-icon"></i>
+ </div>
+ <div class="layui-btn layui-btn-sm layui-btn-primary febs-button-green-plain table-action" id="reset">
+ <i class="layui-icon"></i>
+ </div>
+ </div>
+ </div>
+ </form>
+ <table lay-filter="userTable" lay-data="{id: 'userTable'}"></table>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<!-- 表格操作栏 end -->
+<script data-th-inline="none" type="text/javascript">
+ // 引入组件并初始化
+ layui.use(['dropdown', 'jquery', 'laydate', 'form', 'table', 'febs', 'treeSelect'], 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'),
+ $searchForm = $view.find('form'),
+ sortObject = {field: 'createTime', type: null},
+ tableIns;
+
+ form.render();
+
+ // 表格初始化
+ initTable();
+
+ // 下拉框选择器
+ treeSelect.render({
+ elem: $view.find('#dept'),
+ type: 'get',
+ data: ctx + 'dept/select/tree',
+ placeholder: '请选择',
+ search: false
+ });
+
+ // 查询按钮
+ $query.on('click', function () {
+ var params = $.extend(getQueryParams(), {field: sortObject.field, order: sortObject.type});
+ tableIns.reload({where: params, page: {curr: 1}});
+ });
+
+ // 刷新按钮
+ $reset.on('click', function () {
+ $searchForm[0].reset();
+ treeSelect.revokeNode('dept');
+ sortObject.type = 'null';
+ tableIns.reload({where: getQueryParams(), page: {curr: 1}});
+ });
+
+ function initTable() {
+ tableIns = febs.table.init({
+ elem: $view.find('table'),
+ id: 'userTable',
+ url: ctx + 'member/memberApplyCoinTest',
+ totalRow: true,
+ cols: [[
+ {field: 'phone', title: '手机号码', minWidth: 120,align:'left',totalRowText: '合计'},
+ {field: 'email', title: '邮箱', minWidth: 200,align:'left'},
+ {field: 'realName', title: '姓名', minWidth: 120,align:'left'},
+ {field: 'inviteId', title: '邀请码UID', minWidth: 80,align:'center'},
+ {field: 'symbol', title: '币种', minWidth: 60,align:'center'},
+ {field: 'tag', title: 'USDT类型', minWidth: 60,align:'center'},
+ {field: 'amount', title: '充币数量', minWidth: 100,align:'center',totalRow: true},
+ {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) {
+ return '<span style="color:green;">已到账</span>'
+ } else {
+ return ''
+ }
+ }, minWidth: 200,align:'center'},
+ ]]
+ });
+ }
+
+ // 获取查询参数
+ function getQueryParams() {
+ return {
+ account: $searchForm.find('input[name="account"]').val().trim(),
+ address: $searchForm.find('input[name="address"]').val().trim(),
+ isTest: $searchForm.find("select[name='isTest']").val()
+ };
+ }
+
+ })
+</script>
\ No newline at end of file
--
Gitblit v1.9.1