exchange-back.git

parent: eb088bb7 | patch | commit | ignore whitespace

20210323 后台保留两位小数，（平台数据除外）

xiaoyong931011

2021-03-23 60115f7fce32f7dcefa31e07c05506feb35ea942

20210323  后台保留两位小数，（平台数据除外）

3 files modified

	src/main/resources/templates/febs/views/modules/documentary/traderProfit.html	3 ●●●●● patch \| view \| raw \| blame \| history
	src/main/resources/templates/febs/views/modules/trademanage/contractHoldOrder.html	22 ●●●●● patch \| view \| raw \| blame \| history
	src/main/resources/templates/febs/views/modules/trademanage/historyOrder.html	52 ●●●●● patch \| view \| raw \| blame \| history

 src/main/resources/templates/febs/views/modules/documentary/traderProfit.html

@@ -76,12 +76,13 @@
            }

            if (layEvent === 'seeFollowerInfo') {
                febs.modal.open('总利润详情', 'modules/documentary/seeFollowerInfo/' + data.id, {
                febs.modal.open('跟随者详情', 'modules/documentary/seeFollowerInfo/' + data.id, {
                    area: $(window).width() <= 750 ? '90%' : '80%',
                    offset: '30px',
                    btn: ['取消'],
                    btn2: function () {
                        layer.closeAll();
                        $query.click();
                    }
                });
                $query.click();

 src/main/resources/templates/febs/views/modules/trademanage/contractHoldOrder.html

@@ -126,8 +126,10 @@
                                    return '<span style="color:red;">限价</span>'

                                }

                            }, minWidth: 100,align:'center'},

                    {field: 'openingPrice', title: '开仓价', minWidth: 100,align:'center'},

                    {field: 'symbol', title: '币种', minWidth: 100,align:'center'},

                    {field: 'symbolCnt', title: '手数', minWidth: 80,align:'center'},

                    {field: 'bondAmount', title: '保证金', minWidth: 120,align:'center'},

                    {field: 'symbolCntSale', title: '可平张数', minWidth: 120,align:'center'},

                    {field: 'rewardRatio', title: '实时盈亏', 

                        templet: function (d) {

@@ -137,25 +139,23 @@
                                return '<span style="color:red;">' + d.rewardRatio + '</span>'

                            }

                        },minWidth: 120,align:'center',totalRow: true},

                    {field: 'leverRatio', title: '杠杆倍率', minWidth: 120,align:'center'},

                    {field: 'openingPrice', title: '开仓价', minWidth: 100,align:'center'},

                    {field: 'openingFeeAmount', title: '开仓手续费', minWidth: 120,align:'center',totalRow: true},

                    {field: 'holdAmount', title: '持仓手续费', minWidth: 120,align:'center',totalRow: true},

                    {field: 'bondAmount', title: '保证金', minWidth: 120,align:'center'},

                    {field: 'prePaymentAmount', title: '预付款金额', minWidth: 120,align:'center'},

                    {field: 'symbolSku', title: '币种规格', minWidth: 120,align:'center'},

                    {field: 'stopLossPrice', title: '止损价', minWidth: 120,align:'center'},

                    {field: 'stopProfitPrice', title: '止盈价', minWidth: 120,align:'center'},

                    {field: 'inviteId', title: '邀请码UID', minWidth: 120,align:'center'},

                    {field: 'orderNo', title: '订单编号', minWidth: 200,align:'center'},

                    {field: 'accountType', title: '账号类型',

                        templet: function (d) {

                        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: 'leverRatio', title: '杠杆倍率', minWidth: 120,align:'center'},

                    {field: 'holdAmount', title: '持仓手续费', minWidth: 120,align:'center',totalRow: true},

                    {field: 'prePaymentAmount', title: '预付款金额', minWidth: 120,align:'center'},

                    {field: 'symbolSku', title: '币种规格', minWidth: 120,align:'center'},

                    {field: 'stopLossPrice', title: '止损价', minWidth: 120,align:'center'},

                    {field: 'stopProfitPrice', title: '止盈价', minWidth: 120,align:'center'},

                    {field: 'inviteId', title: '邀请码UID', minWidth: 120,align:'center'},

                    {field: 'orderNo', title: '订单编号', minWidth: 200,align:'center'},

                    {field: 'email', title: '邮箱', minWidth: 200,align:'left'},

                ]]

            });


 src/main/resources/templates/febs/views/modules/trademanage/historyOrder.html

@@ -127,6 +127,7 @@
                                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) {

@@ -135,7 +136,6 @@
                                return '<span style="color:red;">限价</span>'

                            }

                        }, minWidth: 100,align:'center'},

                    {field: 'symbol', title: '币种', minWidth: 120,align:'center'},

                    {field: 'symbolCnt', title: '手数', minWidth: 80,align:'center'},

                    {field: 'orderType', title: '订单类型', 

                        templet: function (d) {

@@ -153,6 +153,19 @@
                        }, 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>'

                            }

                            if (d.rewardAmount < 0) {

                                return '<span style="color:red;">' + d.rewardAmount + '</span>'

                            }

                            if (d.rewardAmount == 0 ||  d.rewardAmount == "" || d.rewardAmount == null) {

                                return '<span></span>'

                            }

                        },minWidth: 120,align:'center',totalRow: true},

                    {field: 'closingType', title: '平仓类型', 

                        templet: function (d) {

                            if (d.closingType === 0) {

@@ -179,18 +192,8 @@
                        }, minWidth: 120,align:'center'},

                    {field: 'closingPrice', title: '平仓价', minWidth: 100,align:'center'},

                    {field: 'closingTime', title: '平仓时间', minWidth: 200,align:'center'},

                    {field: 'rewardAmount', title: '盈亏金额', 
                        templet: function (d) {

                            if (d.rewardAmount > 0) {

                                return '<span style="color:green;">' + d.rewardAmount + '</span>'

                            }

                            if (d.rewardAmount < 0) {

                                return '<span style="color:red;">' + d.rewardAmount + '</span>'

                            }

                            if (d.rewardAmount == 0 ||  d.rewardAmount == "" || d.rewardAmount == null) {

                                return '<span></span>'

                            }

                        },minWidth: 120,align:'center',totalRow: true},

                    {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) {

@@ -203,13 +206,20 @@
                                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: 'stopLossPrice', title: '止损价', minWidth: 120,align:'center'},

                    {field: 'stopProfitPrice', title: '止盈价', minWidth: 120,align:'center'},

                    {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: 'entrustOpeningPrice', title: '委托开仓价', minWidth: 150,align:'center'},

                    {field: 'entrustTime', title: '委托时间', minWidth: 200,align:'center'},

@@ -219,16 +229,6 @@
                                return '<span style="color:green;">成交</span>'

                            }else if (d.orderStatus === 2) {

                                return '<span style="color:red;">撤单</span>'

                            }else{

                                return ''

                            }

                        }, 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 ''

                            }

			@@ -76,12 +76,13 @@
			}

			if (layEvent === 'seeFollowerInfo') {
			febs.modal.open('总利润详情', 'modules/documentary/seeFollowerInfo/' + data.id, {
			febs.modal.open('跟随者详情', 'modules/documentary/seeFollowerInfo/' + data.id, {
			area: $(window).width() <= 750 ? '90%' : '80%',
			offset: '30px',
			btn: ['取消'],
			btn2: function () {
			layer.closeAll();
			$query.click();
			}
			});
			$query.click();

			@@ -126,8 +126,10 @@
			return '<span style="color:red;">限价</span>'
			}
			}, minWidth: 100,align:'center'},
			{field: 'openingPrice', title: '开仓价', minWidth: 100,align:'center'},
			{field: 'symbol', title: '币种', minWidth: 100,align:'center'},
			{field: 'symbolCnt', title: '手数', minWidth: 80,align:'center'},
			{field: 'bondAmount', title: '保证金', minWidth: 120,align:'center'},
			{field: 'symbolCntSale', title: '可平张数', minWidth: 120,align:'center'},
			{field: 'rewardRatio', title: '实时盈亏',
			templet: function (d) {
			@@ -137,25 +139,23 @@
			return '<span style="color:red;">' + d.rewardRatio + '</span>'
			}
			},minWidth: 120,align:'center',totalRow: true},
			{field: 'leverRatio', title: '杠杆倍率', minWidth: 120,align:'center'},
			{field: 'openingPrice', title: '开仓价', minWidth: 100,align:'center'},
			{field: 'openingFeeAmount', title: '开仓手续费', minWidth: 120,align:'center',totalRow: true},
			{field: 'holdAmount', title: '持仓手续费', minWidth: 120,align:'center',totalRow: true},
			{field: 'bondAmount', title: '保证金', minWidth: 120,align:'center'},
			{field: 'prePaymentAmount', title: '预付款金额', minWidth: 120,align:'center'},
			{field: 'symbolSku', title: '币种规格', minWidth: 120,align:'center'},
			{field: 'stopLossPrice', title: '止损价', minWidth: 120,align:'center'},
			{field: 'stopProfitPrice', title: '止盈价', minWidth: 120,align:'center'},
			{field: 'inviteId', title: '邀请码UID', minWidth: 120,align:'center'},
			{field: 'orderNo', title: '订单编号', minWidth: 200,align:'center'},
			{field: 'accountType', title: '账号类型',
			templet: function (d) {
			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: 'leverRatio', title: '杠杆倍率', minWidth: 120,align:'center'},
			{field: 'holdAmount', title: '持仓手续费', minWidth: 120,align:'center',totalRow: true},
			{field: 'prePaymentAmount', title: '预付款金额', minWidth: 120,align:'center'},
			{field: 'symbolSku', title: '币种规格', minWidth: 120,align:'center'},
			{field: 'stopLossPrice', title: '止损价', minWidth: 120,align:'center'},
			{field: 'stopProfitPrice', title: '止盈价', minWidth: 120,align:'center'},
			{field: 'inviteId', title: '邀请码UID', minWidth: 120,align:'center'},
			{field: 'orderNo', title: '订单编号', minWidth: 200,align:'center'},
			{field: 'email', title: '邮箱', minWidth: 200,align:'left'},
			]]
			});

			@@ -127,6 +127,7 @@
			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) {
			@@ -135,7 +136,6 @@
			return '<span style="color:red;">限价</span>'
			}
			}, minWidth: 100,align:'center'},
			{field: 'symbol', title: '币种', minWidth: 120,align:'center'},
			{field: 'symbolCnt', title: '手数', minWidth: 80,align:'center'},
			{field: 'orderType', title: '订单类型',
			templet: function (d) {
			@@ -153,6 +153,19 @@
			}, 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>'
			}
			if (d.rewardAmount < 0) {
			return '<span style="color:red;">' + d.rewardAmount + '</span>'
			}
			if (d.rewardAmount == 0 \|\| d.rewardAmount == "" \|\| d.rewardAmount == null) {
			return '<span></span>'
			}
			},minWidth: 120,align:'center',totalRow: true},
			{field: 'closingType', title: '平仓类型',
			templet: function (d) {
			if (d.closingType === 0) {
			@@ -179,18 +192,8 @@
			}, minWidth: 120,align:'center'},
			{field: 'closingPrice', title: '平仓价', minWidth: 100,align:'center'},
			{field: 'closingTime', title: '平仓时间', minWidth: 200,align:'center'},
			{field: 'rewardAmount', title: '盈亏金额',
			templet: function (d) {
			if (d.rewardAmount > 0) {
			return '<span style="color:green;">' + d.rewardAmount + '</span>'
			}
			if (d.rewardAmount < 0) {
			return '<span style="color:red;">' + d.rewardAmount + '</span>'
			}
			if (d.rewardAmount == 0 \|\| d.rewardAmount == "" \|\| d.rewardAmount == null) {
			return '<span></span>'
			}
			},minWidth: 120,align:'center',totalRow: true},
			{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) {
			@@ -203,13 +206,20 @@
			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: 'stopLossPrice', title: '止损价', minWidth: 120,align:'center'},
			{field: 'stopProfitPrice', title: '止盈价', minWidth: 120,align:'center'},
			{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: 'entrustOpeningPrice', title: '委托开仓价', minWidth: 150,align:'center'},
			{field: 'entrustTime', title: '委托时间', minWidth: 200,align:'center'},
			@@ -219,16 +229,6 @@
			return '<span style="color:green;">成交</span>'
			}else if (d.orderStatus === 2) {
			return '<span style="color:red;">撤单</span>'
			}else{
			return ''
			}
			}, 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 ''
			}