From a1da428d5655b8783086665ddb65f966820a7277 Mon Sep 17 00:00:00 2001
From: liuxinxin <xinxin.liu@geekforbest.com>
Date: Tue, 19 Nov 2019 10:07:42 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90R=E3=80=91=E5=95=86=E6=88=B7=E7=AB=AF&?=
 =?UTF-8?q?=E8=BF=90=E8=90=A5=E7=AB=AF=E8=AE=A2=E5=8D=95source=E5=A4=84?=
 =?UTF-8?q?=E7=90=86=20fix?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../manage/mappers/cashback/CashbackRecordsMapper.xml     | 4 ++--
 .../cashback/templates/partner_cashback_records.html      | 8 +++++++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/main/resources/au/com/royalpay/payment/manage/mappers/cashback/CashbackRecordsMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/cashback/CashbackRecordsMapper.xml
index c511a96e9..d9ce45e15 100644
--- a/src/main/resources/au/com/royalpay/payment/manage/mappers/cashback/CashbackRecordsMapper.xml
+++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/cashback/CashbackRecordsMapper.xml
@@ -19,8 +19,8 @@
 
 
     <select id="getCashbackRecores" resultType="com.alibaba.fastjson.JSONObject">
-        SELECT c.*,p.client_moniker,p.short_name FROM cashback_records c
-        INNER JOIN sys_clients p on c.client_id=p.client_id
+        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 pmt_orders o on c.order_id = o.order_id
         <where>
             <if test="client_ids!=null">
                 AND c.client_id IN
diff --git a/src/main/ui/static/cashback/templates/partner_cashback_records.html b/src/main/ui/static/cashback/templates/partner_cashback_records.html
index 99b0fb028..cbf156d71 100644
--- a/src/main/ui/static/cashback/templates/partner_cashback_records.html
+++ b/src/main/ui/static/cashback/templates/partner_cashback_records.html
@@ -80,7 +80,13 @@
                                     <tbody>
                                     <tr ng-repeat="record in records">
                                         <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.create_time"></td>
                                         <td>