From 06fc0c41c7a31986b3c524c6d8c08680ea758ed4 Mon Sep 17 00:00:00 2001
From: Alawn <alawn.cn@gmail.com>
Date: Thu, 28 Jul 2022 16:26:29 +0800
Subject: [PATCH] =?UTF-8?q?7.28=E5=8F=B7=E6=8A=95=E4=BA=A7=E5=86=85?=
 =?UTF-8?q?=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cap/etc/channel/cmb/Batch_CMB.XML     | 29 +++++++++++++++++++++++----
 cap/etc/channel/icbc/QUERY_ICBC.XML   | 26 ++++++++++++------------
 cap/etc/channel/icbc/SCAICBC2_ITF.XML |  1 +
 3 files changed, 39 insertions(+), 17 deletions(-)

diff --git a/cap/etc/channel/cmb/Batch_CMB.XML b/cap/etc/channel/cmb/Batch_CMB.XML
index d757af9..095a145 100644
--- a/cap/etc/channel/cmb/Batch_CMB.XML
+++ b/cap/etc/channel/cmb/Batch_CMB.XML
@@ -924,7 +924,7 @@
                </Exec>
             </If>
             <!--概要查询通讯成功且第三方没有返回流程实例号则该笔批次没有进入第三方系统，判断整批失败-->
-            <If condition="OR(AND(IS_EQUAL_STRING($resultcode,SUC0000),ISNULL($reqsta)),IS_EQUAL_STRING($rspcod,A6A0587))">
+            <If condition="OR(AND(IS_EQUAL_STRING($resultcode,SUC0000),ISNULL($reqsta)),IS_EQUAL_STRING($rspcod,A6A0587,A6T1208))">
                <If condition="IS_EQUAL_STRING($rspcod,A6A0587)">
                   <Set>Rsp_Cd=80</Set>
                   <Set>Rsp_Msg=付款账户余额不足</Set>
@@ -932,6 +932,25 @@
                   <Set>TRsp_Msg=账户透支</Set>
 
                </If>
+               <ElseIf condition="IS_EQUAL_STRING($rspcod,A6T1208)">
+                  <Set>Rsp_Cd=80</Set>
+                  <Set>Rsp_Msg=账户被停止支付</Set>
+                  <Set>TRsp_Cd=A6T1208</Set>
+                  <Set>TRsp_Msg=账户止付</Set>
+                  <Set>EVENT.DSK_NO=$ODSK_NAM</Set>
+                  <Set>EVENT.TITLE_NAME=$TAC_NAM</Set>
+                  <Set>EVENT.AC_NO=$TAC_NO</Set>
+                  <Set>EVENT.CORG_NO=$OCORG_NO</Set>
+                  <Set>EVT_TYP=EVT_PAYMENT_STOPPED</Set>
+                  <Exec func="PUB:InvokeService" error="IGNORE">
+                     <Arg name="ServiceName" value="PUSH_EVENT" />
+                     <Arg name='Mode' value='NOTIFY'/>
+                  </Exec>
+                  <Set>ACCT_NO=$TAC_NO</Set>
+                  <Exec func="PUB:ExecSql" error="IGNORE">
+                     <Arg name="SqlCmd" value="UPDACCTINF"/>
+                  </Exec>
+               </ElseIf>
                <Else>
                   <Set>Rsp_Cd=80</Set>
                   <Set>Rsp_Msg=银行整批处理失败</Set>
@@ -963,7 +982,9 @@
                   <Return/>
                </If>
                <Exec func="PUB:CommitWork"/>  <!--提交事务 -->
-
+               <If condition="IS_EQUAL_STRING($rspcod,A6T1208)"><!--不再查询明细信息 -->
+                  <Return/>
+               </If>
             </If>
             <If condition="IS_NOEQUAL_STRING($reqsta,FIN)">
                <Set>Rsp_Cd=80</Set>
@@ -1244,11 +1265,11 @@
                      <Arg name="SqlCmd"       value="QRY_CAPCMBRFD_OLDTXN"/>
                   </Exec>
                   <If condition="~RetCod=0">
-                  
+
                      <Exec func="PUB:ExecSql" error="IGNORE">
                         <Arg name="SqlCmd" value="updRfd"/>
                      </Exec>
-                     
+
                   </If>
                   <ElseIf condition='~RetCod=-1'>
                      <Set>Rsp_Cd=80</Set>
diff --git a/cap/etc/channel/icbc/QUERY_ICBC.XML b/cap/etc/channel/icbc/QUERY_ICBC.XML
index 090c2d7..fbb3200 100644
--- a/cap/etc/channel/icbc/QUERY_ICBC.XML
+++ b/cap/etc/channel/icbc/QUERY_ICBC.XML
@@ -51,17 +51,17 @@
             SET
             DSK_NAM
             =
-            NVL((SELECT  DSK_NAM
-            FROM CAPBATINF B
-            WHERE B.ORD_DT=A.TRS_DATE AND B.CORG_DSK_NO=A.REF
+            NVL((SELECT  C.DSK_NAM
+            FROM CAPDSKINF C
+            WHERE C.ORD_DT=A.TRS_DATE AND A.POST_SCRIPT=C.DSK_NAM
             ),' '),
             L_POSTSCRIPT
             =
             NVL((SELECT  C.POSTSCRIPT
-            FROM CAPBATINF B,CAPDSKINF C
-            WHERE B.ORD_DT=A.TRS_DATE AND B.CORG_DSK_NO=A.REF AND B.DSK_NAM=C.DSK_NAM
+            FROM CAPDSKINF C
+            WHERE C.ORD_DT=A.TRS_DATE AND A.POST_SCRIPT=C.DSK_NAM
             ),' ')
-            WHERE  ACCOUNT_NO=? AND TRS_DATE=?  AND A.REF!=' '
+            WHERE  A.ACCOUNT_NO=? AND A.TRS_DATE=?  AND A.POST_SCRIPT!=' '
          </Sentence>
          <Fields>ACCOUNT_NO|TRS_DATE|</Fields>
       </DynSentence>
@@ -296,17 +296,17 @@
             SET
             DSK_NAM
             =
-            NVL((SELECT  DSK_NAM
-            FROM CAPBATINF B
-            WHERE B.ORD_DT=A.TRS_DATE AND B.CORG_DSK_NO=A.REF
+            NVL((SELECT  C.DSK_NAM
+            FROM CAPDSKINF C
+            WHERE C.ORD_DT=A.TRS_DATE AND A.POST_SCRIPT=C.DSK_NAM
             ),' '),
             L_POSTSCRIPT
             =
             NVL((SELECT  C.POSTSCRIPT
-            FROM CAPBATINF B,CAPDSKINF C
-            WHERE B.ORD_DT=A.TRS_DATE AND B.CORG_DSK_NO=A.REF AND B.DSK_NAM=C.DSK_NAM
+            FROM CAPDSKINF C
+            WHERE C.ORD_DT=A.TRS_DATE AND A.POST_SCRIPT=C.DSK_NAM
             ),' ')
-            WHERE  ACCOUNT_NO=? AND TRS_DATE=?  AND A.REF!=' '
+            WHERE  A.ACCOUNT_NO=? AND A.TRS_DATE=?  AND A.POST_SCRIPT!=' '
          </Sentence>
          <Fields>ACCOUNT_NO|TRS_DATE|</Fields>
       </DynSentence>
@@ -330,7 +330,7 @@
          <Set>trs_date=$trs_date</Set>
          <Set>CHK_DAT=GETDATE()</Set>
          <If condition="ISNULL($trs_date)">
-            <Set>trs_date=CALCDATE($CHK_DAT,-,d,1)</Set>
+            <Set>trs_date=$CHK_DAT</Set>
          </If>
          <ElseIf condition="CHECKDATE($trs_date)!=0">
             <Set>Rsp_Cd=80</Set>
diff --git a/cap/etc/channel/icbc/SCAICBC2_ITF.XML b/cap/etc/channel/icbc/SCAICBC2_ITF.XML
index a9ed6e7..da4a72b 100644
--- a/cap/etc/channel/icbc/SCAICBC2_ITF.XML
+++ b/cap/etc/channel/icbc/SCAICBC2_ITF.XML
@@ -144,6 +144,7 @@
             <ReadElement name="busTypeNo"          ETF_name="bus_type_no"          necessary="no"         desc="回单种类"/>
             <ReadElement name="receiptInfo"        ETF_name="receipt_info"         necessary="no"         desc="回单信息"/>
             <ReadElement name="telNo"              ETF_name="tel_no"               necessary="no"         desc="交易柜员"/>
+            <ReadElement name="tranSerialNo"       ETF_name="tran_serial_no"       necessary="no"         desc="回单流水"/>            
             <ReadElement name="mdcardno"           ETF_name="mdcardno"             necessary="no"         desc="管家卡号"/>
             <AddItem name="ROOT.RDNUM"      expression="ADD($ROOT.RDNUM,1)"/>
             <AddItem name="T_JNL_NO"    expression="STRCAT($ROOT.TF_SEQ_NO,ADDCHAR($ROOT.RDNUM,4,0,1))" />