Merge remote-tracking branch 'origin/develop' into develop

src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientMapper.xml

@@ -267,11 +267,21 @@
     </select>
 
     <select id="comListPartners" resultType="com.alibaba.fastjson.JSONObject">
-        SELECT DISTINCT c.*,o.name org_name
+        SELECT DISTINCT c.*,o.name org_name,tmp.operator
         FROM sys_clients c
         inner join sys_client_config cc on cc.client_id = c.client_id
         inner join sys_org o
         on o.org_id=c.org_id
+        LEFT JOIN (
+        SELECT
+        client_id,
+        GROUP_CONCAT( DISTINCT ap.operator ) AS operator
+        FROM
+        sys_clients_audit_process ap
+        INNER JOIN sys_managers m ON ap.operator_id = m.manager_id
+        AND <![CDATA[ m.role & 2 >0 ]]>
+        GROUP BY ap.client_id
+        ) tmp ON tmp.client_id = c.client_id
         <if test="bd_user!=null">
             INNER JOIN sys_client_bd d ON c.client_id = d.client_id AND d.bd_id = #{bd_user} and
             date(d.start_date)&lt;= date(now()) and (d.end_date is null or date(d.end_date)&gt;= date(now())) and

src/main/ui/static/boot/indexMainApp.js

@@ -586,6 +586,11 @@ define(['angular', 'angularSanitize', 'angularAnimate', 'angularMessages', 'uiRo
                     return 'Native QR Code';
                 case '14':
                     return 'Share Link'
+                case '16':
+                case '17':
+                    return '银行卡网关'
+                case '18':
+                    return '银行账户网关'
             }
         }
     });

src/main/ui/static/boot/managerMainApp.js

@@ -467,6 +467,11 @@ define(['angular', 'angularSanitize', 'angularAnimate', 'angularMessages', 'uiRo
                     return '原生二维码';
                 case '14':
                     return '账单链接'
+                case '16':
+                case '17':
+                    return '银行卡网关'
+                case '18':
+                    return '银行账户网关'
             }
         }
     });
@@ -578,4 +583,4 @@ define(['angular', 'angularSanitize', 'angularAnimate', 'angularMessages', 'uiRo
         };
     }]);
     return app;
-});
+});

src/main/ui/static/boot/managerMainAppv2.js

@@ -484,6 +484,11 @@ define(['angular', 'angularSanitize', 'angularAnimate', 'angularMessages', 'uiRo
                     return '原生二维码';
                 case '14':
                     return '账单链接'
+                case '16':
+                case '17':
+                    return '银行卡网关'
+                case '18':
+                    return '银行账户网关'
             }
         }
     });
@@ -533,4 +538,4 @@ define(['angular', 'angularSanitize', 'angularAnimate', 'angularMessages', 'uiRo
         ngModelOptions: {}
     });
     return app;
-});
+});

src/main/ui/static/cms/templates/article_editor.html

@@ -129,6 +129,14 @@
                         </div>
                     </div>
 
+                    <div class="form-group">
+                        <label class="col-md-2 control-label" for="kw-input">>商户黑名单(英文逗号隔开)</label>
+                        <div class="col-xs-8 col-sm-4">
+                                            <Textarea type="text" class="form-control"
+                                                      ng-model="article.black_list_clients"/>
+                        </div>
+                    </div>
+
 
                     <div class="form-group" ng-if="publishall == 0">
                         <label class="col-xs-4 col-sm-2">

src/main/ui/static/payment/partner/templates/partner_compliance.html

@@ -273,6 +273,7 @@
                                     <th style="padding: 12px;">Compliance Status</th>
                                     <th style="padding: 12px;">Organization</th>
                                     <th style="padding: 12px;">BD</th>
+                                    <th style="padding: 12px;">Compliance Manager</th>
                                     <th style="padding: 12px;" ng-if="'client_detail_by_moniker'|withFunc">Operation
                                     </th>
                                 </tr>
@@ -319,6 +320,7 @@
                                     </td>
                                     <td ng-bind="partner.org_name"></td>
                                     <td ng-bind="partner.bd_user_name"></td>
+                                    <td ng-bind="partner.operator"></td>
                                     <td ng-if="'client_detail_by_moniker'|withFunc">
                                         <a class="text-primary" role="button" title="Detail"
                                            ui-sref="partners.detail({clientMoniker:partner.client_moniker})">