diff --git a/pom.xml b/pom.xml index eef42473c..ab656a9ea 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ 4.0.0 manage - 1.3.62 + 1.3.63 UTF-8 1.8.0 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 bbcb11c6c..4777e7c9c 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 @@ -922,7 +922,8 @@ t.settle_amount, t.clearing_status = 2 pre_auth from pmt_orders o - left join pmt_transactions t on t.order_id=o.order_id and t.channel!='Settlement' and t.system_generate=0 + left join pmt_transactions t on t.order_id=o.order_id and t.channel!='Settlement' + AND (t.system_generate = 0 or (t.system_generate = 1 and t.remark like '%RYCBSM%')) AND o.client_id IN