From e14be09c64150fe7245b8239b5c5bdd1ebd64dbc Mon Sep 17 00:00:00 2001
From: Alawn <alawn.cn@gmail.com>
Date: Tue, 9 Mar 2021 10:16:43 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cap/etc/batch/204025_CTL.XML        | 18 +++++++++---------
 cap/etc/channel/icbc/BATCH_ICBC.XML |  3 ---
 cap/etc/extra/CAP_EXT_LMT_PKG.XML   |  6 +++---
 3 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/cap/etc/batch/204025_CTL.XML b/cap/etc/batch/204025_CTL.XML
index aa1b2c4..0ad1b3a 100644
--- a/cap/etc/batch/204025_CTL.XML
+++ b/cap/etc/batch/204025_CTL.XML
@@ -90,8 +90,8 @@
             <Sentence>
                 UPDATE SUMLMTRLR
                 SET DAY_AMT= DAY_AMT - %s/100,
-                MTH_AMT = MTH_AM - %s/100,
-                YAR_AMT = MTH_AM - %s/100,
+                MTH_AMT = MTH_AMT - %s/100,
+                YAR_AMT = YAR_AMT - %s/100,
                 DAY_CNT = DAY_CNT - %s,
                 MTH_CNT = MTH_CNT - %s,
                 YAR_CNT = YAR_CNT - %s
@@ -439,13 +439,13 @@
             <Set>IN.DSK_NO=$DSK_NO</Set>
             <Set>IN.MERC_ID=$MERC_ID</Set>
             <Set>IN.LMT_NM=$LMT_NM</Set>
-            <Set>IN.EXT_LMT_DAY=$OUT.EXT_LMT_DAY</Set>
-            <Set>IN.EXT_LMT_MTH=$OUT.EXT_LMT_MTH</Set>
-            <Set>IN.EXT_LMT_YAR=$OUT.EXT_LMT_YAR</Set>
-            <Set>IN.DAY_AMT=$OUT.DAY_AMT</Set>
-            <Set>IN.MTH_AMT=$OUT.MTH_AMT</Set>
-            <Set>IN.YAR_AMT=$OUT.YAR_AMT</Set>
-            <Set>IN.ORD_DT=$RD_DT</Set>
+            <Set>IN.EXT_LMT_DAY=@O.OUT.EXT_LMT_DAY</Set>
+            <Set>IN.EXT_LMT_MTH=@O.OUT.EXT_LMT_MTH</Set>
+            <Set>IN.EXT_LMT_YAR=@O.OUT.EXT_LMT_YAR</Set>
+            <Set>IN.DAY_AMT=@O.OUT.DAY_AMT</Set>
+            <Set>IN.MTH_AMT=@O.OUT.MTH_AMT</Set>
+            <Set>IN.YAR_AMT=@O.OUT.YAR_AMT</Set>
+            <Set>IN.ORD_DT=$ORD_DT</Set>
             <Call package="CEL" function="MERC_AMT_QTM_VERIFY2">
                 <Input>IN|</Input>
                 <Output>MSG_CD|EVT_TYP|EVT_DSC|</Output>
diff --git a/cap/etc/channel/icbc/BATCH_ICBC.XML b/cap/etc/channel/icbc/BATCH_ICBC.XML
index 370b57d..bb5c79b 100644
--- a/cap/etc/channel/icbc/BATCH_ICBC.XML
+++ b/cap/etc/channel/icbc/BATCH_ICBC.XML
@@ -341,7 +341,6 @@
          <Set>CORG_DSK_NO=$CORG_DSK_NO</Set>
          <Set>CORG_MERC_ID=$CORG_MERC_ID</Set>
          <Set>TACC_TM=$TACC_TM</Set>
-         <Set>TXN_TM=SUBSTR(GETDATETIME(),9,6)</Set>
          <Set>BAT_TYP=$BAT_TYP</Set>
          <Set>RSP_CD=STRCAT( , )</Set>
          <Set>RSP_MSG=STRCAT( , )</Set>
@@ -349,8 +348,6 @@
          <!--第三方数据拼接 -->
          <Set>CIS=$GRP_CIS</Set>                <!--集团CIS号 必输项 字符 60 客户注册时的归属编码(发卡机构代码) -->
          <Set>Bank_Code=102</Set>            <!--归属银行编号 必输项 长度为3 客户注册时的归属单位 -->
-         <Set>TranDate=GETDATE()</Set>            <!--交易日期 必输项 字符 8 ERP系统产生的交易日期，格式是yyyyMMdd -->
-         <Set>TranTime=STRCAT(GETDATETIME(HHMISS),000)</Set>            <!--交易时间 必输项 字符 12 字符 8 ERP系统产生的交易时间，格式如HHmmssSSS，精确到毫秒； -->
 
          <Set>PayAccNameEN=STRCAT( , )</Set>
          <Set>RecAccNameEN=STRCAT( , )</Set>
diff --git a/cap/etc/extra/CAP_EXT_LMT_PKG.XML b/cap/etc/extra/CAP_EXT_LMT_PKG.XML
index 86cb15c..4cd869c 100644
--- a/cap/etc/extra/CAP_EXT_LMT_PKG.XML
+++ b/cap/etc/extra/CAP_EXT_LMT_PKG.XML
@@ -2152,7 +2152,7 @@
     </Function>
 
     <Function name="MERC_AMT_QTM_VERIFY2" desc="商户实时限额判断">
-        <Input>CAP_TYP|DSK_NO|MERC_ID|TXN_MAK|LMT_NM|EXT_LMT_DAY|EXT_LMT_MTH|EXT_LMT_YAR|ORD_DT|</Input>
+        <Input>IN</Input>
         <Output>MSG_CD|EVT_TYP|EVT_DSC</Output>
         <DynSentence name="QRY_URMLMTRLR">
             <Sentence>
@@ -2446,8 +2446,8 @@
             <Sentence>
                 UPDATE SUMLMTRLR
                 SET DAY_AMT= DAY_AMT + %s/100,
-                MTH_AMT = MTH_AM + %s/100,
-                YAR_AMT = MTH_AM + %s/100,
+                MTH_AMT = MTH_AMT + %s/100,
+                YAR_AMT = YAR_AMT + %s/100,
                 DAY_CNT = DAY_CNT +%s,
                 MTH_CNT = MTH_CNT +%s,
                 YAR_CNT = YAR_CNT +%s