From f66c2cdd113f454ae84b87f76ba2ab844bcc797e Mon Sep 17 00:00:00 2001
From: Alawn <alawn.cn@gmail.com>
Date: Wed, 12 May 2021 15:41:29 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=90=88=E4=BD=9C=E6=9C=BA=E6=9E=84=E8=B6=85?=
 =?UTF-8?q?=E6=97=B6=E5=A2=9E=E5=8A=A0=E7=8A=B6=E6=80=81=E4=B8=BA2?=
 =?UTF-8?q?=E6=88=90=E5=8A=9F=E5=88=A4=E6=96=AD2.=E5=9B=9E=E7=9B=98?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=BF=AE=E6=94=B9=E9=93=B6=E8=A1=8C=E5=90=8D?=
 =?UTF-8?q?=E7=A7=B03.=E5=B7=A5=E8=A1=8C=E6=9F=A5=E8=AF=A2=E7=BB=93?=
 =?UTF-8?q?=E6=9E=9C=E5=A2=9E=E5=8A=A0=E9=94=99=E8=AF=AF=E7=A0=81=E5=88=A4?=
 =?UTF-8?q?=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cap/etc/batch/BAT_DSK_CORG_TIMEOUT_CTL.XML |  2 +-
 cap/etc/batch/DISKRESULLT_PKG.XML          | 10 +++++-----
 cap/etc/channel/icbc/BATCH_ICBC.XML        | 12 ++++++++++++
 3 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/cap/etc/batch/BAT_DSK_CORG_TIMEOUT_CTL.XML b/cap/etc/batch/BAT_DSK_CORG_TIMEOUT_CTL.XML
index 527a970..e2468ac 100644
--- a/cap/etc/batch/BAT_DSK_CORG_TIMEOUT_CTL.XML
+++ b/cap/etc/batch/BAT_DSK_CORG_TIMEOUT_CTL.XML
@@ -9,7 +9,7 @@
             <Sentence>
                 select listagg(dsk) WITHIN GROUP(ORDER BY dsk) dsk from
                 (select  '['||DSK_NAM||','||CORG_DSK_NO||','||BAT_STS||','||CORG_NO||']' dsk from CAPBATINF
-                where BAT_STS &lt;&gt; '4' and
+                where BAT_STS &lt;&gt; '4' and  BAT_STS &lt;&gt; '2'  and 
                 TO_CHAR(TO_DATE(snd_dt||snd_tm, 'yyyymmddHH24MISS')+'%s'/24/60, 'yyyymmddHH24MISS') &lt;= TO_CHAR(sysdate,'yyyymmddHH24MISS'))
             </Sentence>
             <Fields>MINUTE</Fields>
diff --git a/cap/etc/batch/DISKRESULLT_PKG.XML b/cap/etc/batch/DISKRESULLT_PKG.XML
index 4b6cc42..334e69e 100644
--- a/cap/etc/batch/DISKRESULLT_PKG.XML
+++ b/cap/etc/batch/DISKRESULLT_PKG.XML
@@ -21,11 +21,11 @@
         </DynSentence>
         <DynSentence name="QRY_CAPTXNJNL">
             <Sentence>
-                select ORD_DT,tm_smp LAST_TIME,CRD_FLG ACCT_TYPE,AC_NO ACCT_NO,CUS_NAM ACCT_NAME,CAP_ORD_NO TRANS_ID,
-                MERC_ORD_NO REF_ID,CORG_JRN_NO BANK_REF_ID, TXN_AMT AMOUNT,BNK_TYP BANK_TYPE,POSTSCRIPT,
-                TAC_NO PAYER_ACCT_NO,TAC_NAM PAYER_ACCT_NAME, CORG_NO ORG_NO,RMK REMARK,
-                TXN_STS TRANS_STS,RSP_MSG RESP_MESSAGE
-                from CAPTXNJNL t where t.dsk_nam = '%s' and ORD_DT = '%s' order by MERC_ORD_NO
+                select t.ORD_DT,t.tm_smp LAST_TIME,t.CRD_FLG ACCT_TYPE,t.AC_NO ACCT_NO,t.CUS_NAM ACCT_NAME,t.CAP_ORD_NO TRANS_ID,
+                t.MERC_ORD_NO REF_ID,t.CORG_JRN_NO BANK_REF_ID, t.TXN_AMT AMOUNT,a.CORG_NM BANK_TYPE,t.POSTSCRIPT,
+                t.TAC_NO PAYER_ACCT_NO,t.TAC_NAM PAYER_ACCT_NAME, t.CORG_NO ORG_NO,t.RMK REMARK,
+                t.TXN_STS TRANS_STS,t.RSP_MSG RESP_MESSAGE
+                from CAPTXNJNL t,CMMTORGN a  where t.dsk_nam = '%s' and ORD_DT = '%s' and t.CORG_NO = a.CORP_ORG  order by MERC_ORD_NO
             </Sentence>
             <Fields>DSK_NAM|ORD_DT|</Fields>
         </DynSentence>
diff --git a/cap/etc/channel/icbc/BATCH_ICBC.XML b/cap/etc/channel/icbc/BATCH_ICBC.XML
index d8a38bd..0966ed8 100644
--- a/cap/etc/channel/icbc/BATCH_ICBC.XML
+++ b/cap/etc/channel/icbc/BATCH_ICBC.XML
@@ -906,6 +906,18 @@
 
 
                </ElseIf>
+               <ElseIf condition="INTCMP($TRSP_CD,1,0)"> <!--错误码为负数，代表系统异常，存在可疑账需要重新获取交易明细-->
+                  <Set>SMS_FLAG=0</Set>
+                  <Set>BAT_STS=3</Set>
+                  <Exec func="PUB:ExecSql" error="IGNORE">
+                     <Arg name="SqlCmd"    value="UpdCUPS_DSK_NO"/>
+                  </Exec>
+                  <If condition="~RetCod != 0">
+                     <Set>Rsp_Cd=80</Set>
+                     <Set>Rsp_Msg=更新该批次为发送处理状态失败</Set>
+                     <Break/>
+                  </If>
+               </ElseIf>                  
                <Else> <!--其他错误-->
                   <Set>BAT_STS=5</Set>
                   <!--更新批次信息-->