From 28800b5c2bc15d5d02487fb7ab046013cb4d969c Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 23 Mar 2021 15:11:53 +0800
Subject: [PATCH] 20210323 后台保留两位小数，（平台数据除外）
---
src/main/resources/templates/febs/views/modules/trademanage/contractHoldOrder.html | 18 +++++++++++++++---
src/main/resources/templates/febs/views/modules/trademanage/historyOrder.html | 21 ++++++++++++++++++++-
2 files changed, 35 insertions(+), 4 deletions(-)
diff --git a/src/main/resources/templates/febs/views/modules/trademanage/contractHoldOrder.html b/src/main/resources/templates/febs/views/modules/trademanage/contractHoldOrder.html
index 9d9478e..c89d0f0 100644
--- a/src/main/resources/templates/febs/views/modules/trademanage/contractHoldOrder.html
+++ b/src/main/resources/templates/febs/views/modules/trademanage/contractHoldOrder.html
@@ -93,6 +93,14 @@
{field: 'realName', title: '姓名', minWidth: 120,align:'left'},
{field: 'inviteIdTrader', title: '交易员邀请码', minWidth: 120,align:'left'},
{field: 'createTime', 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) {
@@ -124,9 +132,13 @@
{field: 'rewardRatio', title: '实时盈亏',
templet: function (d) {
if (d.rewardRatio > 0) {
- return '<span style="color:green;">' + d.rewardRatio + '</span>'
- }else {
- return '<span style="color:red;">' + d.rewardRatio + '</span>'
+ 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',totalRow: true},
{field: 'leverRatio', title: '杠杆倍率', minWidth: 120,align:'center'},
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 ecd86d9..0bc84f4 100644
--- a/src/main/resources/templates/febs/views/modules/trademanage/historyOrder.html
+++ b/src/main/resources/templates/febs/views/modules/trademanage/historyOrder.html
@@ -111,6 +111,14 @@
{field: 'phone', title: '手机号', minWidth: 120,align:'left',totalRowText: '合计'},
{field: 'inviteId', title: '邀请码UID', minWidth: 120,align:'center'},
{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) {
@@ -183,6 +191,18 @@
return '<span></span>'
}
},minWidth: 120,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: 'prePaymentAmount', title: '预付款金额', minWidth: 120,align:'center'},
{field: 'forceClosingPrice', title: '预估强平价', minWidth: 120,align:'center'},
{field: 'bondAmount', title: '保证金', minWidth: 120,align:'center'},
@@ -191,7 +211,6 @@
{field: 'openingFeeAmount', title: '开仓手续费', minWidth: 120,align:'center',totalRow: true},
{field: 'closingFeeAmount', title: '平仓手续费', minWidth: 100,align:'center',totalRow: true},
{field: 'holdAmount', title: '持仓费', minWidth: 120,align:'center',totalRow: true},
- {field: 'rewardRatio', title: '盈亏比例', minWidth: 120,align:'center'},
{field: 'entrustOpeningPrice', title: '委托开仓价', minWidth: 150,align:'center'},
{field: 'entrustTime', title: '委托时间', minWidth: 200,align:'center'},
{field: 'orderStatus', title: '订单状态',
--
Gitblit v1.9.1