From 61ebeaebebf98c94c5bc213e7df130cb865311f4 Mon Sep 17 00:00:00 2001
From: Alawn <alawn.cn@gmail.com>
Date: Tue, 9 Nov 2021 16:17:17 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=8B=9B=E8=A1=8C?=
 =?UTF-8?q?=E5=91=8A=E8=AD=A6=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cap/etc/channel/cmb/Batch_CMB.XML | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/cap/etc/channel/cmb/Batch_CMB.XML b/cap/etc/channel/cmb/Batch_CMB.XML
index ae74834..81f6389 100644
--- a/cap/etc/channel/cmb/Batch_CMB.XML
+++ b/cap/etc/channel/cmb/Batch_CMB.XML
@@ -598,7 +598,7 @@
             <Set>EVENT.DSK_NO=$DSK_NAM</Set>
             <Set>EVENT.BAT_NO=$CORG_DSK_NO</Set>
             <Set>EVENT.ERR_MSG=招行送盘通道返回异常！</Set>
-            <Set>EVT_TYP=EVT_CMB_SENDBATCH_CHANEL</Set>
+            <Set>EVT_TYP=EVT_BATCH_SEND_FAILURE</Set>
             <Exec func="PUB:InvokeService" error="IGNORE">
                <Arg name="ServiceName" value="PUSH_EVENT" />
                <Arg name='Mode' value='NOTIFY'/>
@@ -886,7 +886,7 @@
                <Set>EVENT.DSK_NO=$ODSK_NAM</Set>
                <Set>EVENT.BAT_NO=$OCORG_DSK_NO</Set>
                <Set>EVENT.ERR_MSG=招行回盘通道返回异常！</Set>
-               <Set>EVT_TYP=EVT_CMB_GETBATCH_CHANEL</Set>
+               <Set>EVT_TYP=EVT_BATCH_BACK_FAILURE</Set>
                <Exec func="PUB:InvokeService" error="IGNORE">
                   <Arg name="ServiceName" value="PUSH_EVENT" />
                   <Arg name='Mode' value='NOTIFY'/>
@@ -909,7 +909,7 @@
                <!--账户透支 发送预警-->
                <Set>EVENT.DRW_AC_BAL=0.01</Set>
                <Set>EVENT.UDRW_AC_BAL=0.02</Set>
-               <Set>EVT_TYP=EVT_ORG_AMT_OFW</Set>
+               <Set>EVT_TYP=EVT_BALANCE_INSUFFICIENT</Set>
                <Exec func="PUB:InvokeService" error="IGNORE">
                   <Arg name="ServiceName" value="PUSH_EVENT" />
                   <Arg name='Mode' value='NOTIFY'/>

From dcffc9a70345931ce322250684df56716c6c6fea Mon Sep 17 00:00:00 2001
From: Alawn <alawn.cn@gmail.com>
Date: Tue, 9 Nov 2021 16:25:03 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=A4=A7=E6=89=B9=E6=8C=89=E7=85=A7?=
 =?UTF-8?q?=E6=8E=A5=E6=94=B6=E6=97=B6=E9=97=B4=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cap/etc/batch/BAT_GET_DISK_RESULT_CTL.XML | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/cap/etc/batch/BAT_GET_DISK_RESULT_CTL.XML b/cap/etc/batch/BAT_GET_DISK_RESULT_CTL.XML
index 8854fff..330c6ad 100644
--- a/cap/etc/batch/BAT_GET_DISK_RESULT_CTL.XML
+++ b/cap/etc/batch/BAT_GET_DISK_RESULT_CTL.XML
@@ -7,11 +7,12 @@
         <DynSentence name="QryBatLst">
             <Sentence>
                 select DSK_NAM from capdskinf where DSK_NAM in
+                (select DSK_NAM from (select DSK_NAM, row_number() over (order by RCV_DT||RCV_TM asc) tm from capdskinf where DSK_NAM in
                 (select DSK_NAM from capdskinf a where dsk_sts = '1'  and ord_dt &gt;= ?  and (dsk_nam,0) in
                 (select dsk_nam,sum(case when bat_sts not in ('4', '2') then 1 else 0 end) notfinal from capbatinf
                 where ord_dt = a.ord_dt and dsk_nam = a.DSK_NAM group by dsk_nam having sum(case when bat_sts not in ('4', '2') then 1 else 0 end) = 0)
-                union all  select DSK_NAM from CAPDSKINF a where a.dsk_sts = '9' and ORD_DT &gt;= ?)
-                and rownum = 1 for update skip locked
+                union all  select DSK_NAM from CAPDSKINF a where a.dsk_sts = '9' and ORD_DT &gt;= ?)) where tm = 1)
+                for update skip locked
             </Sentence>
             <Fields>DT_BEFER|DT_BEFER|</Fields>
         </DynSentence>