msb_52843
/
dalong_mall
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add && fix 商户号管理\优化SQL

Browse Source
master
luoyang 6 years ago
parent ea8eeafb1d
commit 68a1942364
4 changed files with 26 additions and 25 deletions
Show Stats Download Patch File Download Diff File

11
src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/ClientRatesAnalysisMapper.xml
Unescape View File

@ -30,13 +30,12 @@
INNER JOIN (
SELECT
c.client_id,
count(o.order_id) orders
SUM(o.orders) orders
FROM sys_clients c
LEFT JOIN pmt_orders o
ON o.client_id = c.client_id AND o.status > 4
AND date(o.create_time) <= date(#{end})
AND date(o.create_time) >= date(#{begin})
and o.total_amount>10
LEFT JOIN statistics_customer_order o
ON o.client_id = c.client_id AND o.total > 10
AND date(o.date) <= date(#{end})
AND date(o.date) >= date(#{begin})
WHERE c.approve_result=1 and c.is_valid=1
GROUP BY c.client_id
) c ON c.client_id = r.client_id

8
src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/OrderAnalysisMapper.xml
Unescape View File

@ -197,10 +197,9 @@
</select>
<select id="listCustomersData" resultType="com.alibaba.fastjson.JSONObject">
SELECT r.nickname,r.headimg,o.customer_id,sum(if(t.transaction_type='Credit',t.clearing_amount,0)) amount,
COUNT(DISTINCT o.order_id) orders,max(t.clearing_amount) max_order
SELECT r.nickname,r.headimg,o.customer_id,sum(if(o.status='5',o.customer_payment_amount,0)) amount,
COUNT(DISTINCT o.order_id) orders,max(o.customer_payment_amount) max_order
FROM pmt_orders o
INNER JOIN pmt_transactions t on t.order_id=o.order_id and t.system_generate=0 and (t.transaction_type='Credit' or t.transaction_type>0)
<if test="openid_type==4">
LEFT JOIN sys_customer_relation r on r.globalpay_openid = o.customer_id
</if>
@ -236,9 +235,8 @@
</select>
<select id="listCustomersDataAnalysis" resultType="com.alibaba.fastjson.JSONObject">
SELECT sum(if(t.transaction_type='Credit',t.clearing_amount,0)) total_amount
SELECT sum(if(o.status='5',o.customer_payment_amount,0)) total_amount
FROM pmt_orders o
INNER JOIN pmt_transactions t on t.order_id=o.order_id and t.system_generate=0 and (t.transaction_type='Credit' or t.refund_id is not null)
<where>
<if test="begin!=null">and o.create_time &gt;= #{begin}</if>
<if test="end!=null">and o.create_time &lt; #{end}</if>

9
src/main/ui/manage.html
Unescape View File

@ -288,7 +288,7 @@ margin-bottom: 10%;"/>
</a>
</li>
<li class="menu-group" ng-if="roleNow!=null && roleNow!='administrator' && roleNow!='developer' && roleNow!='sitemanager'">
<li class="menu-group" ng-if="roleNow!=null && roleNow!='administrator' && roleNow!='developer'">
<p role="button" ng-class="{'active': Partner,'is-hide':hideSideBar}" ng-click="Partner = !Partner">
<span>商户管理|Merchant</span>
<span class="pull-right-container">
@ -330,7 +330,7 @@ margin-bottom: 10%;"/>
</ul>
</li>
<li class="menu-group" ng-if="roleNow!=null && roleNow!='administrator' && roleNow!='developer' && roleNow!='sitemanager'">
<li class="menu-group" ng-if="roleNow!=null && roleNow!='administrator' && roleNow!='developer'">
<p role="button" ng-class="{'active': Transaction,'is-hide':hideSideBar}" ng-click="Transaction = !Transaction">
<span>交易管理|Transaction</span>
<span class="pull-right-container">
@ -379,6 +379,11 @@ margin-bottom: 10%;"/>
</span>
</p>
<ul class="sidebar-menu" ng-class="{'active':Risk}">
<li ui-sref-active="active" ng-if="('merchantIdManage'|withModule)">
<a ui-sref="merchant_id_manage" ui-sref-opts="{reload:true}">
<i class="fa fa-sitemap"></i> <span>商户号管理</span>
</a>
</li>
<li ui-sref-active="active">
<a ui-sref="analysis_monitoring.monitor" ui-sref-opts="{reload:true}">
<i class="fa fa-tv"></i> <span>交易成功率监控</span>

23
src/main/ui/static/menu/templates/main_menu.html
Unescape View File

@ -32,7 +32,7 @@
</div>
</div>
--> <a role="button" style="float: right;line-height: 46px" ui-sref="home" ng-click="headerCopyDisplay()"><i class="fa fa-reply"></i> 返回</a>
<div class="list-group" ng-if="role!=null && role!='administrator' && role!='developer' && role!='sitemanager' && 'partners'|withModule">
<div class="list-group" ng-if="role!=null && role!='administrator' && role!='developer' && 'partners'|withModule">
<div class="row">
<div class="col-sm-2 col-lg-2 col-xs-6" id="partners">
<div class="description-block">
@ -113,7 +113,7 @@
</div>-->
</div>
</div>
<div class="list-group" ng-if="role!=null && role!='administrator' && role!='developer' && role!='sitemanager'">
<div class="list-group" ng-if="role!=null && role!='administrator' && role!='developer'">
<div class="row">
<div class="col-sm-2 col-lg-2 col-xs-6" id="transaction">
<div class="description-block">
@ -193,6 +193,15 @@
</div>
</div>
<div class="row">
<div class="col-sm-2 col-xs-6" ng-if="('merchantIdManage'|withModule)">
<a ui-sref="merchant_id_manage" ui-sref-opts="{reload:true}" >
<div class="description-block">
<img src="/static/images/main_menu/configure_merchant_number.png"/>
<div class="description-text">
<span class="description-text">商户号</span>
</div>
</div>
</a></div>
<div class="col-sm-2 col-xs-6">
<a ui-sref="analysis_monitoring.monitor" ui-sref-opts="{reload:true}">
<div class="description-block">
@ -551,16 +560,6 @@
</div>
</a>
</div>
<div ng-if="('cashbackAnalysis'|withModule)" class="col-sm-2 col-xs-6">
<a ui-sref="cashbackAnalysis" ui-sref-opts="{reload:true}">
<div class="description-block">
<img src="/static/images/main_menu/activity_marketing_account.png"/>
<div class="description-text">
<span class="description-text">营销账户</span>
</div>
</div>
</a>
</div>
<div ng-if="'settleDelay'|withModule" class="col-sm-2 col-xs-6">
<a ui-sref="settle_delay" ui-sref-opts="{reload:true}">
<div class="description-block">

Write Preview
Loading…
Cancel
Save