From 60115f7fce32f7dcefa31e07c05506feb35ea942 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 23 Mar 2021 17:13:34 +0800
Subject: [PATCH] 20210323 后台保留两位小数，（平台数据除外）
---
src/main/resources/templates/febs/views/modules/trademanage/historyOrder.html | 260 +++++++++++++++++++++++++++++++--------------------
1 files changed, 159 insertions(+), 101 deletions(-)
diff --git a/src/main/resources/templates/febs/views/modules/trademanage/historyOrder.html b/src/main/resources/templates/febs/views/modules/trademanage/historyOrder.html
index 7601346..e9b258b 100644
--- a/src/main/resources/templates/febs/views/modules/trademanage/historyOrder.html
+++ b/src/main/resources/templates/febs/views/modules/trademanage/historyOrder.html
@@ -12,6 +12,42 @@
<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="closingType">
+ <option value="0">请选择</option>
+ <option value="2">平多</option>
+ <option value="3">平空</option>
+ <option value="4">爆仓平多</option>
+ <option value="5">爆仓平空</option>
+ <option value="6">止盈平多</option>
+ <option value="7">止盈平空</option>
+ <option value="8">止损平多</option>
+ <option value="9">止损平空</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="contractType">
+ <option value="0">请选择</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="accountType">
+ <option value="0">请选择</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">
@@ -30,69 +66,6 @@
</div>
</div>
</div>
-<script type="text/html" id="tradeType">
- {{#
- var tradeType = {
- 1: {title: '市价' , color: 'green'},
- 2: {title: '限价' , color: 'blue' }
- }[d.tradeType];
- }}
- <span class="layui-badge febs-tag-{{tradeType.color}}">{{ tradeType.title }}</span>
-</script>
-<script type="text/html" id="closingType">
- {{#
- var closingType = {
- 0: {title: '开仓' , color: 'blue'},
- 2: {title: '平多' , color: 'green'},
- 3: {title: '平空' , color: 'red'},
- 4: {title: '爆仓平多' , color: 'red'},
- 5: {title: '爆仓平空' , color: 'red'},
- 6: {title: '止盈平多' , color: 'green'},
- 7: {title: '止盈平空' , color: 'green'},
- 8: {title: '止损平多' , color: 'red'},
- 9: {title: '止损平空' , color: 'red'}
- }[d.closingType];
- }}
- <span class="layui-badge febs-tag-{{closingType.color}}">{{ closingType.title }}</span>
-</script>
-<script type="text/html" id="orderStatus">
- {{#
- var orderStatus = {
- 1: {title: '成交' , color: 'green'},
- 2: {title: '撤单' , color: 'blue' }
- }[d.orderStatus];
- }}
- <span class="layui-badge febs-tag-{{orderStatus.color}}">{{ orderStatus.title }}</span>
-</script>
-<script type="text/html" id="orderType">
- {{#
- var orderType = {
- 1: {title: '开多' , color: 'green'},
- 2: {title: '开空' , color: 'red'},
- 3: {title: '平多' , color: 'green'},
- 4: {title: '平空' , color: 'red' }
- }[d.orderType];
- }}
- <span class="layui-badge febs-tag-{{orderType.color}}">{{ orderType.title }}</span>
-</script>
-<script type="text/html" id="openingType">
- {{#
- var openingType = {
- 1: {title: '开多' , color: 'green'},
- 2: {title: '开空' , color: 'red' }
- }[d.openingType];
- }}
- <span class="layui-badge febs-tag-{{openingType.color}}">{{ openingType.title }}</span>
-</script>
-<script type="text/html" id="isCanClosing">
- {{#
- var openingType = {
- 1: {title: '是' , color: 'green'},
- 0: {title: '否' , color: 'red' }
- }[d.isCanClosing];
- }}
- <span class="layui-badge febs-tag-{{isCanClosing.color}}">{{ isCanClosing.title }}</span>
-</script>
<!-- 表格操作栏 end -->
<script data-th-inline="none" type="text/javascript">
// 引入组件并初始化
@@ -115,18 +88,17 @@
// 表格初始化
initTable();
-
+
// 查询按钮
$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';
- tableIns.reload({where: getQueryParams(), page: {curr: 1}, initSort: sortObject});
+ $searchForm[0].reset();
+ tableIns.reload({where: getQueryParams(), page: {curr: 1}});
});
function initTable() {
@@ -134,17 +106,56 @@
elem: $view.find('table'),
id: 'userTable',
url: ctx + 'tradeManage/historyOrderInfo',
+ totalRow: true,
cols: [[
- {field: 'phone', title: '手机号', minWidth: 100,align:'left'},
- {field: 'email', title: '邮箱', minWidth: 200,align:'left'},
+ {field: 'phone', title: '手机号', minWidth: 120,align:'left',totalRowText: '合计'},
{field: 'inviteId', title: '邀请码UID', minWidth: 120,align:'center'},
- {field: 'orderNo', title: '订单编号', minWidth: 200,align:'center'},
- {title: '交易类型', templet: '#tradeType', minWidth: 120,align:'center'},
- {title: '订单类型', templet: '#orderType', minWidth: 120,align:'center'},
- {title: '订单状态', templet: '#orderStatus', minWidth: 120,align:'center'},
- {title: '平仓类型', templet: '#closingType', minWidth: 120,align:'center'},
- {field: 'rewardAmount', title: '盈亏金额',
+ {field: 'realName', title: '真实姓名', minWidth: 120,align:'center'},
+ {field: 'positionType', title: '开仓类型',
+ templet: function (d) {
+ if (d.positionType === 1) {
+ return '<span style="color:green;">分仓</span>'
+ }else {
+ return '<span style="color:red;">全仓</span>'
+ }
+ }, minWidth: 100,align:'center'},
+ {field: 'contractType', title: '合约类型',
+ templet: function (d) {
+ if (d.contractType === 1) {
+ return '<span style="color:green;">普通合约</span>'
+ }else {
+ return '<span style="color:red;">跟单合约</span>'
+ }
+ }, minWidth: 100,align:'center'},
+ {field: 'symbol', title: '币种', minWidth: 120,align:'center'},
+ {field: 'tradeType', title: '交易类型',
templet: function (d) {
+ if (d.tradeType === 1) {
+ return '<span style="color:green;">市价</span>'
+ }else {
+ return '<span style="color:red;">限价</span>'
+ }
+ }, minWidth: 100,align:'center'},
+ {field: 'symbolCnt', title: '手数', minWidth: 80,align:'center'},
+ {field: 'orderType', title: '订单类型',
+ templet: function (d) {
+ if (d.orderType === 1) {
+ return '<span style="color:green;">开多</span>'
+ }else if (d.orderType === 2) {
+ return '<span style="color:red;">开空</span>'
+ }else if (d.orderType === 3) {
+ return '<span style="color:green;">平多</span>'
+ }else if (d.orderType === 4) {
+ return '<span style="color:red;">平空</span>'
+ }else{
+ return ''
+ }
+ }, minWidth: 100,align:'center'},
+ {field: 'openingPrice', title: '开仓价', minWidth: 100,align:'center'},
+ {field: 'openingTime', title: '开仓时间', minWidth: 200,align:'center'},
+ {field: 'bondAmount', title: '保证金', minWidth: 120,align:'center'},
+ {field: 'rewardAmount', title: '盈亏金额',
+ templet: function (d) {
if (d.rewardAmount > 0) {
return '<span style="color:green;">' + d.rewardAmount + '</span>'
}
@@ -154,34 +165,78 @@
if (d.rewardAmount == 0 || d.rewardAmount == "" || d.rewardAmount == null) {
return '<span></span>'
}
- },minWidth: 120,align:'center'},
- {field: 'openingPrice', title: '开仓价',
- templet: function (d) {
- if (d.closingPrice > 0 || d.closingPrice < 0) {
- return '<span></span>'
- }else{
- return '<span>' + d.openingPrice + '</span>'
- }
- }, minWidth: 150,align:'center'},
- {field: 'closingPrice', title: '平仓价', minWidth: 150,align:'center'},
- {field: 'openingTime', title: '开仓时间', minWidth: 200,align:'center'},
+ },minWidth: 120,align:'center',totalRow: true},
+ {field: 'closingType', title: '平仓类型',
+ templet: function (d) {
+ if (d.closingType === 0) {
+ return '<span style="color:blue;">开仓</span>'
+ }else if (d.closingType === 2) {
+ return '<span style="color:green;">平多</span>'
+ }else if (d.closingType === 3) {
+ return '<span style="color:red;">平空</span>'
+ }else if (d.closingType === 4) {
+ return '<span style="color:red;">爆仓平多</span>'
+ }else if (d.closingType === 5) {
+ return '<span style="color:red;">爆仓平空</span>'
+ }else if (d.closingType === 6) {
+ return '<span style="color:green;">止盈平多</span>'
+ }else if (d.closingType === 7) {
+ return '<span style="color:green;">止盈平空</span>'
+ }else if (d.closingType === 8) {
+ return '<span style="color:red;">止损平多</span>'
+ }else if (d.closingType === 9) {
+ return '<span style="color:red;">止损平空</span>'
+ }else{
+ return ''
+ }
+ }, minWidth: 120,align:'center'},
+ {field: 'closingPrice', title: '平仓价', minWidth: 100,align:'center'},
{field: 'closingTime', title: '平仓时间', minWidth: 200,align:'center'},
- {field: 'entrustOpeningPrice', title: '委托开仓价', minWidth: 150,align:'center'},
- {field: 'entrustTime', title: '委托时间', minWidth: 200,align:'center'},
-
- {field: 'symbol', title: '币种', minWidth: 120,align:'center'},
- {field: 'symbolCnt', title: '手数', minWidth: 80,align:'center'},
- {field: 'symbolSku', title: '币种规格', minWidth: 100,align:'center'},
- {field: 'leverRatio', title: '杠杆倍率', minWidth: 120,align:'center'},
- {field: 'stopLossPrice', title: '止损价', minWidth: 120,align:'center'},
- {field: 'stopProfitPrice', title: '止盈价', minWidth: 120,align:'center'},
- {field: 'rewardRatio', title: '盈亏比例', minWidth: 120,align:'center'},
+ {field: 'openingFeeAmount', title: '开仓手续费', minWidth: 120,align:'center',totalRow: true},
+ {field: 'closingFeeAmount', title: '平仓手续费', minWidth: 100,align:'center',totalRow: true},
+ {field: 'rewardRatio', title: '盈亏比例',
+ templet: function (d) {
+ if (d.rewardRatio > 0) {
+ return '<span style="color:green;">' + parseFloat((d.rewardRatio*100).toFixed(2))+'%' + '</span>'
+ }
+ if (d.rewardRatio < 0) {
+ return '<span style="color:red;">' + parseFloat((d.rewardRatio*100).toFixed(2))+'%' + '</span>'
+ }
+ if (d.rewardRatio == 0 || d.rewardRatio == "" || d.rewardRatio == null) {
+ return '<span></span>'
+ }
+ }, minWidth: 120,align:'center'},
+ {field: 'accountType', title: '账号类型',
+ templet: function (d) {
+ if (d.accountType === 1) {
+ return '<span style="color:green;">正常账号</span>'
+ }else if (d.accountType === 2) {
+ return '<span style="color:red;">测试账号</span>'
+ }else{
+ return ''
+ }
+ }, minWidth: 120,align:'center'},
{field: 'prePaymentAmount', title: '预付款金额', minWidth: 120,align:'center'},
{field: 'forceClosingPrice', title: '预估强平价', minWidth: 120,align:'center'},
- {field: 'bondAmount', title: '保证金', minWidth: 120,align:'center'},
- {field: 'openingFeeAmount', title: '开仓手续费', minWidth: 120,align:'center'},
- {field: 'closingFeeAmount', title: '平仓手续费', minWidth: 100,align:'center'},
- {field: 'holdAmount', title: '持仓费', minWidth: 120,align:'center'}
+ {field: 'stopLossPrice', title: '止损价', minWidth: 120,align:'center'},
+ {field: 'stopProfitPrice', title: '止盈价', minWidth: 120,align:'center'},
+ {field: 'holdAmount', title: '持仓费', minWidth: 120,align:'center',totalRow: true},
+ {field: 'entrustOpeningPrice', title: '委托开仓价', minWidth: 150,align:'center'},
+ {field: 'entrustTime', title: '委托时间', minWidth: 200,align:'center'},
+ {field: 'orderStatus', title: '订单状态',
+ templet: function (d) {
+ if (d.orderStatus === 1) {
+ return '<span style="color:green;">成交</span>'
+ }else if (d.orderStatus === 2) {
+ return '<span style="color:red;">撤单</span>'
+ }else{
+ return ''
+ }
+ }, minWidth: 120,align:'center'},
+ {field: 'orderNo', title: '订单编号', minWidth: 200,align:'center'},
+ {field: 'symbolSku', title: '币种规格', minWidth: 100,align:'center'},
+ {field: 'leverRatio', title: '杠杆倍率', minWidth: 120,align:'center'},
+ {field: 'email', title: '邮箱', minWidth: 200,align:'left'},
]]
});
}
@@ -190,6 +245,9 @@
function getQueryParams() {
return {
account: $searchForm.find('input[name="account"]').val().trim(),
+ closingType: $searchForm.find("select[name='closingType']").val(),
+ contractType: $searchForm.find("select[name='contractType']").val(),
+ accountType: $searchForm.find("select[name='accountType']").val(),
};
}
--
Gitblit v1.9.1