From fc4646a770b1aa9866091b7e868eca726ab4c171 Mon Sep 17 00:00:00 2001 From: luoyang14z7 <704328506@qq.com> Date: Thu, 12 Jul 2018 09:41:33 +0800 Subject: [PATCH 1/3] fix : chairty --- .../payment/manage/mappers/act/ActChairtyMapper.xml | 8 ++++---- .../static/actchairty/templates/act_chairty_analysis.html | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/resources/au/com/royalpay/payment/manage/mappers/act/ActChairtyMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/act/ActChairtyMapper.xml index c9819effc..b97c44145 100644 --- a/src/main/resources/au/com/royalpay/payment/manage/mappers/act/ActChairtyMapper.xml +++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/act/ActChairtyMapper.xml @@ -2,7 +2,7 @@ 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>=#{begin} and pmt_transactions.transaction_time<=#{end} and pmt_transactions.transaction_time>=act_charity.active_time + where dayofweek(pmt_transactions.transaction_time)=2 and pmt_transactions.transaction_time>=#{begin} and pmt_transactions.transaction_time<=#{end} and pmt_transactions.refund_id is null and pmt_transactions.channel != 'Settlement' group by weekstart order by weekstart asc; diff --git a/src/main/ui/static/actchairty/templates/act_chairty_analysis.html b/src/main/ui/static/actchairty/templates/act_chairty_analysis.html index 710d34f72..da518a301 100644 --- a/src/main/ui/static/actchairty/templates/act_chairty_analysis.html +++ b/src/main/ui/static/actchairty/templates/act_chairty_analysis.html @@ -50,7 +50,7 @@
-

Settle Delay Ranking

+

Chairty Ranking

From 4291a53304b57e137e76ef1cc2c8c26738aca3db Mon Sep 17 00:00:00 2001 From: yuan <1551130722@qq.com> Date: Thu, 12 Jul 2018 09:56:25 +0800 Subject: [PATCH 2/3] fix html --- .../bd_commission_config_dialog.html | 20 +++++-------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/src/main/ui/static/config/bdprize/templates/bd_commission_config_dialog.html b/src/main/ui/static/config/bdprize/templates/bd_commission_config_dialog.html index e61375c00..4a5a96951 100644 --- a/src/main/ui/static/config/bdprize/templates/bd_commission_config_dialog.html +++ b/src/main/ui/static/config/bdprize/templates/bd_commission_config_dialog.html @@ -64,20 +64,17 @@
-
跨境事业部总监提成制度
+
跨境事业部总监提成制度
    -
  • 享受墨尔本和悉尼两地部门流水总和提成
  • 完成当月指标低于 51%，提成按照 0.005%提取
  • 完成当月指标高于 80%，提成按照 0.008%提取
  • 完成当月指标 100%，提成按照 0.01%
    • -
  • 连续六个月未完成指标，撤职处理或回归原有职位
    • -
  • 销售总监任职后需将自己手头客户按照公司规定公平分配给客户专员，本人可挂靠 50%,每个商户享受 50%的流水提成
-
大客户部门 Manager 提成考核指标
+
大客户部门 Manager 提成考核指标
    @@ -89,32 +86,25 @@
    悉尼分公司总经理
-
    +
    • 完成月度指标，当月提成为该分公司总流水的 0.005%
    • 未完成月度指标，当月提成为该分公司总流水的 0.0025%
-
南京分公司技术部提成
+
南京分公司技术部提成
  • 完成月度指标，当月提成为公司总流水的 0.01%
  • 未完成月度指标，当月提成为公司总流水的 0.005%
    • -
  • 【发放原则：季度一发放；分配原则由总经理 Leo Huang 制定。】
-
COO考核及提成政策
+
COO考核及提成政策
    -
  • 需完成董事会下达的指标任务
    • -
  • 按照公司总流水进行提取（包含合伙人）
    • -
  • 每月商户数量递增不得少于 100 家
    • -
  • 需带领团队按时保质完成每月 KPI 任务
    • -
  • 需带领团队配合公司的每一个活动执行；
    • -
  • 及时做好培训、后台管理
  • 完成 KPI 按照 0.03%提取；未完成 KPI 按照 0.02%提取
From 4a170a5f94153781ffb4614fadac5e0f4dbb3ba6 Mon Sep 17 00:00:00 2001 From: eason Date: Thu, 12 Jul 2018 10:06:58 +0800 Subject: [PATCH 3/3] fix --- src/main/ui/manage.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/ui/manage.html b/src/main/ui/manage.html index 10872beb9..0119b7692 100644 --- a/src/main/ui/manage.html +++ b/src/main/ui/manage.html @@ -307,13 +307,13 @@ margin-bottom: 10%;"/> -