Merge remote-tracking branch 'origin/master'

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:收益比例';
 

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_id!=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>
     </select>
     <select id="listRoyalPayUsers" resultType="com.alibaba.fastjson.JSONObject">
         SELECT m.*