From e7ebba859dda91ad7098bd72a6cefd6e92ee2f87 Mon Sep 17 00:00:00 2001
From: Alawn <alawn.cn@gmail.com>
Date: Fri, 20 Aug 2021 17:02:50 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E9=93=B6=E8=A1=8C=E9=80=9A=E9=81=93?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=93=B6=E8=A1=8C=E6=B5=81=E6=B0=B4=E5=8F=B7?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cap/etc/channel/cmb/Batch_CMB.XML   | 2 +-
 cap/etc/channel/icbc/BATCH_ICBC.XML | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/cap/etc/channel/cmb/Batch_CMB.XML b/cap/etc/channel/cmb/Batch_CMB.XML
index 6af1e68..ae74834 100644
--- a/cap/etc/channel/cmb/Batch_CMB.XML
+++ b/cap/etc/channel/cmb/Batch_CMB.XML
@@ -693,7 +693,7 @@
             ERR_DSP,
             decode(TTXN_ST,'S','00',80) rsp_cd,
             decode(TTXN_ST,'S','交易成功',ERR_DSP) RSP_MSG,
-            REQ_NBR CORG_JRN_NO,
+            B.TRX_SEQ CORG_JRN_NO,
             to_char(sysdate,'yyyymmddhh24miss')  TM_SMP
             FROM CAPCMBPERD B
             WHERE B.TRX_SEQ = A.TRX_SEQ AND B.YUR_REF=A.CORG_DSK_NO
diff --git a/cap/etc/channel/icbc/BATCH_ICBC.XML b/cap/etc/channel/icbc/BATCH_ICBC.XML
index 8bebb10..3489d3a 100644
--- a/cap/etc/channel/icbc/BATCH_ICBC.XML
+++ b/cap/etc/channel/icbc/BATCH_ICBC.XML
@@ -598,7 +598,7 @@
          <Sentence>
             UPDATE CAPTXNJNL A
             SET
-            (TTXN_ST,TXN_STS,DSK_NAM_STS,TACC_DT,TACC_TM,TRSP_CD,TRSP_MSG,RSP_MSG,TM_SMP)
+            (TTXN_ST,TXN_STS,DSK_NAM_STS,TACC_DT,TACC_TM,TRSP_CD,TRSP_MSG,RSP_MSG,CORG_JRN_NO,TM_SMP)
             =
             ( SELECT TTXN_ST TTXN_ST,
             TTXN_ST TXN_STS,
@@ -608,6 +608,7 @@
             TRSP_CD,
             TRSP_MSG,
             TRSP_MSG,
+            I_SEQ_NO CORG_JRN_NO,
             to_char(sysdate,'yyyymmddhh24miss')  TM_SMP
             FROM CAPICBCPERDTMP B
             WHERE B.QRY_I_SEQ_NO = A.CAP_ORD_NO

From f935c753a7f652ffa89657af1b2e3f861ce1aa80 Mon Sep 17 00:00:00 2001
From: Alawn <alawn.cn@gmail.com>
Date: Wed, 25 Aug 2021 15:04:43 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=91=8A=E8=AD=A6?=
 =?UTF-8?q?=E8=8A=82=E7=82=B9=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cap/etc/rrc/PUSH_EVENT.XML | 1 +
 1 file changed, 1 insertion(+)

diff --git a/cap/etc/rrc/PUSH_EVENT.XML b/cap/etc/rrc/PUSH_EVENT.XML
index 8a15be0..7800aa0 100644
--- a/cap/etc/rrc/PUSH_EVENT.XML
+++ b/cap/etc/rrc/PUSH_EVENT.XML
@@ -78,6 +78,7 @@
 
          <Set>ALERT_NAME=$EVT.EVT_TYP</Set>
          <Set>SUMMARY=$EVT.EVT_DSC</Set>
+         <Set>SMS_INF=STRCAT($SMS_INF,"(",instance=,@SYS.ics.sys.nodeid,;time=,GETDATETIME(yyyy-MM-dd HH:mm:ss),")")</Set>
          <Set>DESCRIPTION=$SMS_INF</Set>
          <Exec func="PUB:CallThirdComm" error="IGNORE">
             <Arg name="HTxnCd" value="alert" />