From f2093803bf804a49b4e914c524b8b2277edb99af Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 14 Jul 2020 11:40:50 +0800
Subject: [PATCH] 20200714 代码提交
---
src/main/resources/mapper/modules/ContractOrderMapper.xml | 6 +++---
src/main/resources/templates/febs/views/modules/member/agentInfo.html | 2 +-
src/main/resources/templates/febs/views/modules/trademanage/historyOrder.html | 12 ++++++------
src/main/resources/mapper/modules/MemberAccountMoneyChangeMapper.xml | 5 +++--
4 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/src/main/resources/mapper/modules/ContractOrderMapper.xml b/src/main/resources/mapper/modules/ContractOrderMapper.xml
index 8b242e6..9105c4b 100644
--- a/src/main/resources/mapper/modules/ContractOrderMapper.xml
+++ b/src/main/resources/mapper/modules/ContractOrderMapper.xml
@@ -9,7 +9,7 @@
contract_order s
LEFT JOIN member m ON m.id = s.member_id
<where>
- s.order_type IN (3, 4)
+ s.closing_type in (2,3,4,5,6,7,8,9)
AND s.member_id IN (
SELECT
id
@@ -26,8 +26,8 @@
and s.closing_type = #{record.closingType}
</if>
</if>
- </where>
- order by s.order_no DESC,s.create_time asc
+ </where>
+ order by s.opening_time desc
</select>
</mapper>
\ No newline at end of file
diff --git a/src/main/resources/mapper/modules/MemberAccountMoneyChangeMapper.xml b/src/main/resources/mapper/modules/MemberAccountMoneyChangeMapper.xml
index 870285f..9936aba 100644
--- a/src/main/resources/mapper/modules/MemberAccountMoneyChangeMapper.xml
+++ b/src/main/resources/mapper/modules/MemberAccountMoneyChangeMapper.xml
@@ -18,13 +18,14 @@
LEFT JOIN member m ON m.id = s.member_id
<where>
s.type = 3
- and s.content like '%佣金入账%'
+ and s.content like '%佣金到账%'
<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>
- </where>
+ </where>
+ ORDER BY s.create_time DESC
</select>
</mapper>
\ No newline at end of file
diff --git a/src/main/resources/templates/febs/views/modules/member/agentInfo.html b/src/main/resources/templates/febs/views/modules/member/agentInfo.html
index a2ca733..de9e0c2 100644
--- a/src/main/resources/templates/febs/views/modules/member/agentInfo.html
+++ b/src/main/resources/templates/febs/views/modules/member/agentInfo.html
@@ -1,4 +1,4 @@
-<div class="layui-fluid layui-anim febs-anim" id="febs-user" lay-title="充币审核管理">
+<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">
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 bb9979b..d9c2c73 100644
--- a/src/main/resources/templates/febs/views/modules/trademanage/historyOrder.html
+++ b/src/main/resources/templates/febs/views/modules/trademanage/historyOrder.html
@@ -97,7 +97,7 @@
}else {
return '<span style="color:red;">限价</span>'
}
- }, minWidth: 120,align:'center'},
+ }, minWidth: 100,align:'center'},
{field: 'symbol', title: '币种', minWidth: 120,align:'center'},
@@ -115,8 +115,9 @@
}else{
return ''
}
- }, minWidth: 120,align:'center'},
- {field: 'openingPrice', title: '开仓价', minWidth: 150,align:'center'},
+ }, minWidth: 100,align:'center'},
+ {field: 'openingPrice', title: '开仓价', minWidth: 100,align:'center'},
+ {field: 'openingTime', title: '开仓时间', minWidth: 200,align:'center'},
{field: 'closingType', title: '平仓类型',
templet: function (d) {
if (d.closingType === 0) {
@@ -141,7 +142,8 @@
return ''
}
}, minWidth: 120,align:'center'},
- {field: 'closingPrice', title: '平仓价', minWidth: 150,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) {
@@ -163,8 +165,6 @@
{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: 'openingTime', title: '开仓时间', minWidth: 200,align:'center'},
- {field: 'closingTime', title: '平仓时间', minWidth: 200,align:'center'},
{field: 'entrustOpeningPrice', title: '委托开仓价', minWidth: 150,align:'center'},
{field: 'entrustTime', title: '委托时间', minWidth: 200,align:'center'},
{field: 'orderStatus', title: '订单状态',
--
Gitblit v1.9.1