From 430dbda0562bbf425bda16a83c4886c8b0fe688d Mon Sep 17 00:00:00 2001
From: "eason.qian" <eason.qian@royalpay.com.au>
Date: Thu, 11 Jan 2018 14:03:16 +0800
Subject: [PATCH 1/2] fix

---
 .../royalpay/payment/manage/mappers/system/ManagerMapper.xml  | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ManagerMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ManagerMapper.xml
index 796fa9e63..c8809265d 100644
--- a/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ManagerMapper.xml
+++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ManagerMapper.xml
@@ -46,9 +46,7 @@
         SELECT m.* FROM sys_managers m
         WHERE role & #{mask} >0 and m.is_valid=1
         ]]>
-        <if test="org_id!=null and org_ids==null">and m.org_id=#{org_id}</if>
-        <if test="org_ids!=null">and m.org_id in
-            <foreach collection="org_ids" item="org_id" open="(" close=")" separator=",">#{org_id}</foreach></if>
+        <if test="org_id!=null">and m.org_id=#{org_id}</if>
     </select>
     <select id="listRoyalPayUsers" resultType="com.alibaba.fastjson.JSONObject">
         SELECT m.*

From edcca09eba30253872aacd963d4c3a03bd84ced7 Mon Sep 17 00:00:00 2001
From: "eason.qian" <eason.qian@royalpay.com.au>
Date: Thu, 11 Jan 2018 14:03:29 +0800
Subject: [PATCH 2/2] fix

---
 src/db/modify.sql | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/db/modify.sql b/src/db/modify.sql
index 1eb8d6787..e67bdfd22 100644
--- a/src/db/modify.sql
+++ b/src/db/modify.sql
@@ -139,4 +139,10 @@ ALTER TABLE sys_clients_customers ADD COLUMN channel varchar(15) not NULL ;
 ALTER TABLE sys_clients_customers ADD COLUMN last_payment_time datetime DEFAULT NULL COMMENT '最后一次付款时间';
 
 ALTER TABLE sys_org ADD COLUMN parent_org_id int(11) DEFAULT NULL;
+ALTER TABLE sys_org ADD COLUMN min_wechat_rate DECIMAL(3,2) DEFAULT 'NULL' COMMENT '旗下商户最低微信费率';
+ALTER TABLE sys_org ADD COLUMN min_alipay_rate DECIMAL(3,2) DEFAULT 'NULL' COMMENT '旗下商户最低支付宝费率';
+ALTER TABLE sys_org ADD COLUMN min_alipayonline_rate DECIMAL(3,2) DEFAULT 'NULL' COMMENT '旗下商户最低支付宝线上费率';
+ALTER TABLE sys_org ADD COLUMN min_bestpay_rate DECIMAL(3,2) DEFAULT 'NULL' COMMENT '旗下商户最低翼支付费率';
+ALTER TABLE sys_org ADD COLUMN min_jd_rate DECIMAL(3,2) DEFAULT 'NULL' COMMENT '旗下商户最低京东费率';
+ALTER TABLE sys_org ADD COLUMN commission_type SMALLINT(1) DEFAULT '1' COMMENT '提成类型 1:渠道计算法 2:总交易额比例 3:收益比例';