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

master
luoyang 6 years ago
parent e42d6d03ba
commit 0da6e5f902

@ -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 (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 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.approve_result = 1 OR c.approve_result= 2) AND c.is_valid = 1
AND c.enable_wechat = 1
]]> ]]>
GROUP by c.sub_merchant_id GROUP by c.sub_merchant_id
</select> </select>

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

Loading…
Cancel
Save