From d01e70553b1c34ee4170d65e2d15cfb5259cb3d6 Mon Sep 17 00:00:00 2001
From: Alawn <alawn.cn@gmail.com>
Date: Wed, 17 Mar 2021 19:54:23 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=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           |  38 +--------
 cap/etc/batch/BAT_QRYRFD_TIMER_CTL.XML | 113 ++++++++++++-------------
 cap/etc/channel/cmb/Batch_CMB.XML      |  86 +++++++++++++++----
 cap/etc/channel/cmb/SCMBPAY1_ATR.XML   |   3 +-
 cap/etc/channel/icbc/BATCH_ICBC.XML    |   4 +-
 cap/etc/channel/icbc/OFRTCAPZ_CTL.XML  |  52 ++++++++++++
 cap/etc/channel/icbc/SCAICBC_ITF.XML   |  37 ++++++++
 7 files changed, 219 insertions(+), 114 deletions(-)

diff --git a/cap/etc/batch/204025_CTL.XML b/cap/etc/batch/204025_CTL.XML
index 750f35b..b345682 100644
--- a/cap/etc/batch/204025_CTL.XML
+++ b/cap/etc/batch/204025_CTL.XML
@@ -102,7 +102,7 @@
         <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'
+                WHERE A.BNK_TYP = ? AND A.BNK_CD = B.BKCTGY_CD AND B.PTY_KND = 'PBC'
             </Sentence>
             <Fields>BNK_TYP|</Fields>
         </DynSentence>
@@ -527,42 +527,6 @@
                 <Set>CAP_TYP=CAP_PAY_BAT</Set>
                 <Set>RMK=批量代付</Set>
 
-                <!-- 批量机构限额判断 -->
-                <Call package="CEL" function="CORG_AMT_BAT_QTM_VERIFY">
-                    <Input>CAP_TYP|BAT_ORN_AMT1|CORG_NO|</Input>
-                    <Output>MSG_CD|EVT_TYP|EVT_DSC</Output>
-                </Call>
-                <If condition="SUBSTR(@O.MSG_CD,4,5)!=00000">
-                    <Set>MSG_INF=@O.EVT_DSC</Set>
-                    <Set>EVT_TYP=@O.EVT_TYP</Set>
-                    <Set>Rsp_Cd=80</Set>
-                    <Set>Rsp_Msg=$MSG_INF</Set>
-                    <!-- 事物推送 -->
-                    <Set>EVENT.DSK_NO=$DSK_NAM</Set>
-                    <Set>EVENT.CUS_ID=$MERC_ID</Set>
-                    <Set>EVENT.ERR_MSG=$MSG_INF</Set>
-                    <Exec func="PUB:InvokeService" error="IGNORE">
-                        <Arg name="ServiceName" value="PUSH_EVENT"/>
-                    </Exec>
-
-                    <Exec func="PUB:ExecSql" error="IGNORE">
-                        <Arg name="SqlCmd" value="Updbatstt"/>
-                    </Exec>
-                    <If condition="~RetCod = 0">
-                        <Exec func="PUB:ExecSql" error="IGNORE">
-                            <Arg name="SqlCmd" value="Updinfstt"/>
-                        </Exec>
-                        <If condition="~RetCod != 0">
-                            <Set>Rsp_Cd=80</Set>
-                            <Set>Rsp_Msg=更新接入批量信息登记表失败</Set>
-                        </If>
-                    </If>
-                    <If condition="~RetCod != 0">
-                        <Set>Rsp_Cd=80</Set>
-                        <Set>Rsp_Msg=更新接入批量信息登记表失败</Set>
-                    </If>
-                </If>
-
                 <!--清理数据-->
                 <Delete>CORG_MERC_ID</Delete>
                 <Delete>CORG_DSK_NO</Delete>
diff --git a/cap/etc/batch/BAT_QRYRFD_TIMER_CTL.XML b/cap/etc/batch/BAT_QRYRFD_TIMER_CTL.XML
index 6200a08..72249be 100644
--- a/cap/etc/batch/BAT_QRYRFD_TIMER_CTL.XML
+++ b/cap/etc/batch/BAT_QRYRFD_TIMER_CTL.XML
@@ -1,66 +1,61 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <Tran>
-    <Transaction code="BAT_QRYRFD_TIMER"  log_switch='1'  desc="获取退票明细">
-        <Attributes>
-            <Attribute name="nodatabase" value="2"/> <!--数据库长连接-->
-        </Attributes>
-        <DynSentence name="QryTAccNo">    <!--查询付款方账户-->
-            <Sentence>
-                select br_no brNo,acct_no acctNo,ACCT_TYPE from CAPACCOUNTINF
-                where bank_code='CMB' and enabled='Y'
-            </Sentence>
-            <Fields>|</Fields>
-        </DynSentence>
-        <FlowCtrl>
+   <Transaction code="BAT_QRYRFD_TIMER"  log_switch='1' timeout="3600" desc="获取退票明细">
+      <Attributes>
+         <Attribute name="nodatabase" value="2"/> <!--数据库长连接-->
+      </Attributes>
+      <DynSentence name="QryTAccNo">    <!--查询付款方账户-->
+         <Sentence>
+            select br_no brNo,acct_no acctNo,ACCT_TYPE from CAPACCOUNTINF
+            where bank_code='CMB' and enabled='Y'
+         </Sentence>
+         <Fields>|</Fields>
+      </DynSentence>
+      <FlowCtrl>
 
-            <!---test开始-->
-            <!--<Set>@MSG.WSO=/do_success.jsp</Set>
-            <Set>IS_TEST=FALSE</Set>-->
-
-            <!---test结束-->
-            <Quote name="Init_CAP01"/>                <!--交易初始化-->
-            <Exec func="PUB:OpenCursor" error="IGNORE">
-                <Arg name="SqlCmd" value="QryTAccNo"/>
-                <Arg name="CursorName" value="CURSOR_1"/>
+         <Quote name="Init_CAP01"/>                <!--交易初始化-->
+         <Exec func="PUB:OpenCursor" error="IGNORE">
+            <Arg name="SqlCmd" value="QryTAccNo"/>
+            <Arg name="CursorName" value="CURSOR_1"/>
+         </Exec>
+         <If condition="~RetCod=-1">
+            <Exec func="PUB:GWASetMsg">
+               <Arg name="MsgCd" value="LPS00001"/>
+               <Arg name="MsgDat" value="数据库操作错误"/>
             </Exec>
-            <If condition="~RetCod=-1">
-                <Exec func="PUB:GWASetMsg">
-                    <Arg name="MsgCd" value="LPS00001"/>
-                    <Arg name="MsgDat" value="数据库操作错误"/>
-                </Exec>
+         </If>
+         <While>
+            <Exec func="PUB:FetchCursor" error="IGNORE"/>
+            <If condition="~RetCod=2">
+               <Exec func="PUB:CloseCursor"/>
+               <Break/>
             </If>
-            <While>
-                <Exec func="PUB:FetchCursor" error="IGNORE"/>
-                <If condition="~RetCod=2">
-                    <Exec func="PUB:CloseCursor"/>
-                    <Break/>
-                </If>
-                <ElseIf condition="~RetCod!=0">
-                    <Set>Rsp_Cd=80</Set>
-                    <Set>Rsp_Msg=循环游标失败</Set>
-                    <Exec func="PUB:RollbackWork"/>
-                </ElseIf>
-                <Exec func="PUB:CallThirdComm" error="IGNORE">
-                    <Arg name="HTxnCd" value="QRY_CMBRFD" />
-                    <Arg name="ObjSvr" value="OFRTCAP1" />
-                </Exec>
-                <If condition="~RetCod !=0">
-                    <Set>Rsp_Cd=80</Set>
-                    <Set>Rsp_Msg=查询失败</Set>
-                    <Return/>
-                </If>
-            </While>
-            <Exec func="PUB:CloseCursor">                               <!-- 关闭游标 -->
-                <Arg name="CursorName" value="CURSOR_1"/>
+            <ElseIf condition="~RetCod!=0">
+               <Set>Rsp_Cd=80</Set>
+               <Set>Rsp_Msg=循环游标失败</Set>
+               <Exec func="PUB:RollbackWork"/>
+            </ElseIf>
+            <Exec func="PUB:CallThirdComm" error="IGNORE">
+               <Arg name="HTxnCd" value="QRY_CMBRFD" />
+               <Arg name="ObjSvr" value="OFRTCAP1" />
             </Exec>
-            <If condition="~RetCod!=0">
-                <!-- @msg 关闭游标失败 -->
-                <Exec func="PUB:CmpSetMsg">
-                    <Arg name="MsgCd" value="PWM25804"/>
-                </Exec>
+            <If condition="~RetCod !=0">
+               <Set>Rsp_Cd=80</Set>
+               <Set>Rsp_Msg=查询失败</Set>
+               <Return/>
             </If>
-            <Set>Rsp_Cd=00</Set>
-            <Set>Rsp_Msg=交易成功</Set>
-        </FlowCtrl>
-    </Transaction>
-</Tran>   
+         </While>
+         <Exec func="PUB:CloseCursor">                               <!-- 关闭游标 -->
+            <Arg name="CursorName" value="CURSOR_1"/>
+         </Exec>
+         <If condition="~RetCod!=0">
+            <!-- @msg 关闭游标失败 -->
+            <Exec func="PUB:CmpSetMsg">
+               <Arg name="MsgCd" value="PWM25804"/>
+            </Exec>
+         </If>
+         <Set>Rsp_Cd=00</Set>
+         <Set>Rsp_Msg=交易成功</Set>
+      </FlowCtrl>
+   </Transaction>
+</Tran>
diff --git a/cap/etc/channel/cmb/Batch_CMB.XML b/cap/etc/channel/cmb/Batch_CMB.XML
index 1fa0119..85d49b3 100644
--- a/cap/etc/channel/cmb/Batch_CMB.XML
+++ b/cap/etc/channel/cmb/Batch_CMB.XML
@@ -1050,7 +1050,7 @@
                      <Return/>
                   </If>
                   <!--接收标志 U:预计 0:已确认，待发送  1:发送处理完成 2:发送处理失败 3:接收处理中 4:接收处理完成 5:接收处理失败 9:有待处理记录-->
-                  <Set>BAT_STS=4</Set>
+                  <Set>BAT_STS=2</Set>
                   <Set>Rsp_Cd=00</Set>
                   <Set>Rsp_Msg=交易整批处理失败</Set>
                   <Set>BAT_SUC_AMT=0</Set>
@@ -1081,6 +1081,7 @@
          <Delete>rd</Delete>
       </FlowCtrl>
    </Transaction>
+
    <!--退票查询 -->
    <Transaction code="QRY_CMBRFD" log_switch='1' desc="招行退票查询">
       <DynSentence name="updRfd">
@@ -1092,9 +1093,19 @@
          </Sentence>
          <Fields>BTH_DTL|yur_ref|yur_ref|BTH_DTL</Fields>
       </DynSentence>
+
+      <DynSentence name="QRY_CAPCMBRFD">
+         <Sentence>
+            SELECT 'Y' YN FROM CAPCMBRFD WHERE YUR_REF=? AND BTH_DTL=? AND TRS_DAT=? 
+         </Sentence>
+         <Fields>YUR_REF|BTH_DTL|TRS_DAT|</Fields>
+      </DynSentence>
+
       <FlowCtrl>
          <Delete>TRSP_CD</Delete>
          <Delete>TRSP_MSG</Delete>
+         <Delete>rep_num</Delete>
+         <Delete>ntagdrfdz1_NUM</Delete>
 
          <Quote name="GET_CUP_BAT_NO"/>
          <Set>CORG_DSK_NO=STRCAT(GETDATETIME(),$CORG_DSK_NO)</Set>
@@ -1124,28 +1135,73 @@
             <Return/>
          </If>
          <Else>
-            <Exec func="PUB:InsertRecord"><!--登记招行临时表-->
-               <Arg name="TblNam" value="CAPCMBRFD"/>
-               <Arg name="GrpNam" value="ntagdrfdz1"/>
-            </Exec>
-            <If condition="~RetCod!=0">
-               <Return/>
-            </If>
+
             <Set>N=1</Set>
             <Set>rep_num=$ntagdrfdz1_NUM</Set>
             <While condition="INTCMP($N,2,$ntagdrfdz1_NUM)">
-               <Set>yur_ref=ntagdrfdz1[$N].yur_ref</Set>
+               <Set>req_nbr=ntagdrfdz1[$N].req_nbr</Set>
+               <Set>YUR_REF=ntagdrfdz1[$N].yur_ref</Set>
                <Set>BTH_DTL=ntagdrfdz1[$N].bth_dtl</Set>
-               <Exec func="PUB:ExecSql" error="IGNORE">
-                  <Arg name="SqlCmd" value="updRfd"/>
+               <Set>eac_nbr=ntagdrfdz1[$N].eac_nbr</Set>
+               <Set>eac_nam=ntagdrfdz1[$N].eac_nam</Set>
+               <Set>trs_amt=ntagdrfdz1[$N].trs_amt</Set>
+               <Set>cpr_act=ntagdrfdz1[$N].cpr_act</Set>
+               <Set>txt_clt=ntagdrfdz1[$N].txt_clt</Set>
+               <Set>eac_bnm=ntagdrfdz1[$N].eac_bnm</Set>
+               <Set>eac_cty=ntagdrfdz1[$N].eac_cty</Set>
+               <Set>cpr_cnv=ntagdrfdz1[$N].cpr_cnv</Set>
+               <Set>trs_dat=ntagdrfdz1[$N].trs_dat</Set>
+               <Set>sts_cod=ntagdrfdz1[$N].sts_cod</Set>
+               <Set>rtn_cod=ntagdrfdz1[$N].rtn_cod</Set>
+               <Set>rtn_txt=ntagdrfdz1[$N].rtn_txt</Set>
+               <Set>rsv=ntagdrfdz1[$N].rsv</Set>
+
+               <!--查询退票信息是否已经入库-->
+               <Exec func="PUB:ReadRecord" error="IGNORE">
+                  <Arg name="SqlCmd"       value="QRY_CAPCMBRFD"/>
                </Exec>
-               <If condition="~RetCod!=0">
+               <If condition='~RetCod=-1'>
                   <Set>Rsp_Cd=80</Set>
-                  <Set>Rsp_Msg=更新退票流水失败</Set>
-                  <Break/>
+                  <Set>Rsp_Msg=查询失败</Set>
+                  <Return/>
                </If>
-               <Delete>yur_ref</Delete>
+               <ElseIf condition='~RetCod=2'>
+
+                  <Exec func="PUB:InsertRecord"  error="IGNORE"><!--登记招行临时表-->
+                     <Arg name="TblNam" value="CAPCMBRFD"/>
+                  </Exec>
+                  <If condition="~RetCod!=0">
+                     <Set>Rsp_Cd=80</Set>
+                     <Set>Rsp_Msg=登记流水失败</Set>
+                     <Return/>
+                  </If>
+
+                  <Exec func="PUB:ExecSql" error="IGNORE">
+                     <Arg name="SqlCmd" value="updRfd"/>
+                  </Exec>
+                  <If condition="~RetCod!=0">
+                     <Set>Rsp_Cd=80</Set>
+                     <Set>Rsp_Msg=更新退票流水失败</Set>
+                     <Break/>
+                  </If>
+               </ElseIf>
+
+               <Delete>req_nbr</Delete>
+               <Delete>YUR_REF</Delete>
                <Delete>BTH_DTL</Delete>
+               <Delete>eac_nbr</Delete>
+               <Delete>eac_nam</Delete>
+               <Delete>trs_amt</Delete>
+               <Delete>cpr_act</Delete>
+               <Delete>txt_clt</Delete>
+               <Delete>eac_bnm</Delete>
+               <Delete>eac_cty</Delete>
+               <Delete>cpr_cnv</Delete>
+               <Delete>trs_dat</Delete>
+               <Delete>sts_cod</Delete>
+               <Delete>rtn_cod</Delete>
+               <Delete>rtn_txt</Delete>
+               <Delete>rsv</Delete>
                <Set>N=ADD($N,1)</Set>
             </While>
             <Exec func="PUB:CommitWork"/>  <!--提交事务 -->
diff --git a/cap/etc/channel/cmb/SCMBPAY1_ATR.XML b/cap/etc/channel/cmb/SCMBPAY1_ATR.XML
index d5f7862..eed1a71 100644
--- a/cap/etc/channel/cmb/SCMBPAY1_ATR.XML
+++ b/cap/etc/channel/cmb/SCMBPAY1_ATR.XML
@@ -8,7 +8,8 @@
       <Param name="_publicKeyStr" value="${_PUBLICKEYSTR}" />
       <Param name="_privateKeyStr" value="${_PRIVATEKEYSTR}" />
       <Param name="_aesKey" value="${_AESKEY}" />
-
+      <Param name="connectTimeout" value="10000" />
+      <Param name="readTimeout" value="10000" />
    </Declare>
 
 
diff --git a/cap/etc/channel/icbc/BATCH_ICBC.XML b/cap/etc/channel/icbc/BATCH_ICBC.XML
index cbb020a..ad01287 100644
--- a/cap/etc/channel/icbc/BATCH_ICBC.XML
+++ b/cap/etc/channel/icbc/BATCH_ICBC.XML
@@ -273,7 +273,7 @@
             TXN_STS='F',
             TTXN_ST='F',
             RSP_CD = '80',
-            RSP_MSG = ?,
+            RSP_MSG = ?
             WHERE DSK_NAM=?
             AND
             ORD_DT=?
@@ -1014,7 +1014,7 @@
          <Set>tran_time=STRCAT($TXN_TM,000)</Set>
          <Set>f_seq_no=STRCAT(Q,SUBSTR($TXN_DT,3,6),$fSeqno)</Set>
          <Set>language=zh_CN</Set>
-         <Set>qry_f_seq_no=202103080000000007</Set>
+         <Set>qry_f_seq_no=1</Set> <!--202103080000000007 测试可成功-->
          <Set>qry_serial_no=$qry_serial_no</Set>
 
          <!--新接口 第三方通讯报文头 代付提交-->
diff --git a/cap/etc/channel/icbc/OFRTCAPZ_CTL.XML b/cap/etc/channel/icbc/OFRTCAPZ_CTL.XML
index e33f5bd..70bff99 100644
--- a/cap/etc/channel/icbc/OFRTCAPZ_CTL.XML
+++ b/cap/etc/channel/icbc/OFRTCAPZ_CTL.XML
@@ -315,4 +315,56 @@
       </FlowCtrl>
    </Transaction>
 
+   <Transaction code="CHECKACJNL_ICBCTEST" log_switch='1' desc="明细查询测试交易">
+
+
+      <FlowCtrl>
+
+
+         <Exec func="PUB:DumpETF" />
+         <!--读取参数配置 -->
+         <Set>TXN_DT=GETDATE()</Set>
+         <Set>TXN_TM=GETDATETIME(HHMISS)</Set>
+
+
+         <Set>@MSG.className=com.icbc.api.request.MybankEnterpriseTradeQhisdRequestV1</Set>
+         <Set>@MSG.uri=mybank/enterprise/trade/qhisd/V1</Set>
+
+         <!--新接口第三方数据拼接 -->
+         <Set>trans_code=QHISD</Set>
+         <Set>tran_date=$TXN_DT</Set>
+         <Set>tran_time=STRCAT($TXN_TM,000)</Set>
+         <Set>f_seqno=STRCAT(BAL,GETDATETIME())</Set>
+         <Set>ics=020090002434552</Set>
+         <Set>language=zh_CN</Set>
+         <Set>bank_code=102</Set>
+
+         <Set>account_no=$AC_NO</Set>  <!--查询账户 -->
+         <Set>begin_date=20210317</Set>  <!--起始时间 -->
+         <Set>end_date=$TXN_DT</Set>  <!--结束时间 -->
+
+
+
+         <Exec func="PUB:CallThirdComm" error="IGNORE">
+            <Arg name="HTxnCd"           value="$trans_code"/> <!-- 交易发往银行 -->
+            <Arg name="ObjSvr"           value="SCAICBC"/><!-- 服务名 -->
+         </Exec>
+         <Switch expression="~RetCod">
+
+            <Case value="0"> <!--查询成功-->
+               <Set>Rsp_Cd=000000</Set>
+               <Set>TRsp_Msg=交易成功</Set>
+               <Set>Rsp_Msg=$TRsp_Msg</Set>
+               <Break/>
+            </Case>
+            <Default>
+               <!--第三方失败-->
+
+               <Set>RSP_CD=80</Set>
+               <Set>Rsp_Msg=$TRsp_Msg</Set>
+            </Default>
+         </Switch>
+
+      </FlowCtrl>
+   </Transaction>
 </Application>
diff --git a/cap/etc/channel/icbc/SCAICBC_ITF.XML b/cap/etc/channel/icbc/SCAICBC_ITF.XML
index f84327d..49ce713 100644
--- a/cap/etc/channel/icbc/SCAICBC_ITF.XML
+++ b/cap/etc/channel/icbc/SCAICBC_ITF.XML
@@ -209,5 +209,42 @@
       </Response>
    </Transaction>
 
+   <Transaction code="QHISD"  log_switch="1" desc="明细查询">
+      <Request>
+         <WriteElement name="biz_content">
+            <!-- 公共参数 -->
+            <WriteElement name="trans_code" ETF_name="trans_code" necessary="no" value="QHISD"/>
+            <WriteElement name="tran_date"  ETF_name="tran_date"  necessary="yes"/>
+            <WriteElement name="tran_time"  ETF_name="tran_time"  necessary="yes"/>
+            <WriteElement name="login_id"   ETF_name="login_id"   necessary="no" value=""/>
+            <WriteElement name="ics"        ETF_name="ics"         necessary="yes"/>
+            <WriteElement name="bank_code"  ETF_name="bank_code"   necessary="no" value="102"/>
+            <WriteElement name="f_seqno"     ETF_name="f_seqno"    necessary="yes"/>
+            <WriteElement name="account_no"  ETF_name="account_no"   necessary="yes"/>
+            <WriteElement name="begin_date"  ETF_name="begin_date"   necessary="yes"/>
+            <WriteElement name="end_date"    ETF_name="end_date"   necessary="yes"/>
+            <WriteElement name="min_amount"  ETF_name="min_amount"   necessary="no"/>
+            <WriteElement name="max_amount"  ETF_name="max_amount"   necessary="no"/>
+            <WriteElement name="bank_type"   ETF_name="bank_type"   necessary="no"/>
+            <WriteElement name="next_tag"    ETF_name="account_no"   necessary="no"/>
+            <WriteElement name="currency"    ETF_name="currency"   necessary="no"/>
+            <WriteElement name="due_bill_no" ETF_name="due_bill_no"   necessary="no"/>
+         </WriteElement>
+      </Request>
+      <Response>
+         <!-- 返回公共信息 -->
+         <ReadElement name="returnCode"  ETF_name="return_code"   necessary="yes"/>
+         <ReadElement name="returnMsg"   ETF_name="return_msg"    necessary="no"/>
+         <ReadElement name="msgId"       ETF_name="msg_id"         necessary="yes"/>
+
+         <If condition="IS_EQUAL_STRING($return_code,0)">
+            <AddItem name="TRSP_CD"  value="000000" />
+         </If>
+         <Else>
+            <AddItem name="TRSP_CD"  value="$return_code" />
+            <AddItem name="TRSP_MSG"  value="$return_msg" />
+         </Else>
+      </Response>
+   </Transaction>
 
 </Application>
\ No newline at end of file