From 1ed3e2049eb68e65cb6bf791d21047d1d1b7e84f Mon Sep 17 00:00:00 2001
From: Alawn <alawn.cn@gmail.com>
Date: Mon, 15 Mar 2021 10:21:05 +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/SVRLST.XML                  |  6 +-
 cap/etc/batch/204025_CTL.XML        | 59 +++++++++++++++-----
 cap/etc/batch/RTR_PKG.XML           | 86 ++---------------------------
 cap/etc/channel/hro/SCAHRO2_ATR.XML |  2 +-
 cap/etc/channel/hro/SCAHRO3_ATR.XML |  2 +-
 5 files changed, 54 insertions(+), 101 deletions(-)

diff --git a/cap/etc/SVRLST.XML b/cap/etc/SVRLST.XML
index e683480..cc8b1ef 100644
--- a/cap/etc/SVRLST.XML
+++ b/cap/etc/SVRLST.XML
@@ -12,9 +12,9 @@
         <Server name="OTATEST1" min="1" max="1" config_file="etc/test/OTATEST1_ATR.XML"        desc="TEST" />
         <Server name="CCAHRO1" min="1" max="1" config_file="etc/api/CCAHRO1_ATR.XML"        desc="HRO" />
         <Server name="OFRTCAP2" min="1" max="1" config_file="etc/batch/OFRTCAP2_ATR.XML"        desc="HRO" />
-        <Server name="SCAHRO1" min="1" max="1" config_file="etc/test/SCAHRO1_ATR.XML"        desc="Token验证" />
-        <Server name="SCAHRO2" min="1" max="1" config_file="etc/test/SCAHRO2_ATR.XML"        desc="短信发送" />
-        <Server name="SCAHRO3" min="1" max="1" config_file="etc/test/SCAHRO3_ATR.XML"        desc="回盘通知" />
+        <!--Server name="SCAHRO1" min="1" max="1" config_file="etc/test/SCAHRO1_ATR.XML"        desc="Token验证" /-->
+        <Server name="SCAHRO2" min="1" max="1" config_file="etc/channel/hro/SCAHRO2_ATR.XML"        desc="短信发送" />
+        <Server name="SCAHRO3" min="1" max="1" config_file="etc/channel/hro/SCAHRO3_ATR.XML"        desc="回盘通知" />
         <Server name="SCAICBC" min="1" max="1" config_file="etc/channel/icbc/SCAICBC_ATR.XML"        desc="工商银行新批量收付SCA服务" />
     </Group>
 </FrontTab>
diff --git a/cap/etc/batch/204025_CTL.XML b/cap/etc/batch/204025_CTL.XML
index dc05e08..2640b70 100644
--- a/cap/etc/batch/204025_CTL.XML
+++ b/cap/etc/batch/204025_CTL.XML
@@ -99,6 +99,13 @@
             </Sentence>
             <Fields>ORN_AMT|ORN_AMT|ORN_AMT|ORN_CNT|ORN_CNT|ORN_CNT|MERC_ID|</Fields>
         </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_TYP = B.BKCTGY_CD AND B.PTY_KND = 'PBC'
+            </Sentence>
+            <Fields>BNK_TYP|</Fields>
+        </DynSentence>
 
         <Function name="_after">
             <Process>
@@ -288,6 +295,34 @@
 
                 <Set>CAPTXNJNL.CRD_NO=$CAPTXNJNL.ACCT_NO</Set>
                 <Set>CAPTXNJNL.AC_NO=$CAPTXNJNL.ACCT_NO</Set>
+                <Set>AC_NO=$CAPTXNJNL.AC_NO</Set>
+                <!--查询银行卡信息-->
+                <Exec func="ATMPTC:GetCrdFlg">
+                    <Arg name="Table" value="CMMTUFIT"/>
+                    <Arg name="Trk2" value="$TRACK_2"/>
+                    <Arg name="Trk3" value="$TRACK_3"/>
+                    <Arg name="CrdNo" value="$AC_NO"/>
+                </Exec>
+
+                <Set>RTR_IN.BNK_TYP=$BNK_TYP</Set>
+                <Set>RTR_IN.CRD_FLG=$CRD_FLG</Set>
+                <Set>RTR_IN.CRD_NM=$CRD_NM</Set>
+                <Set>CAPTXNJNL.BNK_TYP=$BNK_TYP</Set>
+                <Set>CAPTXNJNL.CRD_FLG=$CRD_FLG</Set>
+                <Set>CAPTXNJNL.CRD_NM=$CRD_NM</Set>
+
+                <Exec func="PUB:ReadRecord">
+                    <Arg name="SqlCmd" value="QRY_LBNKNO"/>
+                </Exec>
+                <If condition="~RetCod !=0">
+                    <Set>Rsp_Cd=80</Set>
+                    <Set>Rsp_Msg=查询联行号失败</Set>
+                </If>
+                <Else>
+                    <Set>CAPTXNJNL.LBNK_NO=$PTY_ID</Set><!--联行号-->
+                    <Set>CAPTXNJNL.LBNK_NAM=$PTY_NM</Set><!--联行名称-->
+                </Else>
+
                 <!--所有参数由节点RTR_IN传进路由-->
                 <Set>RTR_IN.ORD_TYP=$ORD_TYP</Set>
                 <Set>RTR_IN.PAY_TYP=$PAY_TYP</Set>
@@ -306,23 +341,17 @@
                 </Call>
 
                 <!--所有参数由节点RTR_OUT传出路由-->
-                <Set>BNK_TYP=@O.RTR_OUT.BNK_TYP</Set>
-                <Set>CRD_FLG=@O.RTR_OUT.CRD_FLG</Set>
-                <Set>CRD_NM=@O.RTR_OUT.CRD_NM</Set>
                 <Set>CORG_NO=@O.RTR_OUT.CORG_NO</Set>
-                <Set>LBNK_NO=@O.RTR_OUT.LBNK_NO</Set>
-                <Set>LBNK_NAM=@O.RTR_OUT.LBNK_NM</Set>
                 <Set>ROUT_FLG=@O.RTR_OUT.ROUT_FLG</Set>
-                <Set>BNK_FLG=@O.RTR_OUT.BNK_FLG</Set>
-
-                <Set>CAPTXNJNL.BNK_TYP=$BNK_TYP</Set>
-                <Set>CAPTXNJNL.CRD_FLG=$CRD_FLG</Set>
-                <Set>CAPTXNJNL.CRD_NM=$CRD_NM</Set>
-                <Set>CAPTXNJNL.CORG_NO=$CORG_NO</Set>
-                <Set>CAPTXNJNL.LBNK_NO=$LBNK_NO</Set>
-                <Set>CAPTXNJNL.LBNK_NAM=$LBNK_NAM</Set>
                 <Set>CAPTXNJNL.ROUT_FLG=$ROUT_FLG</Set>
-                <Set>CAPTXNJNL.BNK_FLG=$BNK_FLG</Set>
+                <Set>CAPTXNJNL.CORG_NO=$CORG_NO</Set>
+                <Set>CORG_NO=@O.RTR_OUT.CORG_NO</Set>
+                <If condition="IS_EQUAL_STRING($BNK_CD,$CORG_NO)">
+                    <Set>CAPTXNJNL.BNK_FLG=Y</Set>
+                </If>
+                <Else>
+                    <Set>CAPTXNJNL.BNK_FLG=N</Set>
+                </Else>
 
                 <If condition="SUBSTR(@O.MSG_CD,4,5)!=00000">
                     <Set>Rsp_Cd=80</Set>
@@ -422,6 +451,8 @@
                 <Delete>BNK_TYP</Delete>
                 <Delete>BNK_FLG</Delete>
                 <Delete>CAPTXNJNL</Delete>
+                <Delete>CRD_FLG</Delete>
+                <Delete>CRD_NM</Delete>
             </While>
 
             <!--关闭游标-->
diff --git a/cap/etc/batch/RTR_PKG.XML b/cap/etc/batch/RTR_PKG.XML
index 377276f..682d664 100644
--- a/cap/etc/batch/RTR_PKG.XML
+++ b/cap/etc/batch/RTR_PKG.XML
@@ -30,37 +30,6 @@
             <Fields>GRP_NM|PAY_TYP|CRD_FLG|BNK_TYP|AMTMP|AMTMP|CRE_DT|CRE_DT|CRE_TM|CRE_TM|TXN_CNL|SKIP_HLD|</Fields>
         </DynSentence>
 
-        <!--通过BNK_COD查询相应的CORG_NO-->
-        <DynSentence name="QRY_CORG">
-            <Sentence>
-                select PTYALS_NM from CAPCOMPTY where BKCTGY_CD = '%s' and PTY_KND = 'PBC'
-            </Sentence>
-            <Fields>BNK_COD</Fields>
-        </DynSentence>
-
-        <!--通过CORG_NO查询相应的BNK_COD-->
-        <DynSentence name="QRY_BNKCOD">
-            <Sentence>
-                select BKCTGY_CD from CAPCOMPTY where PTYALS_NM = '%s' and PTY_KND = 'PBC'
-            </Sentence>
-            <Fields>CORG_NO</Fields>
-        </DynSentence>
-
-        <!--通过BNK_COD查询相应的联行号LBNK_NO-->
-        <DynSentence name="QRY_LBNKNO">
-            <Sentence>
-                select PTY_NM,PTY_ID,PTYALS_NM from CAPCOMPTY where BKCTGY_CD = '%s' and PTY_KND = 'PBC'
-            </Sentence>
-            <Fields>BNK_TYP</Fields>
-        </DynSentence>
-
-        <!--通过CORG_COD字段来判断路由是否支持此通道-->
-        <DynSentence name="QRY_IS_SUPPORT">
-            <Sentence>
-                select COUNT(*) RUL_NUM from CMMTRTRULE_BATCH where CORG_NO = '%s' and TRA_CD = '%s' and RUL_STS = '2'
-            </Sentence>
-            <Fields>CORG_COD|PAY_TYP</Fields>
-        </DynSentence>
         <!--通过RUL_NO字段来查询路由信息-->
         <DynSentence name="QRY_CMMTRTRULE_BATCH">
             <Sentence>
@@ -69,13 +38,7 @@
             <Fields>RUL_NO|</Fields>
         </DynSentence>
 
-        <!--通过BNK_COD查询相应的联行号LBNK_NO-->
-        <DynSentence name="QRY_CMMTBKTYP">
-            <Sentence>
-                select BNK_CD from CMMTBKTYP where BNK_TYP = '%s'
-            </Sentence>
-            <Fields>BNK_TYP</Fields>
-        </DynSentence>
+
 
         <Process>
             <!-- 取出RTR_IN节点参数 -->
@@ -86,19 +49,10 @@
             <Set>TXN_CNL=$RTR_IN.TXN_CNL</Set>
             <Set>TXN_MOD=$RTR_IN.TXN_MOD</Set>
             <Set>GRP_NM=$RTR_IN.GRP_NM</Set>
+            <Set>BNK_TYP=$RTR_IN.BNK_TYP</Set>
+            <Set>CRD_FLG=$RTR_IN.CRD_FLG</Set>
+            <Set>CRD_NM=$RTR_IN.CRD_NM</Set>
 
-            <Exec func="ATMPTC:GetCrdFlg">
-                <Arg name="Table" value="CMMTUFIT"/>
-                <Arg name="Trk2" value="$TRACK_2"/>
-                <Arg name="Trk3" value="$TRACK_3"/>
-                <Arg name="CrdNo" value="$AC_NO"/>
-            </Exec>
-
-            <!-- 主帐号 -->
-            <Set>AC_NO=$CRD_NO</Set>
-            <Set>BNK_TYP=$BNK_TYP</Set>
-            <Set>CRD_FLG=$CRD_FLG</Set>
-            <Set>CRD_NM=$CRD_NM</Set>
 
             <Set>TXN_TM=GETDATETIME()</Set>
             <Set>CRE_TM=SUBSTR($TXN_TM,9,6)</Set>           <!--交易时间-->
@@ -160,41 +114,9 @@
 
             <Set>CORG_NO=$CORG_NO</Set>
 
-
-            <Exec func="PUB:ReadRecord">
-                <Arg name="SqlCmd" value="QRY_LBNKNO"/>
-            </Exec>
-            <If condition="~RetCod !=0">
-                <Set>Rsp_Cd=80</Set>
-                <Set>Rsp_Msg=查询联行号失败</Set>
-            </If>
-            <Set>LBNK_NO=$PTY_ID</Set>
-            <Set>LBNK_NM=$PTY_NM</Set>   <!--联行名称-->
-
-            <Exec func="PUB:ReadRecord">
-                <Arg name="SqlCmd" value="QRY_CMMTBKTYP"/>
-            </Exec>
-            <If condition="~RetCod !=0">
-                <Set>Rsp_Cd=80</Set>
-                <Set>Rsp_Msg=查询联行号失败</Set>
-            </If>
-
-            <If condition="IS_EQUAL_STRING($BNK_CD,$CORG_NO)">
-                <Set>BNK_FLG=Y</Set>
-            </If>
-            <Else>
-                <Set>BNK_FLG=N</Set>
-            </Else>
-
             <!-- 把参数放入RTR_OUT节点 -->
-            <Set>RTR_OUT.BNK_TYP=$BNK_TYP</Set>
-            <Set>RTR_OUT.CRD_FLG=$CRD_FLG</Set>
-            <Set>RTR_OUT.CRD_NM=$CRD_NM</Set>
             <Set>RTR_OUT.CORG_NO=$CORG_NO</Set>
-            <Set>RTR_OUT.LBNK_NO=$LBNK_NO</Set>
-            <Set>RTR_OUT.LBNK_NM=$LBNK_NM</Set>
             <Set>RTR_OUT.ROUT_FLG=$ROUT_FLG</Set>
-            <Set>RTR_OUT.BNK_FLG=$BNK_FLG</Set>
             <Exec func="PUB:CmpSetMsg">
                 <Arg name="MsgCd" value="CAP00000" /><!--错误码待定  999999999-->
             </Exec>
diff --git a/cap/etc/channel/hro/SCAHRO2_ATR.XML b/cap/etc/channel/hro/SCAHRO2_ATR.XML
index ba088e3..29ee692 100644
--- a/cap/etc/channel/hro/SCAHRO2_ATR.XML
+++ b/cap/etc/channel/hro/SCAHRO2_ATR.XML
@@ -14,7 +14,7 @@
         <Declare name="jsonxmlfmtconvert" class="com.hisun.handler.HiJsonXmlConvertHandler">
         </Declare>
         <Declare name="itfengine" class="com.hisun.engine.HiEngine">
-                <Param name="ITF" value="etc/test/SCAHRO2_ITF.XML" />
+                <Param name="ITF" value="etc/channel/hro/SCAHRO2_ITF.XML" />
         </Declare>
 
         <Process name="proc1" msgtype="DEFAULT">
diff --git a/cap/etc/channel/hro/SCAHRO3_ATR.XML b/cap/etc/channel/hro/SCAHRO3_ATR.XML
index 18c25ba..75568d2 100644
--- a/cap/etc/channel/hro/SCAHRO3_ATR.XML
+++ b/cap/etc/channel/hro/SCAHRO3_ATR.XML
@@ -20,7 +20,7 @@
         </Declare>
 
         <Declare name="itfengine" class="com.hisun.engine.HiEngine">
-                <Param name="ITF" value="etc/test/SCAHRO3_ITF.XML" />
+                <Param name="ITF" value="etc/channel/hro/SCAHRO3_ITF.XML" />
         </Declare>
 
         <Process name="proc1" msgtype="DEFAULT">