Merge branch 'develop' of https://pms.globalfreepay.com/source/royalpay.manage into develop

src/main/resources/au/com/royalpay/payment/manage/mappers/act/ActChairtyMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="au.com.royalpay.payment.manage.mappers.act.ActChairtyMapper">
     <select id="chairtyClientNum" resultType="com.alibaba.fastjson.JSONObject">
-select client_moniker,active_time,IFNULL(count(org_id),0) as count_ordernum,ifnull(sum(pmt_transactions.transaction_amount),0) as sum_ordernum
+select DISTINCT (count(order_id))  as count_ordernum ,client_moniker,active_time,ifnull(sum(pmt_transactions.transaction_amount),0) as sum_ordernum
 from act_charity
 left  JOIN pmt_transactions on act_charity.client_id = pmt_transactions.client_id
 and pmt_transactions.transaction_type='Credit'  and pmt_transactions.transaction_time>=act_charity.active_time
@@ -13,19 +13,19 @@ GROUP BY act_charity.client_id order by sum_ordernum desc
     <select id="getChairtyWeekstartAnalysis" resultType="com.alibaba.fastjson.JSONObject">
     select DATE_FORMAT(pmt_transactions.transaction_time,'%Y-%m-%d') as weekstart from act_charity
         inner  JOIN pmt_transactions on act_charity.client_id = pmt_transactions.client_id
-        where dayofweek(pmt_transactions.transaction_time)=2 and  pmt_transactions.transaction_time&gt;=#{begin} and pmt_transactions.transaction_time&lt;=#{end} and pmt_transactions.transaction_time>=act_charity.active_time
+        where dayofweek(pmt_transactions.transaction_time)=2 and  pmt_transactions.transaction_time&gt;=#{begin} and pmt_transactions.transaction_time&lt;=#{end}
         and pmt_transactions.refund_id is null and pmt_transactions.channel != 'Settlement'
         group by weekstart order by weekstart asc;
     </select>
     <select id="getChairtyWeekAnalysis" resultType="com.alibaba.fastjson.JSONObject">
-        select count(pmt_transactions.org_id) as count_ordernum,ifnull(sum(pmt_transactions.transaction_amount),0) as sum_ordernum from act_charity   left JOIN pmt_transactions ON act_charity.client_id = pmt_transactions.client_id
+        select DISTINCT (count(order_id)) as count_ordernum,ifnull(sum(pmt_transactions.transaction_amount),0) as sum_ordernum from act_charity   left JOIN pmt_transactions ON act_charity.client_id = pmt_transactions.client_id
         and pmt_transactions.transaction_type='Credit'  and pmt_transactions.transaction_time&gt;=#{begin} and pmt_transactions.transaction_time&lt;=#{end} and pmt_transactions.transaction_time>=act_charity.active_time
         and pmt_transactions.refund_id is null and pmt_transactions.channel != 'Settlement'
 
     </select>
 
     <select id="getChairtyWeekRaking" resultType="com.alibaba.fastjson.JSONObject">
-        select act_charity.client_moniker,((count(pmt_transactions.org_id)) * 0.01) as chair_ordernum,ifnull(sum(pmt_transactions.transaction_amount),0) as sum_ordernum from act_charity   left JOIN pmt_transactions ON act_charity.client_id = pmt_transactions.client_id
+        select  DISTINCT (count(pmt_transactions.order_id)) *0.01 as chair_ordernum,act_charity.client_moniker,ifnull(sum(pmt_transactions.transaction_amount),0) as sum_ordernum from act_charity   left JOIN pmt_transactions ON act_charity.client_id = pmt_transactions.client_id
         and pmt_transactions.transaction_type='Credit'  and pmt_transactions.transaction_time&gt;=#{begin} and pmt_transactions.transaction_time&lt;=#{end} and pmt_transactions.transaction_time>=act_charity.active_time
         GROUP BY act_charity.client_moniker order by sum_ordernum desc
     </select>

src/main/ui/manage.html

@@ -307,13 +307,13 @@ margin-bottom: 10%;"/>
                 <!--</a>-->
                 <!--</li>-->
 
-               <!-- <li ui-sref-active="active" ng-if="('encourage'|withModule)">
+               <li ui-sref-active="active" ng-if="('encourage'|withModule)">
                     <a ui-sref="encourageAct">
                         <i class="fa fa-gift"></i> <span>鼓励金</span>
                     </a>
                 </li>
 
-                <li ui-sref-active="active" ng-if="('act_customer_redpack'|withModule)">
+                <!--<li ui-sref-active="active" ng-if="('act_customer_redpack'|withModule)">
                     <a ui-sref="customer_redpack">
                         <i class="fa fa-gift"></i> <span>红包返现</span>
                     </a>

src/main/ui/static/actchairty/templates/act_chairty_analysis.html

@@ -50,7 +50,7 @@
 </div>
 <div class="box">
     <div class="box-header">
-        <h3 class="box-title">Settle Delay Ranking</h3>
+        <h3 class="box-title">Chairty Ranking</h3>
     </div>
     <div class="box-body">
         <div class="row cen col-sm-12">

src/main/ui/static/config/bdprize/templates/bd_commission_config_dialog.html

@@ -64,20 +64,17 @@
                 </div>
                 <div class="box intro_color">
                     <div class="box-header with-border">
-                        <h5 class="intro_color" >跨境事业部总监提成制度</h5>
+                        <h6 class="intro_color" >跨境事业部总监提成制度</h6>
                     </div>
                     <div class="box-body">
                         <ul class="small">
-                            <li>享受墨尔本和悉尼两地部门流水总和提成</li>
                             <li>完成当月指标低于 51%，提成按照 0.005%提取</li>
                             <li>完成当月指标高于 80%，提成按照 0.008%提取</li>
                             <li>完成当月指标 100%，提成按照 0.01%</li>
-                            <li>连续六个月未完成指标，撤职处理或回归原有职位</li>
-                            <li>销售总监任职后需将自己手头客户按照公司规定公平分配给客户专员，本人可挂靠 50%,每个商户享受 50%的流水提成</li>
                         </ul>
                     </div>
                     <div class="box-header with-border">
-                        <h5 class="intro_color">大客户部门 Manager 提成考核指标</h5>
+                        <h6 class="intro_color">大客户部门 Manager 提成考核指标</h6>
                     </div>
                     <div class="box-body">
                         <ul class="small">
@@ -89,32 +86,25 @@
                         <h6 class="intro_color">悉尼分公司总经理</h6>
                     </div>
                     <div class="box-body">
-                        <ul>
+                        <ul class="small">
                             <li>完成月度指标，当月提成为该分公司总流水的 0.005%</li>
                             <li>未完成月度指标，当月提成为该分公司总流水的 0.0025%</li>
                         </ul>
                     </div>
                     <div class="box-header with-border">
-                        <h5 class="intro_color">南京分公司技术部提成</h5>
+                        <h6 class="intro_color">南京分公司技术部提成</h6>
                     </div>
                     <div class="box-body">
                         <ul class="small">
                             <li>完成月度指标，当月提成为公司总流水的 0.01%</li>
                             <li>未完成月度指标，当月提成为公司总流水的 0.005%</li>
-                            <li>【发放原则：季度一发放；分配原则由总经理 Leo Huang 制定。】</li>
                         </ul>
                     </div>
                     <div class="box-header with-border">
-                        <h5 class="intro_color">COO考核及提成政策</h5>
+                        <h6 class="intro_color">COO考核及提成政策</h6>
                     </div>
                     <div class="box-body">
                         <ul class="small">
-                            <li>需完成董事会下达的指标任务</li>
-                            <li>按照公司总流水进行提取（包含合伙人）</li>
-                            <li>每月商户数量递增不得少于 100 家</li>
-                            <li>需带领团队按时保质完成每月 KPI 任务</li>
-                            <li>需带领团队配合公司的每一个活动执行；</li>
-                            <li>及时做好培训、后台管理</li>
                             <li>完成 KPI 按照 0.03%提取；未完成 KPI 按照 0.02%提取</li>
                         </ul>
                     </div>