From 1cd2570536f5c6f61fe58007ffc6b9f60c6c5599 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Sun, 19 Jul 2020 18:41:50 +0800
Subject: [PATCH] 20200719 代码提交
---
src/main/java/com/xcong/excoin/modules/member/controller/ViewController.java | 10 ++
src/main/java/com/xcong/excoin/modules/member/service/IMemberService.java | 2
src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java | 19 ++++
src/main/java/com/xcong/excoin/modules/member/controller/MemberController.java | 9 ++
src/main/java/com/xcong/excoin/modules/member/mapper/MemberCoinWithdrawMapper.java | 3
src/main/resources/mapper/modules/MemberCoinWithdrawMapper.xml | 22 +++++
src/main/resources/templates/febs/views/modules/member/withdrawCoinAlone.html | 152 ++++++++++++++++++++++++++++++++++++++
7 files changed, 217 insertions(+), 0 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 7ce46dd..0183f64 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
@@ -160,6 +160,15 @@
}
/**
+ * 提币记录---列表alone
+ */
+ @GetMapping("memberWithdrawCoinAlone")
+ public FebsResponse memberWithdrawCoinAlone(MemberCoinWithdrawEntity memberCoinWithdrawEntity, QueryRequest request) {
+ Map<String, Object> data = getDataTable(memberService.findMemberWithdrawCoinAloneInPage(memberCoinWithdrawEntity, request));
+ return new FebsResponse().success().data(data);
+ }
+
+ /**
* 提币记录---确认
* @return
*/
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 2613434..6c47a0a 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
@@ -151,6 +151,16 @@
}
/**
+ * 提币记录---alone
+ * @return
+ */
+ @GetMapping("withdrawCoinAlone")
+ @RequiresPermissions("withdrawCoinAlone:view")
+ public String withdrawCoinAlone() {
+ return FebsUtil.view("modules/member/withdrawCoinAlone");
+ }
+
+ /**
* 提币记录
* @return
*/
diff --git a/src/main/java/com/xcong/excoin/modules/member/mapper/MemberCoinWithdrawMapper.java b/src/main/java/com/xcong/excoin/modules/member/mapper/MemberCoinWithdrawMapper.java
index 798e8b6..f1488f8 100644
--- a/src/main/java/com/xcong/excoin/modules/member/mapper/MemberCoinWithdrawMapper.java
+++ b/src/main/java/com/xcong/excoin/modules/member/mapper/MemberCoinWithdrawMapper.java
@@ -15,4 +15,7 @@
String selectTBByMemberId(@Param("memberId")String memberId);
+ IPage<MemberCoinWithdrawVo> findMemberWithdrawCoinAloneInPage(Page<MemberCoinWithdrawEntity> page,
+ @Param("record")MemberCoinWithdrawEntity memberCoinWithdrawEntity);
+
}
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 656340b..862bea0 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
@@ -70,4 +70,6 @@
IPage<MemberCoinChargeVo> findmemberApplyCoinAloneInPage(MemberCoinChargeEntity memberCoinChargeEntity, QueryRequest request);
+ IPage<MemberCoinWithdrawVo> findMemberWithdrawCoinAloneInPage(MemberCoinWithdrawEntity memberCoinWithdrawEntity, 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 f1ab101..8601a1f 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
@@ -772,4 +772,23 @@
return findmemberQuickBuySaleListInPage;
}
+
+ @Override
+ public IPage<MemberCoinWithdrawVo> findMemberWithdrawCoinAloneInPage(
+ MemberCoinWithdrawEntity memberCoinWithdrawEntity, QueryRequest request) {
+ Page<MemberCoinWithdrawEntity> page = new Page<>(request.getPageNum(), request.getPageSize());
+
+ IPage<MemberCoinWithdrawVo> findmemberQuickBuySaleListInPage = memberCoinWithdrawMapper.findMemberWithdrawCoinAloneInPage(page, memberCoinWithdrawEntity);
+ List<MemberCoinWithdrawVo> records = findmemberQuickBuySaleListInPage.getRecords();
+ if(records != null && records.size() > 0) {
+ for(MemberCoinWithdrawVo memberCoinWithdrawVo : records) {
+ BigDecimal amount = memberCoinWithdrawVo.getAmount();
+ BigDecimal feeAmount = memberCoinWithdrawVo.getFeeAmount();
+ BigDecimal subtract = amount.subtract(feeAmount);
+ memberCoinWithdrawVo.setRealAmount(subtract);
+ }
+ }
+ return findmemberQuickBuySaleListInPage;
+ }
+
}
diff --git a/src/main/resources/mapper/modules/MemberCoinWithdrawMapper.xml b/src/main/resources/mapper/modules/MemberCoinWithdrawMapper.xml
index d1df7f6..3fb59a4 100644
--- a/src/main/resources/mapper/modules/MemberCoinWithdrawMapper.xml
+++ b/src/main/resources/mapper/modules/MemberCoinWithdrawMapper.xml
@@ -23,6 +23,28 @@
order by s.create_time desc
</select>
+ <select id="findmemberWithdrawCoinListInPage" resultType="com.xcong.excoin.modules.member.vo.MemberCoinWithdrawVo">
+ SELECT
+ *
+ FROM
+ member_coin_withdraw 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))
+ <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.isInside!=null and record.isInside!=''">
+ and s.is_inside= #{record.isInside}
+ </if>
+ <if test="record.status!=null and record.status!=''">
+ and s.status= #{record.status}
+ </if>
+ </if>
+ </where>
+ order by s.create_time desc
+ </select>
+
<select id="selectTBByMemberId" resultType="java.lang.String">
select IFNULL(sum(amount),'0') from member_coin_withdraw where member_id = #{memberId} and status = 2 and is_inside = 'N'
</select>
diff --git a/src/main/resources/templates/febs/views/modules/member/withdrawCoinAlone.html b/src/main/resources/templates/febs/views/modules/member/withdrawCoinAlone.html
new file mode 100644
index 0000000..a15ad27
--- /dev/null
+++ b/src/main/resources/templates/febs/views/modules/member/withdrawCoinAlone.html
@@ -0,0 +1,152 @@
+<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">
+ <label class="layui-form-label layui-form-label-sm">状态</label>
+ <div class="layui-input-inline">
+ <select name="statusOption">
+ <option value="0"></option>
+ <option value="1">等待审核</option>
+ <option value="2">同意</option>
+ <option value="3">拒绝</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">
+ <option value=""></option>
+ <option value="Y">是</option>
+ <option value="N">否</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>
+<!-- 表格操作栏 start -->
+<script type="text/html" id="user-option">
+ <span shiro:lacksPermission="user:view,user:update,user:delete">
+ <span class="layui-badge-dot febs-bg-orange"></span> 无权限
+ </span>
+ <a lay-event="confirm" shiro:hasPermission="user:delete">确认</a>
+ <i class="layui-icon febs-edit-area febs-blue"></i>
+ <a lay-event="cancel" shiro:hasPermission="user:delete">拒绝</a>
+</script>
+<!-- 表格操作栏 end -->
+<script data-th-inline="none" type="text/javascript">
+ // 引入组件并初始化
+ layui.use(['jquery', 'laydate', 'form', 'table', 'febs'], function () {
+ var $ = layui.jquery,
+ laydate = layui.laydate,
+ febs = layui.febs,
+ form = layui.form,
+ table = layui.table,
+ $view = $('#febs-user'),
+ $query = $view.find('#query'),
+ $reset = $view.find('#reset'),
+ $searchForm = $view.find('form'),
+ sortObject = {field: 'createTime', type: null},
+ tableIns;
+
+ form.render();
+
+ // 表格初始化
+ initTable();
+
+ // 初始化表格操作栏各个按钮功能
+ table.on('tool(userTable)', function (obj) {
+ $query.click();
+ var data = obj.data,
+ layEvent = obj.event;
+ });
+
+ // 查询按钮
+ $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}, initSort: sortObject});
+ });
+
+ function initTable() {
+ tableIns = febs.table.init({
+ elem: $view.find('table'),
+ id: 'userTable',
+ url: ctx + 'member/memberWithdrawCoinAlone',
+ totalRow: true,
+ cols: [[
+ {field: 'phone', title: '手机号码', minWidth: 120,align:'left',totalRowText: '合计'},
+ {field: 'email', title: '邮箱', minWidth: 200,align:'left'},
+ {field: 'inviteId', title: '邀请码UID', minWidth: 80,align:'center'},
+ {field: 'symbol', title: '币种', minWidth: 100,align:'center'},
+ {field: 'amount', title: '提币数量', minWidth: 120,align:'center' ,totalRow: true},
+ {field: 'address', title: '提币地址', minWidth: 300,align:'center'},
+ {field: 'feeAmount', title: '提币手续费', minWidth: 100,align:'center', totalRow: true},
+ {field: 'createTime', title: '提币时间', minWidth: 180,align:'center'},
+ {field: 'isInside', title: '内部转账',
+ templet: function (d) {
+ if (d.isInside === 'Y') {
+ 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:blue;"> 等待审核 </span>'
+ } else if (d.status === 2) {
+ return '<span style="color:green;">同意 </span>'
+ } else {
+ return '<span style="color:red;">拒绝</span>'
+ }
+ },minWidth: 100,align:'center'}
+ ]]
+ });
+ }
+
+ // 获取查询参数
+ function getQueryParams() {
+ return {
+ account: $searchForm.find('input[name="account"]').val().trim(),
+ status: $searchForm.find("select[name='statusOption']").val(),
+ isInside: $searchForm.find("select[name='isInsideOption']").val()
+ };
+ }
+
+ })
+</script>
\ No newline at end of file
--
Gitblit v1.9.1