From a1c93b1683d2019ca49f56b1c9801bd0a968056a Mon Sep 17 00:00:00 2001
From: Alawn <alawn.cn@gmail.com>
Date: Mon, 19 Apr 2021 18:07:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=81=94=E8=A1=8C=E5=8F=B7?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=A4=B1=E8=B4=A5=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cap/etc/batch/204025_CTL.XML | 31 ++++++++++++++++++++-----------
 1 file changed, 20 insertions(+), 11 deletions(-)

diff --git a/cap/etc/batch/204025_CTL.XML b/cap/etc/batch/204025_CTL.XML
index b7ca04c..4a77a36 100644
--- a/cap/etc/batch/204025_CTL.XML
+++ b/cap/etc/batch/204025_CTL.XML
@@ -101,15 +101,15 @@
         </DynSentence>
         <DynSentence name="QRY_LBNKNO">
             <Sentence>
-                select A.BNK_CD,B.PTY_ID,B.PTY_NM from CMMTBKTYP A,CAPCOMPTY B
-                WHERE A.BNK_TYP = ? AND A.BNK_CD = B.BKCTGY_CD AND B.PTY_KND = 'PBC' AND trim(A.BNK_CD) != ''
+                select A.BNK_CD,B.PTY_ID,B.PTY_NM,B.PTYALS_NM from CMMTBKTYP A,CAPCOMPTY B
+                WHERE A.BNK_TYP = ? AND A.BNK_CD = B.BKCTGY_CD AND B.PTY_KND = 'PBC' AND trim(A.BNK_CD) is not null
             </Sentence>
             <Fields>BNK_TYP|</Fields>
         </DynSentence>
 
         <DynSentence name="QRY_LBNKNO2">
             <Sentence>
-                select B.PTY_ID,B.PTY_NM from CAPCOMPTY B
+                select B.PTY_ID,B.PTY_NM,B.PTYALS_NM from CAPCOMPTY B
                 WHERE B.BKCTGY_CD = ? AND B.PTY_KND = 'PBC'
             </Sentence>
             <Fields>BNK_CD|</Fields>
@@ -419,6 +419,13 @@
 
                     <Set>TXN_AMT2=AMTPOWER($TXN_AMT,2)</Set>
 
+                    <Set>CAPTXNJNL.ROUT_FLG=$ROUT_FLG</Set>
+                    <Set>CAPTXNJNL.CORG_NO=$CORG_NO</Set>
+                    <If condition="AND(IS_EQUAL_STRING($CORG_NO,ICBC),OR(IS_EQUAL_STRING($ROUT_FLG,LARGE),IS_EQUAL_STRING($ROUT_FLG,SMALL)))">
+                        <Set>CAPTXNJNL.LBNK_NAM=$PTYALS_NM</Set><!--联行名称-->
+                    </If>
+
+
                     <!--查询支付地账户-->
                     <Exec func="PUB:ReadRecord" error="IGNORE">
                         <Arg name="SqlCmd" value="QRY_CAPACCOUNTINF"/>
@@ -434,14 +441,6 @@
                     <Set>ACT_FLG=$ACT_FLG</Set>
                     <Set>ACT_FLG=PL</Set>
 
-                    <Quote name="GET_JRN_NO"/>                     <!--取交易流水号-->
-                    <Quote name="GET_CAP_ORD_NO"/>
-                    <Set>CAPTXNJNL.JRN_NO=$JRN_NO</Set>
-                    <Set>CAPTXNJNL.CAP_ORD_NO=$CAP_ORD_NO</Set>
-                    <!--计算商户手续费-->
-                    <Set>CAPTXNJNL.MERC_FEE_AMT=0</Set>   <!-- 手续费 -->
-                    <Set>CAPTXNJNL.AC_DT=$AC_DT</Set>
-
                     <Set>TXN_AMT2=AMTPOWER($CAPTXNJNL.TXN_AMT,2)</Set>
                     <!--客户批量限额判断-->
                     <Call package="CEL" function="MERC_AMT_QTM_VERIFY">
@@ -460,7 +459,15 @@
                         <Set>TIM_RAG.MTH_AMT=ADD($TIM_RAG.MTH_AMT,$TXN_AMT2)</Set><!--当月交易金额累加-->
                         <Set>TIM_RAG.YAR_AMT=ADD($TIM_RAG.YAR_AMT,$TXN_AMT2)</Set><!--当月交易金额累加-->
                     </Else>
+
                 </If>
+                <Quote name="GET_JRN_NO"/>                     <!--取交易流水号-->
+                <Quote name="GET_CAP_ORD_NO"/>
+                <Set>CAPTXNJNL.JRN_NO=$JRN_NO</Set>
+                <Set>CAPTXNJNL.CAP_ORD_NO=$CAP_ORD_NO</Set>
+                <!--计算商户手续费-->
+                <Set>CAPTXNJNL.MERC_FEE_AMT=0</Set>   <!-- 手续费 -->
+                <Set>CAPTXNJNL.AC_DT=$AC_DT</Set>
 
                 <!--预记代收流水-->
                 <Exec func="PUB:InsertRecord" error="IGNORE">
@@ -493,6 +500,8 @@
                 <Delete>CAPTXNJNL</Delete>
                 <Delete>CRD_FLG</Delete>
                 <Delete>CRD_NM</Delete>
+                <Delete>PTYALS_NM</Delete>
+
             </While>
 
             <!--关闭游标-->