【R】商户端&运营端订单source处理 fix

master
liuxinxin 5 years ago
parent 8c70b3fc87
commit a1da428d56

@ -19,8 +19,8 @@
<select id="getCashbackRecores" resultType="com.alibaba.fastjson.JSONObject"> <select id="getCashbackRecores" resultType="com.alibaba.fastjson.JSONObject">
SELECT c.*,p.client_moniker,p.short_name FROM cashback_records c SELECT c.*,p.client_moniker,p.short_name,o.source FROM cashback_records c
INNER JOIN sys_clients p on c.client_id=p.client_id INNER JOIN sys_clients p on c.client_id=p.client_id INNER JOIN pmt_orders o on c.order_id = o.order_id
<where> <where>
<if test="client_ids!=null"> <if test="client_ids!=null">
AND c.client_id IN AND c.client_id IN

@ -80,7 +80,13 @@
<tbody> <tbody>
<tr ng-repeat="record in records"> <tr ng-repeat="record in records">
<td ng-bind="record.short_name"></td> <td ng-bind="record.short_name"></td>
<td ng-bind="record.order_id"></td> <td>
<img src="/static/images/royalpay_sign_s.png"
uib-tooltip="RoyalPay" ng-if="record.source=='system'"/>
<img src="/static/images/yangmatou_sign.png"
uib-tooltip="YangMaTou" ng-if="record.source=='yangmatou'"/>
{{record.order_id}}
</td>
<td ng-bind="record.cashback_amount|currency:'AUD '"></td> <td ng-bind="record.cashback_amount|currency:'AUD '"></td>
<td ng-bind="record.create_time"></td> <td ng-bind="record.create_time"></td>
<td> <td>

Loading…
Cancel
Save