From 1567adaf3f1fbe265b933081281c0d568786b3b2 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 13 Jul 2020 10:33:43 +0800
Subject: [PATCH] modify
---
src/main/resources/application-dev.yml | 4 ++++
src/main/resources/templates/febs/views/modules/agent/member.html | 3 +++
src/main/resources/templates/febs/views/modules/contract/assets-list.html | 6 +++---
src/main/resources/mapper/modules/MemberMapper.xml | 12 ++++++++++--
4 files changed, 20 insertions(+), 5 deletions(-)
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 70f014a..19436f7 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -19,6 +19,10 @@
password: 123456
driver-class-name: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://120.27.238.55:3306/kss_framework?useUnicode=true&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2b8
+# username: ctcoin_data
+# password: ctcoin_123
+# driver-class-name: com.mysql.cj.jdbc.Driver
+# url: jdbc:mysql://rm-bp151tw8er79ig9kb5o.mysql.rds.aliyuncs.com:3306/db_biue?useUnicode=true&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2b8
redis:
# Redis数据库索引（默认为 0）
diff --git a/src/main/resources/mapper/modules/MemberMapper.xml b/src/main/resources/mapper/modules/MemberMapper.xml
index fdb726d..30b4637 100644
--- a/src/main/resources/mapper/modules/MemberMapper.xml
+++ b/src/main/resources/mapper/modules/MemberMapper.xml
@@ -4,7 +4,15 @@
<select id="selectMemberListInPage" resultType="com.xcong.excoin.modules.agent.entity.MemberEntity">
- select * from member
+ select
+ a.*,
+ b.total_balance contractTotal,
+ c.available_balance coinTotal,
+ d.total_balance agentTotal
+ from member a
+ left join member_wallet_contract b on a.id=b.member_id
+ left join member_wallet_coin c on a.id=c.member_id and c.wallet_code='USDT'
+ left join member_wallet_agent d on a.id=d.member_id
<where>
<if test="record != null">
<if test="record.inviteId !=null and record.inviteId!=''">
@@ -79,7 +87,7 @@
a.invite_id,
a.referer_id,
b.total_balance contractTotal,
- c.total_balance coinTotal,
+ c.available_balance coinTotal,
d.total_balance agentTotal
from member a
left join member_wallet_contract b on a.id=b.member_id
diff --git a/src/main/resources/templates/febs/views/modules/agent/member.html b/src/main/resources/templates/febs/views/modules/agent/member.html
index 374935d..8da4c20 100644
--- a/src/main/resources/templates/febs/views/modules/agent/member.html
+++ b/src/main/resources/templates/febs/views/modules/agent/member.html
@@ -283,6 +283,9 @@
{field: 'email', title: '邮箱', minWidth: 200},
{field: 'inviteId', title: '邀请码'},
{field: 'refererId', title: '上级邀请码'},
+ {field: 'contractTotal', title: '合约资产', minWidth: 120},
+ {field: 'coinTotal', title: '币币资产', minWidth: 120},
+ {field: 'agentTotal', title: '佣金资产', minWidth: 120},
{title: '账号类型', templet: '#account-type'},
{title: '账号状态', templet: '#account-status'},
{title: '审核状态', templet: '#certify-status'},
diff --git a/src/main/resources/templates/febs/views/modules/contract/assets-list.html b/src/main/resources/templates/febs/views/modules/contract/assets-list.html
index 4dcb855..e054b87 100644
--- a/src/main/resources/templates/febs/views/modules/contract/assets-list.html
+++ b/src/main/resources/templates/febs/views/modules/contract/assets-list.html
@@ -100,9 +100,9 @@
{field: 'refererId', title: '上级UID', minWidth: 100, align: 'center'},
{field: 'phone', title: '联系方式', minWidth: 130, align: 'center'},
{field: 'email', title: '邮箱', minWidth: 100, align: 'center'},
- {field: 'contractTotal', title: '开仓手续费', minWidth: 140, align: 'center'},
- {field: 'coinTotal', title: '平仓手续费', minWidth: 140, align: 'center'},
- {field: 'agentTotal', title: '持仓手续费', minWidth: 140, align: 'center'}
+ {field: 'contractTotal', title: '合约资产', minWidth: 140, align: 'center'},
+ {field: 'coinTotal', title: '币币资产', minWidth: 140, align: 'center'},
+ {field: 'agentTotal', title: '佣金资产', minWidth: 140, align: 'center'}
]]
});
}
--
Gitblit v1.9.1