fix 过滤掉未开启微信支付的商户

src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/ClientAnalysisMapper.xml

@@ -247,6 +247,7 @@
         (SELECT p.sub_merchant_id FROM sys_clients p INNER JOIN pmt_orders o ON o.client_id = p.client_id AND o.status >4 AND o.confirm_time IS NOT NULL
         WHERE datediff(now(), o.create_time) <= 25 AND p.sub_merchant_id is not null GROUP BY p.sub_merchant_id) AND c.sub_merchant_id IS not null AND c.merchant_id IS NOT NULL
         AND (c.approve_result = 1 OR c.approve_result= 2) AND c.is_valid = 1
+        AND c.enable_wechat = 1
         ]]>
         GROUP by c.sub_merchant_id
     </select>

src/main/ui/static/payment/merchantid/templates/no_trade_sub_merchant_id.html

@@ -16,6 +16,9 @@
             <div>
                 <div class="list-group col-sm-12 col-xs-12"
                      ng-repeat="(key, clients) in notTradeClientsMap">
+                    <a class="list-group-item active col-sm-12 col-xs-12">
+                        {{key|choose_merchant_id}}
+                    </a>
                     <!--
                     <a class="list-group-item active col-sm-12 col-xs-12">
                         {{key|choose_merchant_id}}