From 2974137ae3a8320b89129da3bbb266f0452081c7 Mon Sep 17 00:00:00 2001
From: Alawn <alawn.cn@gmail.com>
Date: Wed, 5 Jan 2022 16:11:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=8C=E6=9C=9F=E6=B5=81=E6=B0=B4=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cap/etc/batch/BAT_QRYCURTXNJNL_TIMER_CTL.XML |   6 +-
 cap/etc/batch/BAT_QRYTXNJNL_TIMER_CTL.XML    |   2 +-
 cap/etc/channel/cmb/QUERY_CMB.XML            | 158 ++++++++++++++++++-
 cap/etc/channel/cmb/SCMBPAY2_ITF.XML         |  93 +++++++++++
 cap/etc/channel/icbc/QUERY_ICBC.XML          |  22 +--
 5 files changed, 262 insertions(+), 19 deletions(-)

diff --git a/cap/etc/batch/BAT_QRYCURTXNJNL_TIMER_CTL.XML b/cap/etc/batch/BAT_QRYCURTXNJNL_TIMER_CTL.XML
index 27dc91c..375baf5 100644
--- a/cap/etc/batch/BAT_QRYCURTXNJNL_TIMER_CTL.XML
+++ b/cap/etc/batch/BAT_QRYCURTXNJNL_TIMER_CTL.XML
@@ -7,7 +7,7 @@
 
       <DynSentence name="QRY_CAPACCOUNTINF_INF">    <!--查询付款方账户-->
          <Sentence>
-            SELECT BR_NO BBK_NBR,ACCT_NO ACC_NBR,ACCT_TYPE,ACCT_NAME ACC_NAM FROM CAPRECEIPTACCT
+            SELECT BR_NO BBK_NBR,ACCT_NO ACC_NBR,ACCT_TYPE,ACCT_NAME ACC_NAM,BANK_CODE FROM CAPRECEIPTACCT
             WHERE BANK_CODE=? AND ENABLED='Y'
          </Sentence>
          <Fields>BANK_CODE|</Fields>
@@ -40,11 +40,11 @@
                <Return/>
             </ElseIf>
             <Set>TTXN_CD=STRCAT(QRY_,$BANK_CODE,CUR,TXNJNL)</Set>
-
+            <Set>TRS_DAT=GETDATE()</Set>
             <Exec func="PUB:CallThirdService" error="IGNORE">
                <Arg name="HTxnCd" value="$TTXN_CD" />
                <Arg name="ObjSvr" value="OFRTCAP3" />
-               <Arg name="In"     value="BBK_NBR|ACC_NBR|ACCT_TYPE|ACC_NAM|" />
+               <Arg name="In"     value="BBK_NBR|ACC_NBR|ACCT_TYPE|ACC_NAM|TRS_DAT|" />
             </Exec>
             <If condition="~RetCod!=0">
                <Set>Rsp_Cd=80</Set>
diff --git a/cap/etc/batch/BAT_QRYTXNJNL_TIMER_CTL.XML b/cap/etc/batch/BAT_QRYTXNJNL_TIMER_CTL.XML
index a262b72..2e65fdc 100644
--- a/cap/etc/batch/BAT_QRYTXNJNL_TIMER_CTL.XML
+++ b/cap/etc/batch/BAT_QRYTXNJNL_TIMER_CTL.XML
@@ -7,7 +7,7 @@
 
       <DynSentence name="QRY_CAPACCOUNTINF_INF">    <!--查询付款方账户-->
          <Sentence>
-            SELECT BR_NO BBK_NBR,ACCT_NO ACC_NBR,ACCT_TYPE,ACCT_NAME ACC_NAM FROM CAPRECEIPTACCT
+            SELECT BR_NO BBK_NBR,ACCT_NO ACC_NBR,ACCT_TYPE,ACCT_NAME ACC_NAM,BANK_CODE FROM CAPRECEIPTACCT
             WHERE BANK_CODE=? AND ENABLED='Y'
          </Sentence>
          <Fields>BANK_CODE|</Fields>
diff --git a/cap/etc/channel/cmb/QUERY_CMB.XML b/cap/etc/channel/cmb/QUERY_CMB.XML
index 18f4ea3..928782b 100644
--- a/cap/etc/channel/cmb/QUERY_CMB.XML
+++ b/cap/etc/channel/cmb/QUERY_CMB.XML
@@ -78,9 +78,11 @@
          <Set>bbknbr=$bbk_nbr</Set>
          <Set>accnbr=$acc_nbr</Set>
          <Set>trsdat=$trs_dat</Set>
+         <Set>TAC_TYP=$ACCT_TYPE</Set>
          <Set>CHK_DAT=GETDATE()</Set>
          <If condition="ISNULL($trsdat)">
             <Set>trsdat=CALCDATE($CHK_DAT,-,d,1)</Set>
+            <Set>trs_dat=$trsdat</Set>
          </If>
          <ElseIf condition="CHECKDATE($trsdat)!=0">
             <Set>Rsp_Cd=80</Set>
@@ -224,7 +226,7 @@
             <Exec func="PUB:ExecSql" error="IGNORE">
                <Arg name="SqlCmd"    value="UPD_CAPCMBHIJNL_DSKNO"/>
             </Exec>
-            <If condition="~RetCod!=0">
+            <If condition="~RetCod=-1">
                <Set>Rsp_Cd=80</Set>
                <Set>Rsp_Msg=更新代发交易明细发放批次信息失败</Set>
                <Exec func="PUB:RollbackWork" />
@@ -234,7 +236,7 @@
          </If>
 
          <Set>CRE_TM=GETDATETIME()</Set>
-       
+
          <!--登记明细汇总表-->
          <Exec func="PUB:InsertRecord" error="IGNORE">
             <Arg name="TblNam" value="CAPCMBJNLTOT" />
@@ -1179,7 +1181,7 @@
          <If condition="ISNULL($SND_TIME_INTERVAL)">
             <Set>SND_TIME_INTERVAL=1</Set>
          </If>
-         
+
          <Set>C_SND_TIME=CALCTIME(GETDATETIME(MMDDHHMISS),-,m,$SND_TIME_INTERVAL)</Set>
 
 
@@ -1525,7 +1527,7 @@
             <Exec func="PUB:ExecSql" error="IGNORE">
                <Arg name="SqlCmd"    value="UPD_CAPCMBCURJNL_DSKNO"/>
             </Exec>
-            <If condition="~RetCod!=0">
+            <If condition="~RetCod=-1">
                <Set>Rsp_Cd=80</Set>
                <Set>Rsp_Msg=更新代发交易明细发放批次信息失败</Set>
                <Exec func="PUB:RollbackWork" />
@@ -1557,4 +1559,152 @@
          <Set>RSP_MSG=交易成功</Set>
       </FlowCtrl>
    </Transaction>
+
+   <!-- 招行账户信息查询 -->
+   <Transaction code="QRY_CMBACINF" log_switch='1' desc="招行账户信息查询">
+
+      <DynSentence name="UPD_CAPCMBACINF">
+         <Sentence>
+            BBK_NBR=? AND ACC_NBR=?
+         </Sentence>
+         <Fields>bbk_nbr|acc_nbr|</Fields>
+      </DynSentence>
+
+      <DynSentence name="QRY_CAPCMBACINF">
+         <Sentence>
+            SELECT 'Y' YN FROM CAPCMBACINF WHERE bbk_nbr=? AND acc_nbr=?
+         </Sentence>
+         <Fields>bbk_nbr|acc_nbr|</Fields>
+      </DynSentence>
+
+      <DynSentence name="QRY_CAPACCOUNTINF">
+         <Sentence>
+            select br_no bbknbr,acct_no accnbr,ACCT_TYPE from CAPACCOUNTINF
+            where bank_code='CMB' and enabled='Y'
+         </Sentence>
+      </DynSentence>
+
+      <FlowCtrl>
+         <Delete>TRSP_CD</Delete>
+         <Delete>TRSP_MSG</Delete>
+         <Delete>rep_num</Delete>
+         <Delete>ntqacinfz_NUM</Delete>
+
+         <!--读取参数配置 -->
+         <Quote name="Batch_Cfg_CMB"/>
+         <Set>TM_SMP=GETDATETIME()</Set>
+         <Set>TX_COD=NTQACINF</Set><!--查询交易码-->
+         <Set>reqid=STRCAT($TM_SMP,006,000001)</Set>
+         <Set>userid=$PARA.USERID</Set>
+         <Set>bbknbr=$bbknbr</Set>
+         <Set>accnbr=$accnbr</Set>
+         <Set>QRY_MAX_CNT=200</Set>
+
+         <Exec func="PUB:QueryInGroup" error="IGNORE">
+            <Arg name="SqlCmd" value="QRY_CAPACCOUNTINF"/>
+            <Arg name="RecordName" value="ntqacinfx"/>
+            <Arg name="limit" value="$QRY_MAX_CNT"/>
+         </Exec>
+         <If condition="~RetCod!=0">
+            <Set>Rsp_Cd=80</Set>
+            <Set>Rsp_Msg=查询失败</Set>
+            <Return/>
+         </If>
+
+         <!--调用账户详细信息查询接口 如果账户信息不允许查询则不返回-->
+         <Exec func="PUB:CallThirdComm" error="IGNORE">
+            <Arg name="HTxnCd" value="$TX_COD"/>
+            <Arg name="ObjSvr" value="SCMBPAY2"/>            <!-- 交易发往银行 -->
+         </Exec>
+         <If condition="~RetCod !=0">
+            <Set>Rsp_Cd=80</Set>
+            <Set>Rsp_Msg=查询银行账户信息失败</Set>
+            <Return/>
+         </If>
+         <Else>
+
+            <Set>N=1</Set>
+            <Set>rep_num=$ntqacinfz_NUM</Set>
+            <While condition="INTCMP($N,2,$ntqacinfz_NUM)">
+               <Set>ccy_nbr=ntqacinfz[$N].ccy_nbr</Set>
+               <Set>acc_itm=ntqacinfz[$N].acc_itm</Set>
+               <Set>bbk_nbr=ntqacinfz[$N].bbk_nbr</Set>
+               <Set>acc_nbr=ntqacinfz[$N].acc_nbr</Set>
+               <Set>acc_nam=ntqacinfz[$N].acc_nam</Set>
+               <Set>acc_blv=ntqacinfz[$N].acc_blv</Set>
+               <Set>onl_blv=ntqacinfz[$N].onl_blv</Set>
+               <Set>hld_blv=ntqacinfz[$N].hld_blv</Set>
+               <Set>avl_blv=ntqacinfz[$N].avl_blv</Set>
+               <Set>lmt_ovr=ntqacinfz[$N].lmt_ovr</Set>
+               <Set>sts_cod=ntqacinfz[$N].sts_cod</Set>
+               <Set>int_cod=ntqacinfz[$N].int_cod</Set>
+               <Set>int_rat=ntqacinfz[$N].int_rat</Set>
+               <Set>opn_dat=ntqacinfz[$N].opn_dat</Set>
+               <Set>mut_dat=ntqacinfz[$N].mut_dat</Set>
+               <Set>int_typ=ntqacinfz[$N].int_typ</Set>
+               <Set>dps_txt=ntqacinfz[$N].dps_txt</Set>
+
+
+               <!--查询账户信息是否已经存在-->
+               <Exec func="PUB:ReadRecord" error="IGNORE">
+                  <Arg name="SqlCmd"       value="QRY_CAPCMBACINF"/>
+               </Exec>
+               <If condition='~RetCod=0'>
+
+                  <Exec func="PUB:UpdateRecord" error="IGNORE">
+                     <Arg name="TblNam" value="CAPCMBACINF" />
+                     <Arg name="CndSts" value="UPD_CAPCMBACINF" />
+                  </Exec>
+                  <If condition="~RetCod!=0">
+                     <Set>Rsp_Cd=80</Set>
+                     <Set>Rsp_Msg=更新账户信息失败</Set>
+                     <Return/>
+                  </If>
+               </If>
+               <ElseIf condition='~RetCod=2'>
+
+                  <Exec func="PUB:InsertRecord"  error="IGNORE"><!--插入账户信息-->
+                     <Arg name="TblNam" value="CAPCMBACINF"/>
+                  </Exec>
+                  <If condition="~RetCod!=0">
+                     <Set>Rsp_Cd=80</Set>
+                     <Set>Rsp_Msg=登记账户信息失败</Set>
+                     <Return/>
+                  </If>
+               </ElseIf>
+               <Else>
+
+                  <Set>Rsp_Cd=80</Set>
+                  <Set>Rsp_Msg=查询数据库异常</Set>
+                  <Return/>
+               </Else>
+               <Delete>ccy_nbr</Delete>
+               <Delete>acc_itm</Delete>
+               <Delete>bbk_nbr</Delete>
+               <Delete>acc_nbr</Delete>
+               <Delete>acc_nam</Delete>
+               <Delete>acc_blv</Delete>
+               <Delete>onl_blv</Delete>
+               <Delete>hld_blv</Delete>
+               <Delete>avl_blv</Delete>
+               <Delete>lmt_ovr</Delete>
+               <Delete>sts_cod</Delete>
+               <Delete>int_cod</Delete>
+               <Delete>int_rat</Delete>
+               <Delete>opn_dat</Delete>
+               <Delete>mut_dat</Delete>
+               <Delete>int_typ</Delete>
+               <Delete>dps_txt</Delete>
+
+               <Set>N=ADD($N,1)</Set>
+            </While>
+            <Exec func="PUB:CommitWork"/>  <!--提交事务 -->
+
+         </Else>
+
+         <!-- 交易成功 -->
+         <Set>RSP_CD=00</Set>
+         <Set>RSP_MSG=交易成功</Set>
+      </FlowCtrl>
+   </Transaction>
 </Tran>
diff --git a/cap/etc/channel/cmb/SCMBPAY2_ITF.XML b/cap/etc/channel/cmb/SCMBPAY2_ITF.XML
index 75442dc..02327bb 100644
--- a/cap/etc/channel/cmb/SCMBPAY2_ITF.XML
+++ b/cap/etc/channel/cmb/SCMBPAY2_ITF.XML
@@ -236,7 +236,100 @@
       </Response>
    </Transaction>
 
+   <Transaction code="NTQACINF" log_switch="1" desc="账户详细信息查询">
+      <Request>
+         <!-- 报文头 -->
+         <WriteElement name="CMS">
+            <Quote name="WriteHead"/>
+            <!-- 报文体 -->
+            <WriteElement name="body">
+               <WriteElement name="ntqacinfx_NUM" ETF_name="ntqacinfx_NUM" necessary="no" desc=""/>
+               <WriteGroupElement name="ntqacinfx" ETF_name="ntqacinfx" necessary="yes" desc="账户详细信息">
+                  <WriteElement name="bbknbr" ETF_name="bbknbr" necessary="yes"            desc="分行号      "/>
+                  <WriteElement name="accnbr" ETF_name="accnbr" necessary="yes"            desc="账号        "/>
+               </WriteGroupElement>
+            </WriteElement>
+         </WriteElement>
+      </Request>
+      <Response>
+         <!-- 返回报文头 -->
+         <ReadElement name="Root">
+            <Quote name="ReadHead"/>
+            <!-- 报文体 -->
+            <ReadElement name="body" necessary="no">
+               <ReadElement name="ntqacinfz_NUM" ETF_name="ntqacinfz_NUM" necessary="no" desc="    "/>
+               <ReadGroupElement name="ntqacinfz" ETF_name="ntqacinfz" repeat_name="ntqacinfz_NUM"  necessary="no" desc="账户结果 多笔">
+                  <ReadElement name="ccynbr" ETF_name="ccy_nbr" necessary="no" desc="货币代码 "/>
+                  <ReadElement name="accitm" ETF_name="acc_itm" necessary="no" desc="账号科目 "/>
+                  <ReadElement name="bbknbr" ETF_name="bbk_nbr" necessary="no" desc="分行号   "/>
+                  <ReadElement name="accnbr" ETF_name="acc_nbr" necessary="no" desc="账号     "/>
+                  <ReadElement name="accnam" ETF_name="acc_nam" necessary="no" desc="户名     "/>
+                  <ReadElement name="accblv" ETF_name="acc_blv" necessary="no" desc="上日余额 "/>
+                  <ReadElement name="onlblv" ETF_name="onl_blv" necessary="no" desc="联机余额 "/>
+                  <ReadElement name="hldblv" ETF_name="hld_blv" necessary="no" desc="冻结余额 "/>
+                  <ReadElement name="avlblv" ETF_name="avl_blv" necessary="no" desc="可用余额 "/>
+                  <ReadElement name="lmtovr" ETF_name="lmt_ovr" necessary="no" desc="透支额度 "/>
+                  <ReadElement name="stscod" ETF_name="sts_cod" necessary="no" desc="状态     "/>
+                  <ReadElement name="intcod" ETF_name="int_cod" necessary="no" desc="利息码   "/>
+                  <ReadElement name="intrat" ETF_name="int_rat" necessary="no" desc="年利率   "/>
+                  <ReadElement name="opndat" ETF_name="opn_dat" necessary="no" desc="开户日   "/>
+                  <ReadElement name="mutdat" ETF_name="mut_dat" necessary="no" desc="到期日   "/>
+                  <ReadElement name="inttyp" ETF_name="int_typ" necessary="no" desc="利率类型 "/>
+                  <ReadElement name="dpstxt" ETF_name="dps_txt" necessary="no" desc="存期     "/>
+               </ReadGroupElement>
+            </ReadElement>
+         </ReadElement>
+      </Response>
+   </Transaction>
 
+   <Transaction code="NTQADINF" log_switch="1" desc="批量查询余额">
+      <Request>
+         <!-- 报文头 -->
+         <WriteElement name="CMS">
+            <Quote name="WriteHead"/>
+            <!-- 报文体 -->
+            <WriteElement name="body">
+               <WriteElement name="ntqadinfx_NUM" ETF_name="ntqadinfx_NUM" necessary="no" desc=""/>
+               <WriteGroupElement name="ntqadinfx" ETF_name="ntqadinfx" necessary="yes" desc="账户详细信息">
+                  <WriteElement name="bbknbr" ETF_name="bbknbr" necessary="yes"            desc="分行号      "/>
+                  <WriteElement name="accnbr" ETF_name="accnbr" necessary="yes"            desc="账号        "/>
+               </WriteGroupElement>
+            </WriteElement>
+         </WriteElement>
+      </Request>
+      <Response>
+         <!-- 返回报文头 -->
+         <ReadElement name="Root">
+            <Quote name="ReadHead"/>
+            <!-- 报文体 -->
+            <ReadElement name="body" necessary="no">
+               <ReadElement name="ntqadinfz_NUM" ETF_name="ntqadinfz_NUM" necessary="no" desc="    "/>
+               <ReadGroupElement name="ntqadinfz" ETF_name="ntqadinfz" repeat_name="ntqadinfz_NUM" necessary="no" desc="账户结果 多笔">
+                  <ReadElement name="ccynbr" ETF_name="ccy_nbr" necessary="no" desc="币种      "/>
+                  <ReadElement name="accitm" ETF_name="acc_itm" necessary="no" desc="科目      "/>
+                  <ReadElement name="bbknbr" ETF_name="bbk_nbr" necessary="no" desc="分行号    "/>
+                  <ReadElement name="accnbr" ETF_name="acc_nbr" necessary="no" desc="帐号      "/>
+                  <ReadElement name="accnam" ETF_name="acc_nam" necessary="no" desc="注解      "/>
+                  <ReadElement name="relnbr" ETF_name="rel_nbr" necessary="no" desc="客户关系号"/>
+                  <ReadElement name="accblv" ETF_name="acc_blv" necessary="no" desc="上日余额  "/>
+                  <ReadElement name="onlblv" ETF_name="onl_blv" necessary="no" desc="联机余额  "/>
+                  <ReadElement name="hldblv" ETF_name="hld_blv" necessary="no" desc="冻结余额  "/>
+                  <ReadElement name="avlblv" ETF_name="avl_blv" necessary="no" desc="可用余额  "/>
+                  <ReadElement name="lmtovr" ETF_name="lmt_ovr" necessary="no" desc="透支额度  "/>
+                  <ReadElement name="stscod" ETF_name="sts_cod" necessary="no" desc="状态      "/>
+                  <ReadElement name="intcod" ETF_name="int_cod" necessary="no" desc="利息码    "/>
+                  <ReadElement name="intrat" ETF_name="int_rat" necessary="no" desc="年利率    "/>
+                  <ReadElement name="opndat" ETF_name="opn_dat" necessary="no" desc="开户日    "/>
+                  <ReadElement name="mutdat" ETF_name="mut_dat" necessary="no" desc="到期日    "/>
+                  <ReadElement name="inttyp" ETF_name="int_typ" necessary="no" desc="利率类型  "/>
+                  <ReadElement name="dpstxt" ETF_name="dps_txt" necessary="no" desc="存期      "/>
+                  <ReadElement name="errcod" ETF_name="err_cod" necessary="no" desc="错误码    "/>
+                  <ReadElement name="errtxt" ETF_name="err_txt" necessary="no" desc="错误说明  "/>
+               </ReadGroupElement>
+            </ReadElement>
+         </ReadElement>
+      </Response>
+   </Transaction>
 </Application>
 
 
diff --git a/cap/etc/channel/icbc/QUERY_ICBC.XML b/cap/etc/channel/icbc/QUERY_ICBC.XML
index afadbdf..164f43c 100644
--- a/cap/etc/channel/icbc/QUERY_ICBC.XML
+++ b/cap/etc/channel/icbc/QUERY_ICBC.XML
@@ -80,7 +80,7 @@
          <Set>@MSG.uri=mybank/enterprise/trade/qhisd/V1</Set>
 
          <!--新接口第三方数据拼接 -->
-
+         <Set>TAC_TYP=$ACCT_TYPE</Set>
          <Set>account_no=$ACC_NBR</Set>  <!--查询账户 -->
          <Set>trs_date=$trs_date</Set>
          <Set>CHK_DAT=GETDATE()</Set>
@@ -92,7 +92,7 @@
             <Set>Rsp_Msg=查询日期不合法</Set>
             <Return/>
          </ElseIf>
-         <ElseIf condition="INTCMP($CHK_DAT,5,$trs_date)">
+         <ElseIf condition="INTCMP($trs_date,5,$CHK_DAT)">
             <Set>Rsp_Cd=80</Set>
             <Set>Rsp_Msg=查询日期大于当前日期</Set>
             <Return/>
@@ -226,15 +226,15 @@
             </If>
 
             <!--根据小批号关联流水更新大批号-->
-            <!--Exec func="PUB:ExecSql" error="IGNORE">
-            <Arg name="SqlCmd"    value="UPD_CAPICBCHIJNL_DSKNO"/>
+            <Exec func="PUB:ExecSql" error="IGNORE">
+               <Arg name="SqlCmd"    value="UPD_CAPICBCHIJNL_DSKNO"/>
             </Exec>
-            <If condition="~RetCod!=0">
-            <Set>Rsp_Cd=80</Set>
-            <Set>Rsp_Msg=更新代发交易明细发放批次信息失败</Set>
-            <Exec func="PUB:RollbackWork" />
-            <Return/>
-            </If-->
+            <If condition="~RetCod=-1">
+               <Set>Rsp_Cd=80</Set>
+               <Set>Rsp_Msg=更新代发交易明细发放批次信息失败</Set>
+               <Exec func="PUB:RollbackWork" />
+               <Return/>
+            </If>
 
          </If>
 
@@ -442,7 +442,7 @@
             <Exec func="PUB:ExecSql" error="IGNORE">
                <Arg name="SqlCmd"    value="UPD_CAPICBCCURJNL_DSKNO"/>
             </Exec>
-            <If condition="~RetCod!=0">
+            <If condition="~RetCod=-1">
                <Set>Rsp_Cd=80</Set>
                <Set>Rsp_Msg=更新代发交易明细发放批次信息失败</Set>
                <Exec func="PUB:RollbackWork" />