From 0bcbba9b23c6d359fa163afd9512392031dc6dab Mon Sep 17 00:00:00 2001
From: "james.zhao" <james.zhao@globalfreepay.com>
Date: Tue, 30 Oct 2018 20:32:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=87=E5=9C=A3=E8=8A=82=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E6=AC=A1=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../manage/mappers/payment/OrderMapper.java   |  1 -
 .../manage/mappers/payment/OrderMapper.xml    | 23 +++++++++++++++++--
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/payment/OrderMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/payment/OrderMapper.java
index 49ccef8e9..cb0a76396 100644
--- a/src/main/java/au/com/royalpay/payment/manage/mappers/payment/OrderMapper.java
+++ b/src/main/java/au/com/royalpay/payment/manage/mappers/payment/OrderMapper.java
@@ -82,6 +82,5 @@ public interface OrderMapper {
 
     JSONObject findOrderById(@Param("order_id") String orderId);
 
-    @AutoSql(type = SqlType.SELECT)
     List<JSONObject> listHalloweenActOrder(JSONObject param);
 }
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 ad184d835..1e8d8bafb 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
@@ -738,5 +738,24 @@
             <if test="clearing_status!=null">and t.clearing_status=#{clearing_status}</if>
         </where>
     </select>
-
-</mapper>
\ No newline at end of file
+    <select id="listHalloweenActOrder" resultType="com.alibaba.fastjson.JSONObject">
+        <![CDATA[
+        SELECT
+        o.order_id                                 order_id,
+        o.currency,
+        o.channel,
+        o.customer_id
+        format(t.clearing_amount,2)                clearing_amount
+        FROM pmt_orders o
+        LEFT JOIN pmt_transactions t
+        ON t.order_id = o.order_id
+        AND t.refund_id IS NULL
+        AND t.transaction_type = 'Credit'
+        AND t.channel != 'System'
+        and o.transaction_date = #{transaction_date}
+        and o.status = #{status}
+        and o.customer_id = #{customer_id}
+        and t.clearing_amount >= 1.99
+         ]]>
+</select>
+</mapper>