From e84072e09a70e0795e464c91c7a81c91d205f29b Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 07 Jul 2020 20:19:51 +0800
Subject: [PATCH] modify
---
src/main/resources/templates/index.html | 2 +-
src/main/resources/mapper/modules/ContractOrderMapper.xml | 2 ++
src/main/resources/static/febs/images/favicon.ico | 0
src/main/resources/mapper/modules/AgentReturnDao.xml | 2 ++
src/main/resources/templates/febs/views/layout.html | 2 +-
src/main/resources/templates/febs/views/login.html | 4 ++--
6 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/src/main/resources/mapper/modules/AgentReturnDao.xml b/src/main/resources/mapper/modules/AgentReturnDao.xml
index dc73fa4..423a818 100644
--- a/src/main/resources/mapper/modules/AgentReturnDao.xml
+++ b/src/main/resources/mapper/modules/AgentReturnDao.xml
@@ -5,6 +5,8 @@
<select id="selectAgentReturnList" resultType="com.xcong.excoin.modules.contract.entity.AgentReturnEntity">
select
CONCAT(b.first_name, b.second_name) account,
+-- a.closing_fee_amount*(select fee_spread_ratio from platform_trade_setting) closing_fee_amount,
+-- a.opening_fee_amount*(select fee_spread_ratio from platform_trade_setting) opening_fee_amount,
a.*,
c.phone,
c.email
diff --git a/src/main/resources/mapper/modules/ContractOrderMapper.xml b/src/main/resources/mapper/modules/ContractOrderMapper.xml
index 92ff33f..ea41bc4 100644
--- a/src/main/resources/mapper/modules/ContractOrderMapper.xml
+++ b/src/main/resources/mapper/modules/ContractOrderMapper.xml
@@ -8,6 +8,8 @@
a.email,
a.referer_id,
concat(b.first_name, b.second_name) name,
+ c.opening_fee_amount*(select fee_spread_ratio from platform_trade_setting) opening_fee_amount,
+ c.closing_fee_amount*(select fee_spread_ratio from platform_trade_setting) closing_fee_amount,
c.*
from member a
inner join member_authentication b on a.id=b.member_id
diff --git a/src/main/resources/static/febs/images/favicon.ico b/src/main/resources/static/febs/images/favicon.ico
old mode 100644
new mode 100755
index 4f92d34..9d015cd
--- a/src/main/resources/static/febs/images/favicon.ico
+++ b/src/main/resources/static/febs/images/favicon.ico
Binary files differ
diff --git a/src/main/resources/templates/febs/views/layout.html b/src/main/resources/templates/febs/views/layout.html
index 7a5b526..0e6f89f 100644
--- a/src/main/resources/templates/febs/views/layout.html
+++ b/src/main/resources/templates/febs/views/layout.html
@@ -63,7 +63,7 @@
<div class="layui-side-scroll">
<div class="layui-logo" style="cursor: pointer">
<img data-th-src="@{febs/images/logo.png}">
- <span>BxCoin 代理系统</span>
+ <span>Biue 代理系统</span>
</div>
<script
type="text/html"
diff --git a/src/main/resources/templates/febs/views/login.html b/src/main/resources/templates/febs/views/login.html
index 90d653b..4e5d969 100644
--- a/src/main/resources/templates/febs/views/login.html
+++ b/src/main/resources/templates/febs/views/login.html
@@ -2,7 +2,7 @@
<html xmlns:th="http://www.thymeleaf.org">
<head>
<meta charset="utf-8">
- <title>ExCoin 代理系统</title>
+ <title>Biue 代理系统</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<meta name="renderer" content="webkit">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
@@ -19,7 +19,7 @@
<div class="layui-container">
<div class="layui-row">
<div class="layui-col-xs12 layui-col-lg4 layui-col-lg-offset4 febs-tc">
- <div class="layui-logo"><span><b>BxCoin</b> 代理系统</span></div>
+ <div class="layui-logo"><span><b>Biue</b> 代理系统</span></div>
</div>
<div class="layui-col-xs12 layui-col-lg4 layui-col-lg-offset4" id="login-div">
<div class="layui-form" lay-filter="login-form">
diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html
index 4e0117f..40df2f7 100644
--- a/src/main/resources/templates/index.html
+++ b/src/main/resources/templates/index.html
@@ -3,7 +3,7 @@
xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
<head>
<meta charset="utf-8">
- <title>BxCoin 代理系统</title>
+ <title>Biue 代理系统</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<meta name="renderer" content="webkit">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
--
Gitblit v1.9.1