From dc0a33f391e23d4565e0cfd5d77a03784ec8c84d Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 19 Jun 2020 10:44:34 +0800
Subject: [PATCH] add sale list view
---
src/main/java/com/xcong/excoin/modules/contract/controller/CoinController.java | 13 ++
src/main/java/com/xcong/excoin/modules/contract/controller/ViewController.java | 6 +
src/main/java/com/xcong/excoin/modules/contract/mapper/CoinMapper.java | 16 ++++
src/main/java/com/xcong/excoin/modules/contract/service/ICoinService.java | 5 +
src/main/resources/mapper/modules/CoinMapper.xml | 31 +++++++
src/main/java/com/xcong/excoin/modules/contract/service/impl/CoinServiceImpl.java | 6 +
src/main/resources/templates/febs/views/modules/contract/sale-list.html | 156 +++++++++++++++++++++++++++++++++++++++
7 files changed, 231 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/contract/controller/CoinController.java b/src/main/java/com/xcong/excoin/modules/contract/controller/CoinController.java
index 36fbdb2..9d47e3c 100644
--- a/src/main/java/com/xcong/excoin/modules/contract/controller/CoinController.java
+++ b/src/main/java/com/xcong/excoin/modules/contract/controller/CoinController.java
@@ -42,7 +42,16 @@
return new FebsResponse().success().data(data);
}
- public FebsResponse saleList() {
- return null;
+ @GetMapping("saleList")
+ public FebsResponse saleList(CoinVo coinVo, QueryRequest request) {
+ User user = getCurrentUser();
+ if (user.getType().equals(FebsConstant.USER_TYPE_ADMIN)) {
+ coinVo.setRefererId(FebsConstant.DEFAULT_REFERER_ID);
+ } else {
+ coinVo.setRefererId(user.getInviteId());
+ }
+
+ Map<String, Object> data = getDataTable(coinService.findSaleList(coinVo, request));
+ return new FebsResponse().success().data(data);
}
}
diff --git a/src/main/java/com/xcong/excoin/modules/contract/controller/ViewController.java b/src/main/java/com/xcong/excoin/modules/contract/controller/ViewController.java
index a3f4062..08688c9 100644
--- a/src/main/java/com/xcong/excoin/modules/contract/controller/ViewController.java
+++ b/src/main/java/com/xcong/excoin/modules/contract/controller/ViewController.java
@@ -26,4 +26,10 @@
public String buyList() {
return FebsUtil.view("modules/contract/buy-list");
}
+
+ @GetMapping("saleList")
+ @RequiresPermissions("sale:view")
+ public String saleList() {
+ return FebsUtil.view("modules/contract/sale-list");
+ }
}
diff --git a/src/main/java/com/xcong/excoin/modules/contract/mapper/CoinMapper.java b/src/main/java/com/xcong/excoin/modules/contract/mapper/CoinMapper.java
index f21a280..e69ea46 100644
--- a/src/main/java/com/xcong/excoin/modules/contract/mapper/CoinMapper.java
+++ b/src/main/java/com/xcong/excoin/modules/contract/mapper/CoinMapper.java
@@ -10,5 +10,21 @@
*/
public interface CoinMapper {
+ /**
+ * 买入/充币记录
+ *
+ * @param coinVo
+ * @param page
+ * @return
+ */
IPage<CoinVo> selectBuyList(@Param("record") CoinVo coinVo, Page<CoinVo> page);
+
+ /**
+ * 提现/提币记录
+ *
+ * @param coinVo
+ * @param page
+ * @return
+ */
+ IPage<CoinVo> selectSaleList(@Param("record") CoinVo coinVo, Page<CoinVo> page);
}
diff --git a/src/main/java/com/xcong/excoin/modules/contract/service/ICoinService.java b/src/main/java/com/xcong/excoin/modules/contract/service/ICoinService.java
index 3d394f5..ef48efd 100644
--- a/src/main/java/com/xcong/excoin/modules/contract/service/ICoinService.java
+++ b/src/main/java/com/xcong/excoin/modules/contract/service/ICoinService.java
@@ -4,7 +4,12 @@
import com.xcong.excoin.common.entity.QueryRequest;
import com.xcong.excoin.modules.contract.vo.CoinVo;
+/**
+ * @author helius
+ */
public interface ICoinService {
IPage<CoinVo> findBuyList(CoinVo coinVo, QueryRequest request);
+
+ IPage<CoinVo> findSaleList(CoinVo coinVo, QueryRequest request);
}
diff --git a/src/main/java/com/xcong/excoin/modules/contract/service/impl/CoinServiceImpl.java b/src/main/java/com/xcong/excoin/modules/contract/service/impl/CoinServiceImpl.java
index e41211f..146a249 100644
--- a/src/main/java/com/xcong/excoin/modules/contract/service/impl/CoinServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/contract/service/impl/CoinServiceImpl.java
@@ -24,4 +24,10 @@
Page<CoinVo> page = new Page<>(request.getPageNum(), request.getPageSize());
return coinMapper.selectBuyList(coinVo, page);
}
+
+ @Override
+ public IPage<CoinVo> findSaleList(CoinVo coinVo, QueryRequest request) {
+ Page<CoinVo> page = new Page<>(request.getPageNum(), request.getPageSize());
+ return coinMapper.selectSaleList(coinVo, page);
+ }
}
diff --git a/src/main/resources/mapper/modules/CoinMapper.xml b/src/main/resources/mapper/modules/CoinMapper.xml
index 4b363a2..b4cc94b 100644
--- a/src/main/resources/mapper/modules/CoinMapper.xml
+++ b/src/main/resources/mapper/modules/CoinMapper.xml
@@ -33,4 +33,35 @@
order by createTime desc
</select>
+ <select id="selectSaleList" resultType="com.xcong.excoin.modules.contract.vo.CoinVo">
+ select * from (
+ select
+ a.invite_id inviteId,
+ a.phone phone,
+ a.email email,
+ b.amount_usdt usdtAmount,
+ null coinAmount,
+ b.order_no orderNo,
+ 'USDT' symbol,
+ b.create_time createTime
+ from member a
+ inner join member_quick_buy_sale b on a.id=b.member_id and b.order_type='S'
+ where find_in_set(#{record.refererId}, a.referer_ids)
+ union
+ select
+ a.invite_id inviteId,
+ a.phone phone,
+ a.email email,
+ null usdtAmount,
+ b.amount coinAmount,
+ '' orderNo,
+ b.symbol symbol,
+ b.create_time createTime
+ from member a
+ inner join member_coin_withdraw b on a.id=b.member_id and b.status=2
+ where find_in_set(#{record.refererId}, a.referer_ids)
+ ) x
+ order by createTime desc
+ </select>
+
</mapper>
\ No newline at end of file
diff --git a/src/main/resources/templates/febs/views/modules/contract/sale-list.html b/src/main/resources/templates/febs/views/modules/contract/sale-list.html
new file mode 100644
index 0000000..0197d7c
--- /dev/null
+++ b/src/main/resources/templates/febs/views/modules/contract/sale-list.html
@@ -0,0 +1,156 @@
+<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">
+ <input type="text" name="createTime" id="user-createTime"
+ 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="accountType">
+ <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="accountStatus">
+ <option value=""></option>
+ <option value="0">禁用</option>
+ <option value="1">正常</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="certifyStatus">
+ <option value=""></option>
+ <option value="0">未通过</option>
+ <option value="1">审核中</option>
+ <option value="2">审核通过</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>
+<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,
+ $view = $('#febs-user'),
+ $query = $view.find('#query'),
+ $reset = $view.find('#reset'),
+ $searchForm = $view.find('form'),
+ sortObject = {field: 'createTime', type: null},
+ tableIns,
+ createTimeFrom,
+ createTimeTo;
+
+ form.render();
+
+ // 表格初始化
+ initTable();
+
+ // 时间组件
+ laydate.render({
+ elem: '#user-createTime',
+ range: true,
+ trigger: 'click'
+ });
+
+ // 查询按钮
+ $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();
+ sortObject.type = 'null';
+ createTimeTo = null;
+ createTimeFrom = null;
+ tableIns.reload({where: getQueryParams(), page: {curr: 1}, initSort: sortObject});
+ });
+
+ function initTable() {
+ tableIns = febs.table.init({
+ elem: $view.find('table'),
+ id: 'userTable',
+ url: ctx + 'coin/saleList',
+ cols: [[
+ {type: 'checkbox'},
+ {field: 'inviteId', title: 'UID', minWidth: 100, align: 'center'},
+ {field: 'symbol', title: '币种', minWidth: 100, align: 'center'},
+ {field: 'phone', title: '手机号', minWidth: 130, align: 'center'},
+ {field: 'email', title: '邮箱', minWidth: 100, align: 'center'},
+ {field: 'usdtAmount', title: '买入USDT', minWidth: 100, align: 'center'},
+ {field: 'coinAmount', title: '充币USDT', minWidth: 100, align: 'center'},
+ {field: 'orderNo', title: '订单编号', minWidth: 150, align: 'center'},
+ {field: 'createTime', title: '交易时间', minWidth: 160, align: 'center'},
+ ]]
+ });
+ }
+
+ // 获取查询参数
+ function getQueryParams() {
+ var createTime = $searchForm.find('input[name="createTime"]').val();
+ if (createTime) {
+ createTimeFrom = createTime.split(' - ')[0];
+ createTimeTo = createTime.split(' - ')[1];
+ }
+ return {
+ startTime: createTimeFrom,
+ endTime: createTimeTo,
+ account: $searchForm.find('input[name="account"]').val().trim(),
+ accountStatus: $searchForm.find("select[name='accountStatus']").val(),
+ accountType: $searchForm.find("select[name='accountType']").val(),
+ certifyStatus: $searchForm.find("select[name='certifyStatus']").val(),
+ invalidate_ie_cache: new Date()
+ };
+ }
+ })
+</script>
\ No newline at end of file
--
Gitblit v1.9.1