From 3f8cff5a8006fee177a5cc82d4d1ac8cbdcee7fd Mon Sep 17 00:00:00 2001
From: yixian <astro.dai@royalpay.com.au>
Date: Tue, 24 Nov 2020 18:25:36 +1100
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=B4=A6=E5=8D=95=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8Dsql?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../manage/mappers/payment/RefundMapper.java  |  2 --
 .../manage/mappers/payment/OrderMapper.xml    | 20 ++++++-------------
 .../manage/mappers/payment/RefundMapper.xml   |  4 ++++
 3 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/payment/RefundMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/payment/RefundMapper.java
index 6284d9064..dd4926da6 100644
--- a/src/main/java/au/com/royalpay/payment/manage/mappers/payment/RefundMapper.java
+++ b/src/main/java/au/com/royalpay/payment/manage/mappers/payment/RefundMapper.java
@@ -45,8 +45,6 @@ public interface RefundMapper {
     @AutoSql(SqlType.SELECT)
     JSONObject findByOutRefundId(@Param("out_refund_id") String outRefundNo);
 
-    @AutoSql(SqlType.SELECT)
-    @AdvanceSelect(addonWhereClause = "status=4 and confirm_time is not null and refund_id not in (select refund_id from pmt_transactions where refund_id is not null)")
     List<JSONObject> listConfirmedRefundsWithNoTransactions();
 
     JSONObject findRefundInfoByDay(@Param("begin") Date begin, @Param("end") Date end);
diff --git a/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/OrderMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/OrderMapper.xml
index b03e0d00d..e0f911fc8 100644
--- a/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/OrderMapper.xml
+++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/OrderMapper.xml
@@ -758,20 +758,12 @@
     </select>
     <select id="listOrdersWithNoTransactions" resultType="com.alibaba.fastjson.JSONObject">
         <![CDATA[
-
-
-
-                SELECT
-                    o.order_id,
-                    o.channel
-                FROM pmt_orders o
-                WHERE o.order_id NOT IN (
-                    SELECT DISTINCT order_id
-                    FROM pmt_transactions
-                    WHERE transaction_type = 'Credit') AND o.status >= 5 AND o.customer_payment_amount > 0
-
-
-
+        SELECT
+            o.order_id,
+            o.channel
+        FROM pmt_orders o
+        left join pmt_transactions t on t.order_id=t.order_id and t.transaction_type='Credit'
+        where t.order_id=null and o.status >= 5 AND o.customer_payment_amount > 0
         ]]>
     </select>
 
diff --git a/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/RefundMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/RefundMapper.xml
index 0bc54e7fb..ee43e6e60 100644
--- a/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/RefundMapper.xml
+++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/RefundMapper.xml
@@ -128,4 +128,8 @@
         </where>
         order by create_time desc
     </select>
+    <select id="listConfirmedRefundsWithNoTransactions" resultType="com.alibaba.fastjson.JSONObject">
+        select r.refund_id,r.order_id from pmt_refunds r left join pmt_transactions t on t.refund_id=r.refund_id
+        where r.status=4 and confirm_time is not null and t.refund_id is null
+    </select>
 </mapper>
\ No newline at end of file