From cfe81b28c817fe4543da6de5fa169ca1e69c7afd Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 14 Jul 2020 11:02:49 +0800
Subject: [PATCH] 20200714 代码提交
---
src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java | 2 +
src/main/resources/templates/febs/views/modules/member/memberDataInfo.html | 38 ------------------
src/main/resources/mapper/modules/MemberMapper.xml | 31 +++++----------
3 files changed, 13 insertions(+), 58 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java b/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java
index ac30e07..b0c39a3 100644
--- a/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java
@@ -560,8 +560,10 @@
String closingpriceByMid = memberMapper.selectClosingpriceForBasicRealData();
//平仓总手续费
String sellClosingpriceByMid = memberMapper.selectSellClosingpriceForBasicRealData();
+
//总盈亏
String rewardratioByMid = memberMapper.selectRewardratioForBasicRealData();
+
//持仓人数
String notNullNumber = memberMapper.selectSFCCForBasicRealData();
//币币账户不为空的人数
diff --git a/src/main/resources/mapper/modules/MemberMapper.xml b/src/main/resources/mapper/modules/MemberMapper.xml
index 753b6b1..5038ed9 100644
--- a/src/main/resources/mapper/modules/MemberMapper.xml
+++ b/src/main/resources/mapper/modules/MemberMapper.xml
@@ -140,22 +140,13 @@
</select>
<select id="selectReturnMoneyForBasicRealData" resultType="java.lang.String">
SELECT
- IFNULL(SUM(s.amount),'0')
+ IFNULL(SUM(s.amount), '0')
FROM
member_account_money_change s
WHERE
s.type = 3
- AND s.content LIKE '%佣金入账%'
+ AND s.content LIKE '%佣金到账%'
AND s. STATUS = '1'
- AND s.member_id NOT IN (
- SELECT
- id
- FROM
- member
- WHERE
- account_type = '2'
- AND account_status = '1'
- )
</select>
<select id="selectClosingpriceForBasicRealData" resultType="java.lang.String">
SELECT
@@ -163,7 +154,7 @@
FROM
contract_order a
WHERE
- a.closing_type IN (2, 3)
+ a.closing_type = '0'
and a.order_status = '1'
AND a.member_id NOT IN (
SELECT
@@ -181,7 +172,7 @@
FROM
contract_order a
WHERE
- a.closing_type IN (4, 5, 6, 7, 8, 9)
+ a.closing_type IN (2,3,4, 5, 6, 7, 8, 9)
and a.order_status = '1'
AND a.member_id NOT IN (
SELECT
@@ -199,7 +190,7 @@
FROM
contract_order a
WHERE
- a.closing_type IN (4, 5, 6, 7, 8, 9)
+ a.closing_type IN (2,3,4, 5, 6, 7, 8, 9)
AND a.order_status = '1'
AND a.member_id NOT IN (
SELECT
@@ -217,22 +208,20 @@
FROM
(
SELECT
- a.id
+ s.id
FROM
- contract_order a
+ contract_hold_order s
WHERE
- a. closing_type IN (2, 3)
- AND a.member_id NOT IN (
+ s.member_id IN (
SELECT
id
FROM
member
WHERE
- account_type = '2'
- AND account_status = '1'
+ account_type = '1'
)
GROUP BY
- a.member_id
+ s.member_id
) b
</select>
<select id="selectBBZHForBasicRealData" resultType="java.lang.String">
diff --git a/src/main/resources/templates/febs/views/modules/member/memberDataInfo.html b/src/main/resources/templates/febs/views/modules/member/memberDataInfo.html
index bce78eb..b946f46 100644
--- a/src/main/resources/templates/febs/views/modules/member/memberDataInfo.html
+++ b/src/main/resources/templates/febs/views/modules/member/memberDataInfo.html
@@ -25,7 +25,6 @@
form = layui.form,
table = layui.table,
$view = $('#febs-user'),
- tableInss,
tableIns;
form.render();
@@ -44,6 +43,7 @@
{field: 'walletNum', title: '币币账户余额', minWidth: 200,align:'center'},
{field: 'walletCoinNumber', title: '合约账户有余额个数', minWidth: 200,align:'center'},
{field: 'walletCoinNum', title: '合约账户余额', minWidth: 200,align:'center'},
+ {field: 'agentNum', title: '代理账户余额', minWidth: 200,align:'center'},
{field: 'platformProfitAndLoss', title: '平台剩余USDT',
templet: function (d) {
if (d.platformProfitAndLoss > '0') {
@@ -54,8 +54,6 @@
}, minWidth: 200,align:'center'},
{field: 'chargeCoin', title: '充币', minWidth: 200,align:'center'},
{field: 'appealCoin', title: '提币', minWidth: 200,align:'center'},
- {field: 'chargeUsdt', title: 'usdt充值', minWidth: 200,align:'center'},
- {field: 'appealUsdt', title: 'usdt提现', minWidth: 200,align:'center'},
{field: 'fee', title: '佣金', minWidth: 200,align:'center'},
{field: 'closingPrice', title: '开仓手续费', minWidth: 200,align:'center'},
{field: 'sellClosingPrice', title: '平仓手续费', minWidth: 200,align:'center'},
@@ -67,43 +65,9 @@
} else {
return '<span style="color:red;">'+d.yingkui+'</span>'
}
- }, minWidth: 200,align:'center'}
- ]]
- });
- tableIns = febs.table.init({
- elem: $('#userTable'),
- url: ctx + 'member/memberDataInfo',
- cols: [[
- {field: 'memberCount', title: '注册用户数', minWidth: 120,align:'center'},
- {field: 'notNullNumber', title: '持仓用户数', minWidth: 120,align:'center'},
- {field: 'walletNumber', title: '币币账户有余额个数', minWidth: 200,align:'center'},
- {field: 'walletNum', title: '币币账户余额', minWidth: 200,align:'center'},
- {field: 'walletCoinNumber', title: '合约账户有余额个数', minWidth: 200,align:'center'},
- {field: 'agentNum', title: '合约账户余额', minWidth: 200,align:'center'},
- {field: 'platformProfitAndLoss', title: '平台剩余USDT',
- templet: function (d) {
- if (d.platformProfitAndLoss > '0') {
- return '<span style="color:green;">'+d.platformProfitAndLoss+'</span>'
- } else {
- return '<span style="color:red;">'+d.platformProfitAndLoss+'</span>'
- }
}, minWidth: 200,align:'center'},
- {field: 'chargeCoin', title: '充币', minWidth: 200,align:'center'},
- {field: 'appealCoin', title: '提币', minWidth: 200,align:'center'},
{field: 'chargeUsdt', title: 'usdt充值', minWidth: 200,align:'center'},
{field: 'appealUsdt', title: 'usdt提现', minWidth: 200,align:'center'},
- {field: 'fee', title: '佣金', minWidth: 200,align:'center'},
- {field: 'closingPrice', title: '开仓手续费', minWidth: 200,align:'center'},
- {field: 'sellClosingPrice', title: '平仓手续费', minWidth: 200,align:'center'},
- {field: 'doingPrice', title: '持仓手续费', minWidth: 200,align:'center'},
- {field: 'yingkui', title: '订单盈亏',
- templet: function (d) {
- if (d.yingkui > '0') {
- return '<span style="color:green;">'+d.yingkui+'</span>'
- } else {
- return '<span style="color:red;">'+d.yingkui+'</span>'
- }
- }, minWidth: 200,align:'center'}
]]
});
}
--
Gitblit v1.9.1