From 20c95ed3d62f8deea2dd4067d288ce367b826b80 Mon Sep 17 00:00:00 2001
From: alawn <capadm@localhost.localdomain>
Date: Fri, 15 Jan 2021 18:40:45 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cap/etc/SVRLST.XML                      |   1 +
 cap/etc/api/CCAHRO1_ITF.XML             |  27 +++---
 cap/etc/batch/BAT_GET_TIMER_CTL.XML     |   2 +-
 cap/etc/batch/BAT_TIMEOUT_TIMER_CTL.XML |   4 +-
 cap/etc/batch/DISK_RESULT_CTL.XML       |  55 ++++++++++++
 cap/etc/batch/GET_DISK_RESULT_CTL.XML   | 105 ++++++++++++++++++++++
 cap/etc/batch/OFRTCAP2_CTL.XML          |   3 +-
 cap/etc/batch/REFUND_QUERY_CTL.XML      |   6 +-
 cap/etc/batch/ZLL_TEST_CTL.XML          |  21 ++---
 cap/etc/channel/cmb/Batch_CMB.XML       |  98 ++++++++++++++-------
 cap/etc/channel/cmb/SCMBPAY1_ITF.XML    | 111 +++++++++++++++++++-----
 cap/etc/common/CAP01_FMT.XML            |  35 +++++++-
 cap/etc/common/MACRO_CAP_COMMON.XML     |  18 +---
 cap/etc/test/OTATEST1_CTL.XML           |  10 +++
 cap/etc/test/SCAAUTH1_ATR.XML           |  25 ++++++
 cap/etc/test/SCAAUTH1_ITF.XML           |  15 ++++
 cap/etc/test/restart                    |   1 +
 17 files changed, 439 insertions(+), 98 deletions(-)
 create mode 100644 cap/etc/batch/DISK_RESULT_CTL.XML
 create mode 100644 cap/etc/batch/GET_DISK_RESULT_CTL.XML
 create mode 100644 cap/etc/test/SCAAUTH1_ATR.XML
 create mode 100644 cap/etc/test/SCAAUTH1_ITF.XML
 create mode 100755 cap/etc/test/restart

diff --git a/cap/etc/SVRLST.XML b/cap/etc/SVRLST.XML
index dd5adba..11058ae 100644
--- a/cap/etc/SVRLST.XML
+++ b/cap/etc/SVRLST.XML
@@ -13,5 +13,6 @@
         <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="SCAAUTH1" min="1" max="1" config_file="etc/test/SCAAUTH1_ATR.XML"        desc="授权" />
     </Group>
 </FrontTab>
diff --git a/cap/etc/api/CCAHRO1_ITF.XML b/cap/etc/api/CCAHRO1_ITF.XML
index f7ab26a..d1f99f4 100644
--- a/cap/etc/api/CCAHRO1_ITF.XML
+++ b/cap/etc/api/CCAHRO1_ITF.XML
@@ -51,25 +51,26 @@
       <Request>
          <Quote name="readHead"/>
          <ReadElement name="body">
-            <ReadElement name="startDate" ETF_name="START_DATE" necessary="yes"/> <!-- 开始日期-->
-            <ReadElement name="endDate" ETF_name="END_DATE" necessary="yes"/><!--结束日期-->
+            <ReadElement name="applyDate" ETF_name="APPLY_DATE" necessary="yes"/> <!-- 送盘日期-->
+            <ReadElement name="diskNo" ETF_name="DISK_NO" necessary="yes"/><!--磁盘编号-->
+            <ReadElement name="makeFile" ETF_name="MAKE_FILE" necessary="yes"/><!--是否生成回盘文件,Y:是 N:否 默认N-->          
          </ReadElement>
       </Request>
       <Response>
          <WriteElement name="Response">
             <Quote name="writeHead"/>
             <WriteElement name="body">
-               <WriteElement name="diskSts" ETF_name="DISK_STS" necessary="yes"/>   <!--批次状态-->
-               <WriteElement name="lastDate" ETF_name="LAST_DATE" necessary="yes"/>   <!--最后更新日期-->
-               <WriteElement name="lastTime" ETF_name="LAST_TIME" necessary="yes"/>   <!--最后更新时间-->
-               <WriteElement name="totalCount" ETF_name="TOTAL_COUNT" necessary="yes"/> <!--总笔数-->
-               <WriteElement name="totalAmount" ETF_name="TOTAL_AMOUNT" necessary="yes"/> <!--总金额-->
-               <WriteElement name="succCount" ETF_name="SUCC_COUNT" necessary="yes"/> <!--成功笔数-->
-               <WriteElement name="succAmount" ETF_name="SUCC_AMOUNT" necessary="yes"/> <!--成功金额-->
-               <WriteElement name="failCount" ETF_name="FAIL_COUNT" necessary="yes"/><!--失败笔数-->
-               <WriteElement name="failAmount" ETF_name="FAIL_AMOUNT" necessary="yes"/> <!--失败笔数-->
-               <WriteElement name="filePath" ETF_name="FILE_PATH" necessary="yes"/><!--文件路径-->
-               <WriteElement name="md5" ETF_name="md5" necessary="yes"/> <!--磁盘MD5值-->
+               <WriteElement name="diskSts" ETF_name="DISK_STS" necessary="no"/>   <!--批次状态-->
+               <WriteElement name="lastDate" ETF_name="LAST_DATE" necessary="no"/>   <!--最后更新日期-->
+               <WriteElement name="lastTime" ETF_name="LAST_TIME" necessary="no"/>   <!--最后更新时间-->
+               <WriteElement name="totalCount" ETF_name="TOTAL_COUNT" necessary="no"/> <!--总笔数-->
+               <WriteElement name="totalAmount" ETF_name="TOTAL_AMOUNT"  necessary="no"/> <!--总金额-->
+               <WriteElement name="succCount" ETF_name="SUCC_COUNT" necessary="no"/> <!--成功笔数-->
+               <WriteElement name="succAmount" ETF_name="SUCC_AMOUNT" necessary="no"/> <!--成功金额-->
+               <WriteElement name="failCount" ETF_name="FAIL_COUNT" necessary="no"/><!--失败笔数-->
+               <WriteElement name="failAmount" ETF_name="FAIL_AMOUNT" necessary="no"/> <!--失败笔数-->
+               <WriteElement name="filePath" ETF_name="FILE_PATH" necessary="no"/><!--文件路径-->
+               <WriteElement name="md5" ETF_name="MD5" necessary="no"/> <!--磁盘MD5值-->
             </WriteElement>
          </WriteElement>
       </Response>
diff --git a/cap/etc/batch/BAT_GET_TIMER_CTL.XML b/cap/etc/batch/BAT_GET_TIMER_CTL.XML
index e375d4a..802d36a 100644
--- a/cap/etc/batch/BAT_GET_TIMER_CTL.XML
+++ b/cap/etc/batch/BAT_GET_TIMER_CTL.XML
@@ -8,7 +8,7 @@
             <Sentence>
                 SELECT TXN_CNL,DSK_NAM ODSK_NAM,ORD_DT OORD_DT,CORG_MERC_ID OCORG_MERC_ID,CORG_NO OCORG_NO,CORG_DSK_NO OCORG_DSK_NO
                 ,AC_DT OAC_DT,SND_DT OSND_DT,SND_TM OSND_TM,BAT_STS OBAT_STS,BAT_ORN_AMT OBAT_ORN_AMT,BAT_ORN_CNT OBAT_ORN_CNT,
-                BAT_TYP OBAT_TYP,CORG_FIL_NAM OCORG_FIL_NAM,SND_DT,SND_TM,MERC_ID OMERC_ID,TCORG_DSK_NO,'批量代收付' RMK ,GET_TIME
+                BAT_TYP OBAT_TYP,CORG_FIL_NAM OCORG_FIL_NAM,SND_DT,SND_TM,MERC_ID OMERC_ID,TCORG_DSK_NO,'批量代发' RMK ,GET_TIME
                 FROM CAPBATINF  
                 WHERE  (BAT_STS='1' OR BAT_STS='3') AND ORD_DT &gt; ?   AND CORG_NO!='SZFS' AND PRO_JRL = '0' AND (GET_TIME &lt;=? OR GET_TIME IS NULL) AND ROWNUM = '1' FOR UPDATE
             </Sentence>
diff --git a/cap/etc/batch/BAT_TIMEOUT_TIMER_CTL.XML b/cap/etc/batch/BAT_TIMEOUT_TIMER_CTL.XML
index 5cd5d52..866d510 100644
--- a/cap/etc/batch/BAT_TIMEOUT_TIMER_CTL.XML
+++ b/cap/etc/batch/BAT_TIMEOUT_TIMER_CTL.XML
@@ -13,7 +13,7 @@
         </DynSentence>
         <DynSentence name="QryTimeoutPlat">    <!-- 超时没回盘 -->
             <Sentence>
-                 SELECT MERC_ID,CORG_DSK_NO,SND_DT,SND_TM  FROM CAPBATINF WHERE  SND_TM &lt;= TO_CHAR(SYSDATE-20/24/60,'YYYYMMDDHH24MISS')  AND BAT_STS in('1','3')  
+                 SELECT MERC_ID,CORG_DSK_NO,SND_DT,SND_TM  FROM CAPBATINF WHERE  SND_TM &lt;= TO_CHAR(SYSDATE-20/24/60,'YYYYMMDDHH24MISS')  AND BAT_STS in('1','3')
             </Sentence>
             <Fields></Fields>
         </DynSentence>
@@ -146,4 +146,4 @@
             <Set>Rsp_Msg=交易成功</Set>
             </FlowCtrl>
     </Transaction>
-</Tran>   
+</Tran>   
diff --git a/cap/etc/batch/DISK_RESULT_CTL.XML b/cap/etc/batch/DISK_RESULT_CTL.XML
new file mode 100644
index 0000000..9093179
--- /dev/null
+++ b/cap/etc/batch/DISK_RESULT_CTL.XML
@@ -0,0 +1,55 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<Tran>
+    <Transaction code="DISK_RESULT" log_switch='1' desc="批量结果查询">
+        <Quote name="SQL_RcvConfirm"/>              <!--商户接入认证检查配套SQL语句-->
+
+        <!--查询文件是否入库 -->
+        <DynSentence name="QRY_CAPDSKINF_DSK_NAM">
+            <Sentence>
+                SELECT DSK_STS ,END_DT,END_TM ,ORN_CNT ,ORN_AMT,SUC_CNT,SUC_AMT,FAL_CNT,FAL_AMT, FILE_PATH,MD5_RESULT,TM_SMP FROM CAPDSKINF
+                WHERE DSK_NO = ? AND DSK_DAT = ?
+            </Sentence>
+            <Fields>DSK_NO|APPLY_DATE|</Fields>
+        </DynSentence>
+
+
+
+        <FlowCtrl>
+            <Quote name="Init_CAP01"/>                <!--交易初始化-->
+            <!-- 组合一些关键信息 -->
+            <Set>DSK_NO=$DISK_NO</Set>
+            <Set>APPLY_DATE=$APPLY_DATE</Set>
+            <Set>MAKE_FILE=$MAKE_FILE</Set>
+            <!-- 查询文件是否入库 -->
+            <Exec func="PUB:ReadRecord" error="IGNORE">
+                <Arg name="SqlCmd" value="QRY_CAPDSKINF_DSK_NAM"/>
+            </Exec>
+            <If condition="~RetCod!=0">
+                <Set>Rsp_Cd=80</Set>
+                <Set>Rsp_Msg=批次不存在</Set>
+                <Return/>
+            </If>
+            <If condition="IS_EQUAL_STRING($MAKE_FILE,Y)">
+                <!--调用强制生成-->
+
+            </If>
+
+            <Set>DISK_STS=$DSK_STS</Set>
+            <Set>DISK_MESSAGE=$DISK_MESSAGE</Set>
+            <Set>LAST_DATE=SUBSTR($TM_SMP,0,8)</Set>
+            <Set>LAST_TIME=SUBSTR($TM_SMP,9,6)</Set>
+            <Set>TOTAL_COUNT=$ORN_CNT</Set>
+            <Set>TOTAL_AMOUNT=FMUL($ORN_AMT,100,0)</Set>
+            <Set>SUCC_COUNT=$SUC_CNT</Set>
+            <Set>SUCC_AMOUNT=FMUL($SUC_AMT,100,0)</Set>
+            <Set>FAIL_COUNT=$FAL_CNT</Set>
+            <Set>FAIL_AMOUNT=FMUL($FAL_AMT,100,0)</Set>
+            <Set>FILE_PATH=$FILE_PATH</Set>
+            <Set>MD5=$MMD5_RESULT</Set>
+
+
+            <Set>Rsp_Cd=00</Set>
+            <Set>Rsp_Msg=交易成功</Set>
+        </FlowCtrl>
+    </Transaction>
+</Tran>
diff --git a/cap/etc/batch/GET_DISK_RESULT_CTL.XML b/cap/etc/batch/GET_DISK_RESULT_CTL.XML
new file mode 100644
index 0000000..4fd8600
--- /dev/null
+++ b/cap/etc/batch/GET_DISK_RESULT_CTL.XML
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Package>
+    <Function name="GET_DISK_RESULT">
+        <!--查询文件是否入库 -->
+        <DynSentence name="QRY_CAPDSKINF">
+            <Sentence>
+                SELECT DSK_STS,ORN_CNT TOTAL_COUNT,ORN_AMT TOTAL_AMOUNT,SUC_CNT SUCC_COUNT,SUC_AMT SUCC_AMOUNT,FAL_CNT
+                FAIL_COUNT,FAL_AMT FAIL_AMOUNT,TITLE_ID,CUSTOMER_ID FROM CAPDSKINF
+                WHERE DSK_NO = ?
+            </Sentence>
+            <Fields>DSK_NO|</Fields>
+        </DynSentence>
+        <DynSentence name="QRY_CAPBATINF">
+            <Sentence>
+                SELECT count(1) BAT_NUM FROM CAPDSKINF
+                WHERE DSK_NAM = ? AND (BAT_STS &lt;4 OR BAT_STS &gt;4)
+            </Sentence>
+            <Fields>DSK_NO|</Fields>
+        </DynSentence>
+        <DynSentence name="QRY_CAPTXNJNL">
+            <Sentence>
+                select AC_TYP ACCT_TYPE,AC_NO ACCT_NO,CUS_NAM ACCT_NAME,CAP_ORD_NO TRANS_ID,
+                MERC_ORD_NO REF_ID, TXN_AMT AMOUNT,BNK_TYP BANK_TYPE,POSTSCRIPT,
+                TAC_NO PAYER_ACCT_NO,TAC_NAM PAYER_ACCT_NAME, CORG_NO ORG_NO,'' REMARK ,
+                TXN_STS TRANS_STS,RSP_MSG RESP_MESSAGE
+                from CAPTXNJNL t where t.dsk_nam = ?
+            </Sentence>
+            <Fields>DSK_NAM|</Fields>
+        </DynSentence>
+
+        <Process>
+            <Exec func="PUB:DumpETF"/>
+            <!--查询大批批次表-->
+            <Exec func="PUB:ReadRecord" error="IGNORE">
+                <Arg name="SqlCmd" value="QRY_CAPDSKINF"/>
+            </Exec>
+            <If condition="~RetCod!=0">
+                <Set>Rsp_Cd=80</Set>
+                <Set>Rsp_Msg=批次不存在</Set>
+                <Return/>
+            </If>
+            <If condition="IS_NOEQUAL_STRING($DSK_STS,4)">
+                <Set>Rsp_Cd=80</Set>
+                <Set>Rsp_Msg=批次未完成</Set>
+                <Return/>
+            </If>
+            <!--查询小批是否处理完成-->
+            <Exec func="PUB:ReadRecord" error="IGNORE">
+                <Arg name="SqlCmd" value="QRY_CAPBATINF"/>
+            </Exec>
+            <If condition="~RetCod!=0">
+                <Set>Rsp_Cd=80</Set>
+                <Set>Rsp_Msg=系统异常</Set>
+                <Return/>
+            </If>
+            <If condition="IS_NOEQUAL_STRING($BAT_NUM,0)">
+                <Set>Rsp_Cd=80</Set>
+                <Set>Rsp_Msg=批次未完成</Set>
+                <Return/>
+            </If>
+
+            <!--生成文件-->
+            <Set>FIL_PTH=STRCAT(GETENV(WORKDIR),/dat/cap/send/)</Set>
+            <Set>FIL_NAM=STRCAT(CAP_HSTCHK_,$CHK_DAT)</Set>
+            <!--导出文件-->
+            <Exec func="PUB:ExportFromDB">
+                <Arg name="FormatName" value="HroFmt02"></Arg>
+                <Arg name="FileName" value="STRCAT($FIL_PTH,$FIL_NAM)"></Arg>
+                <Arg name="TableName" value="CAPTXNJNL"></Arg>
+                <Arg name="SqlName" value="QRY_CAPTXNJNL"></Arg>
+            </Exec>
+            <If condition="~RetCod=-1">
+                <Set>Rsp_Cd=80</Set>
+                <Set>Rsp_Msg=失败</Set>
+                <Exec func="PUB:GWASetMsg">
+                    <Arg name="MsgCd" value="CAP99999"/>
+                </Exec>
+                <Return/>
+            </If>
+            <If condition="~RetCod=1">
+                <Set>Rsp_Cd=80</Set>
+                <Set>Rsp_Msg=数据不存在</Set>
+                <Exec func="PUB:GWASetMsg">
+                    <Arg name="MsgCd" value="CAP88888"/>
+                </Exec>
+                <Return/>
+            </If>
+
+            <ElseIf condition="~RetCod=0">
+                <Set>Rsp_Cd=00</Set>
+                <Set>Rsp_Msg=成功</Set>
+                <Exec func="PUB:GWASetMsg">
+                    <Arg name="MsgCd" value="CAP00000"/>
+                </Exec>
+                <Return/>
+            </ElseIf>
+
+
+            <Exec func="PUB:CmpSetMsg">
+                <Arg name="MsgCd" value="AGW00000"/>
+            </Exec>
+
+        </Process>
+    </Function>
+</Package>
diff --git a/cap/etc/batch/OFRTCAP2_CTL.XML b/cap/etc/batch/OFRTCAP2_CTL.XML
index f28125f..4b1babd 100644
--- a/cap/etc/batch/OFRTCAP2_CTL.XML
+++ b/cap/etc/batch/OFRTCAP2_CTL.XML
@@ -53,7 +53,8 @@
 
 
     <Include file="etc/batch/DISK_APPLY_CTL.XML" desc="批量代付申请"/>
-
+    <Include file="etc/batch/DISK_RESULT_CTL.XML" desc="批量代付结果查询"/>
+    <Include file="etc/batch/GET_DISK_RESULT_CTL.XML" desc="批量代付结果查询"/>
    <Include file="etc/batch/TITLE_SYNC_CTL.XML"/>    <!--支付地账户信息管理-->
    <Include file="etc/batch/CARDINFO_QUERY_CTL.XML"/><!--银行卡信息查询-->
    <Include file="etc/batch/CUSTOMER_SYNC_CTL.XML"/> <!--客户信息管理-->
diff --git a/cap/etc/batch/REFUND_QUERY_CTL.XML b/cap/etc/batch/REFUND_QUERY_CTL.XML
index 0b18223..443302e 100644
--- a/cap/etc/batch/REFUND_QUERY_CTL.XML
+++ b/cap/etc/batch/REFUND_QUERY_CTL.XML
@@ -5,9 +5,9 @@
 
       <DynSentence name="QRY_CAPCMBRFD_INF"><!--查询该支付地账户信息是否存在 -->
          <Sentence>
-            SELECT  DSK_NAM AS DISK_NO,'' AS TRANS_ID,'' REF_ID,'' BANK_REFID,EAC_NBR ACCT_NO,EAC_NAM ACCT_NAME,
-        TRS_DAT TRANS_DATE,'' TRANS_STS,TRS_AMT AMOUNT,RTN_COD REFUND_CODE,RTN_TXT REFUND_PS,
-        '' PAYER_ACCT_NO,'' PAYER_ACCT_NAME,TXT_CLT REMARK 
+            SELECT  DSK_NAM AS DISK_NO,CAP_ORD_NO AS TRANS_ID,MERC_ORD_NO REF_ID,BTH_DTL BANK_REFID,EAC_NBR ACCT_NO,EAC_NAM ACCT_NAME,
+        TRS_DAT TRANS_DATE,STS_COD TRANS_STS,TRS_AMT AMOUNT,RTN_COD REFUND_CODE,RTN_TXT REFUND_PS,
+        TAC_NO PAYER_ACCT_NO,TAC_NAM PAYER_ACCT_NAME,TXT_CLT REMARK 
             FROM CAPCMBRFD
             WHERE trs_dat between  ? and ?
          </Sentence>
diff --git a/cap/etc/batch/ZLL_TEST_CTL.XML b/cap/etc/batch/ZLL_TEST_CTL.XML
index 857d3b4..3791f5d 100644
--- a/cap/etc/batch/ZLL_TEST_CTL.XML
+++ b/cap/etc/batch/ZLL_TEST_CTL.XML
@@ -11,20 +11,21 @@
 
          <If condition="IS_EQUAL_STRING($TESTNO,1)">
             <Set>TESTNAME=CUSTOMER_SYNC</Set>
-            <Set>CUSTOMER_ID=1111</Set>
-            <Set>CUSTOMER_NAME=HAHAHAHHAH</Set>
-            <Set>CUSTOMER_CODE=1111</Set>
-            <Set>RANK=1111</Set>
+            <Set>CUSTOMER_ID=1112</Set>
+            <Set>CUSTOMER_NAME=测试客户2</Set>
+            <Set>CUSTOMER_CODE=1112</Set>
+            <Set>RANK=112</Set>
             <Set>ENABLED=Y</Set>
          </If>
          <ElseIf condition="IS_EQUAL_STRING($TESTNO,2)">
             <Set>TESTNAME=TITLE_SYNC</Set>             
-            <Set>TITLE_ID=1111</Set>
-            <Set>TITLE_NAME=HAHAHAHHAH</Set>
-            <Set>BANK_CODE=1111</Set>
-            <Set>BR_NO=1111</Set>
-            <Set>ACCT_NO=11111111</Set>
-            <Set>ACCT_NAME=HAHAHAHAH</Set>
+            <Set>TITLE_ID=1112</Set>
+            <Set>TITLE_NAME=测试数据2</Set>
+            <Set>BANK_CODE=1112</Set>
+            <Set>BR_NO=1112</Set>
+            <Set>ACCT_TYPE=B</Set>
+            <Set>ACCT_NO=11111112</Set>
+            <Set>ACCT_NAME=测试账户2</Set>
             <Set>COST_ITEM=1111</Set>
             <Set>ENABLED=Y</Set>
          </ElseIf>
diff --git a/cap/etc/channel/cmb/Batch_CMB.XML b/cap/etc/channel/cmb/Batch_CMB.XML
index 20d2d3a..9872f0e 100644
--- a/cap/etc/channel/cmb/Batch_CMB.XML
+++ b/cap/etc/channel/cmb/Batch_CMB.XML
@@ -279,7 +279,8 @@
                 UPDATE CAPBATINF
                 SET BAT_STS=?,
                 RSP_CD = ?,
-                RSP_MSG = ?
+                RSP_MSG = ?,
+                CORG_JRN_NO=?
                 WHERE
                 ORD_DT=?
                 AND CORG_NO=?
@@ -287,9 +288,16 @@
                 AND AC_DT=?
                 AND BAT_STS='0'
             </Sentence>
-            <Fields>BAT_STS|RSP_CD|RSP_MSG|ORD_DT|CORG_NO|CORG_DSK_NO|AC_DT
+            <Fields>BAT_STS|RSP_CD|RSP_MSG|CORG_JRN_NO|ORD_DT|CORG_NO|CORG_DSK_NO|AC_DT
             </Fields>
         </DynSentence>
+        <DynSentence name="InitPRO_JRL"> <!--初始化PRO_JRL-->
+            <Sentence>
+                UPDATE CAPBATINF SET PRO_JRL ='0'
+                WHERE ORD_DT=? AND CORG_NO=? AND CORG_DSK_NO=? AND AC_DT=? AND PRO_JRL='1'
+            </Sentence>
+            <Fields>ORD_DT|CORG_NO|CORG_DSK_NO|AC_DT|</Fields>
+        </DynSentence>
         <Function name="_before">
             <Process>
                 <Exec func="PUB:DumpETF"/>
@@ -327,8 +335,6 @@
             <Delete>RSP_CD</Delete>
             <Delete>RSP_MSG</Delete>
             <Delete>SUM</Delete>
-            <Delete>REC</Delete>
-            <Delete>rd</Delete>
             <Exec func="PUB:DumpETF"/>
             <Exec func="PUB:DeleteGroup" error="IGNORE">
                 <Arg name="GroupName" value="REC"/>
@@ -349,6 +355,7 @@
                 <Set>sql_cmd=Qry_Export_CW</Set>
                 <Set>grp_nam=ntagcsaix2</Set>
                 <Set>busmod=</Set>
+                <Set>payacc=$tac_no</Set>
             </If>
             <!--超网代发其它-->
             <ElseIf condition="AND(IS_EQUAL_STRING($ROUT_FLG,SUPER),IS_EQUAL_STRING($TAC_TYP,N))">
@@ -358,6 +365,7 @@
                 <Set>sql_cmd=Qry_Export_CW</Set>
                 <Set>grp_nam=ntagcsaix2</Set>
                 <Set>busmod=</Set>
+                <Set>payacc=$tac_no</Set>
             </ElseIf>
             <!--代发工资-->
             <ElseIf condition="AND(IS_NOEQUAL_STRING($ROUT_FLG,SUPER),IS_EQUAL_STRING($TAC_TYP,B))">
@@ -367,6 +375,7 @@
                 <Set>sql_cmd=Qry_Export</Set>
                 <Set>grp_nam=ntagcdtly1</Set>
                 <Set>busmod=</Set>
+                <Set>accnbr=$tac_no</Set><!--付款账号-->
             </ElseIf>
             <!--代发其它-->
             <ElseIf condition="AND(IS_NOEQUAL_STRING($ROUT_FLG,SUPER),IS_EQUAL_STRING($TAC_TYP,N))">
@@ -376,6 +385,7 @@
                 <Set>sql_cmd=Qry_Export</Set>
                 <Set>grp_nam=ntagcdtly1</Set>
                 <Set>busmod=</Set>
+                <Set>accnbr=$tac_no</Set><!--付款账号-->
             </ElseIf>
             <Else>
                 <Set>Rsp_Cd=80</Set>
@@ -392,7 +402,6 @@
             <Set>ttlnum=1</Set><!--总次数-->
             <Set>ccynbr=10</Set>
             <Set>bbknbr=$BR_NO</Set><!--分行号-->
-            <Set>accnbr=$tac_no</Set><!--付款账号-->
             <Set>ccymkt=0</Set><!--货币市场 0不分钞汇1	现钞2	现汇-->
 
 
@@ -443,6 +452,8 @@
                 <Arg name="HTxnCd" value="$TX_COD"/> <!-- 交易发往银行 -->
                 <Arg name="ObjSvr" value="SCMBPAY1"/><!-- 服务名 -->
             </Exec>
+            <Set>~RetCod=0</Set>
+            <Set>RET_CODE=SUC0000</Set>
             <Switch expression="~RetCod">
                 <Case value="1">
                     <!--第三方失败-->
@@ -478,7 +489,6 @@
                         <Set>BAT_STS=3</Set>
                         <Set>Rsp_Cd=$resultcode</Set>
                         <Set>TRsp_Msg=$resultmsg</Set>
-                        <Return/>
                     </If>
                     <Else>
                         <!--更新流水状态为发送处理成功-->
@@ -506,6 +516,7 @@
                 </Default>
             </Switch>
             <!-- 更新批次状态 -->
+            <Set>CORG_JRN_NO=$reqnbr</Set><!--客户返回的流程实例号-->
             <Quote name="UpdSendBatSts"/>
             <!--提交事务-->
             <Exec func="PUB:CommitWork"/>
@@ -549,18 +560,19 @@
             <Sentence>
                 UPDATE CAPTXNJNL A
                 SET
-                (TTXN_ST,TXN_STS,DSK_NAM_STS,TACC_DT,TACC_TM,TRSP_CD,TRSP_MSG,RSP_MSG)
+                (TTXN_ST,TXN_STS,DSK_NAM_STS,TACC_DT,TACC_TM,TRSP_CD,TRSP_MSG,RSP_MSG,CORG_JRN_NO)
                 =
                 ( SELECT TTXN_ST TTXN_ST,
                 TTXN_ST TXN_STS,
                 '4',
                 ?,
                 ?,
-                TRSP_CD,
+                ERR_COD,
                 TRSP_MSG,
-                TRSP_MSG
+                TRSP_MSG,
+                REQ_NBR CORG_JRN_NO
                 FROM CAPCMBPERD B
-                WHERE B.QRYISEQNO = A.CAP_ORD_NO
+                WHERE B.TRX_SEQ = A.TRX_SEQ
                 )
                 WHERE
                 A.CORG_NO = 'CMB'
@@ -624,9 +636,9 @@
         </DynSentence>
         <DynSentence name="QryCAPCMBPERD">  <!-- 查询临时表批次记录状态为P的记录数 -->
             <Sentence>
-                SELECT COUNT(*) AS UNDO_CNT FROM CAPCMBPERD WHERE Result
+                SELECT COUNT(*) AS UNDO_CNT FROM CAPCMBPERD WHERE STS_COD
                 in
-                ('0','1','2','3','4','5','9','10','95')
+                ('A','C','I')
             </Sentence>
         </DynSentence>
         <DynSentence name="DelCAPCMBPERD">  <!-- 导入临时表数据之前删除临时表数据 -->
@@ -643,12 +655,12 @@
         </DynSentence>
         <DynSentence name="QRYCAPTXNJNL"> <!--查询批次信息-->
             <Sentence>
-                SELECT COST_ITEM,ROUT_FLG
+                SELECT TAC_TYP,ROUT_FLG
                 FROM CAPTXNJNL
                 WHERE DSK_NAM=?
                 AND CORG_DSK_NO=?
             </Sentence>
-            <Fields>DSK_NAM|CORG_DSK_NO|</Fields>
+            <Fields>ODSK_NAM|OCORG_DSK_NO|</Fields>
         </DynSentence>
         <Function name="_before">
             <Process>
@@ -699,8 +711,6 @@
             <Exec func="PUB:DumpETF"/>
             <Set>ORD_TYP=$OBAT_TYP</Set>
             <Quote name="Batch_Cfg_CMB"/>
-
-            <Quote name="GET_CMB_CAP_ORD_NO"/>          <!--取银联订单号 -->
             <!--查询批次信息 获取业务类型-->
             <Exec func="PUB:ReadRecord" error="IGNORE">
                 <Arg name="SqlCmd" value="QRYCAPTXNJNL"/>
@@ -710,11 +720,11 @@
                 <Set>Rsp_Msg=查询批次流水表失败</Set>
                 <Return/>
             </If>
-            <If condition="IS_EQUAL_STRING($ROUT_FLG,01201)">
+            <If condition="IS_EQUAL_STRING($TAC_TYP,B)">
                 <!--代发工资-->
                 <Set>buscod=N03010</Set>
             </If>
-            <ElseIf condition="IS_EQUAL_STRING($ROUT_FLG,04900)">
+            <ElseIf condition="IS_EQUAL_STRING($TAC_TYP,N)">
                 <!--代发其它-->
                 <Set>buscod=N03020</Set>
             </ElseIf>
@@ -738,7 +748,7 @@
             </If>
 
             <!--按业务参考号查询结果 -->
-            <Set>buscod=</Set>
+            <Set>yurref=$OCORG_DSK_NO</Set>
             <Exec func="PUB:CallThirdComm" error="IGNORE">
                 <Arg name="HTxnCd" value="NTAGCINY"/>
                 <Arg name="ObjSvr" value="SCMBPAY1"/>            <!-- 交易发往银行 -->
@@ -761,6 +771,7 @@
                             <Arg name="HTxnCd" value="NTAGCQRI"/>
                             <Arg name="ObjSvr" value="SCMBPAY1"/>            <!-- 交易发往银行 -->
                         </Exec>
+                        <Set>~RetCod=0</Set>
                         <Switch expression="~RetCod">
                             <Case value="1">
                                 <Set>Rsp_Cd=80</Set>
@@ -771,9 +782,6 @@
                                 <Set>Rsp_Cd=80</Set>
                                 <Set>Rsp_Msg=查询第三方失败</Set>
                                 <Break/>
-                            </Case>
-                            <Case value="3">
-
                             </Case>
                             <Case value="0">
                                 <Exec func="PUB:InsertRecord"><!--登记招行临时表-->
@@ -793,6 +801,8 @@
                                     <Return/>
                                 </If>
                                 <!--查询临时表批次记录状态为P的记录数 -->
+                                <Set>TACC_DT=$TXN_DT</Set>
+                                <Set>TACC_TM=$TXN_TM</Set>
                                 <Exec func="PUB:ReadRecord" error="IGNORE">
                                     <Arg name="SqlCmd" value="QryCAPCMBPERD"/>
                                 </Exec>
@@ -890,7 +900,7 @@
         </FlowCtrl>
     </Transaction>
     <!--退票查询 -->
-    <Transaction code="qry_CMBRFD" log_switch='1' desc="招行退票查询">
+    <Transaction code="QRY_CMBRFD" log_switch='1' desc="招行退票查询">
         <DynSentence name="qryAccMsg">
             <Sentence>
                 select br_no brNo,acct_no acctNo from CAPACCOUNTINF
@@ -898,6 +908,13 @@
             </Sentence>
             <Fields>|</Fields>
         </DynSentence>
+        <DynSentence name="qrybatjnl">
+            <Sentence>
+                select MERC_ORD_NO,CAP_ORD_NO,TAC_NO,TAC_NAM from CAPTXNJNL
+                where trx_seq=? and corg_dsk_no=?
+            </Sentence>
+            <Fields>BTH_DTL|yur_ref</Fields>
+        </DynSentence>
 
         <FlowCtrl>
             <!--查询账户信息-->
@@ -917,20 +934,41 @@
                 <Arg name="HTxnCd" value="NTAGDRFD"/>
                 <Arg name="ObjSvr" value="SCMBPAY1"/>            <!-- 交易发往银行 -->
             </Exec>
+            <Set>~RetCod=0</Set>
             <If condition="~RetCod !=0">
                 <Set>Rsp_Cd=80</Set>
                 <Set>Rsp_Msg=查询失败</Set>
                 <Return/>
             </If>
             <Else>
-                <!--登记退票查询表-->
-                <Exec func="PUB:InsertRecord"><!--登记招行临时表-->
-                    <Arg name="TblNam" value="CAPCMBPERD"/>
-                    <Arg name="GrpNam" value="ntagcqriz"/>
+                <Exec func="PUB:IsExistNode">
+                    <Arg name="FieldName" value="LIST_NUM" />
                 </Exec>
-                <If condition="~RetCod!=0">
-                    <Return/>
-                </If>
+                <Set>N=1</Set>
+                <While condition="INTCMP($N,2,$REC_NUM)">
+                    <Set>yur_ref=ntagdrfdz1[$REC_NUM].reqnbr</Set>
+                    <Set>BTH_DTL=ntagdrfdz1[$REC_NUM].bthdtl</Set>
+                    <Exec func="PUB:ReadRecord" error="IGNORE">
+                        <Arg name="SqlCmd" value="qrybatjnl"/>
+                    </Exec>
+                    <If condition="~RetCod!=0">
+                        <Set>RSP_CD=80</Set>
+                        <Set>RSP_MSG=查询批次流水表失败</Set>
+                        <Return/>
+                    </If>
+                    <Exec func="PUB:InsertRecord"><!--登记招行临时表-->
+                        <Arg name="TblNam" value="CAPCMBPERD"/>
+                        <Arg name="GrpNam" value="ntagcqriz"/>
+                    </Exec>
+                    <If condition="~RetCod!=0">
+                        <Return/>
+                    </If>
+                    <Delete>yur_ref</Delete>
+                    <Delete>BTH_DTL</Delete>
+                    <Set>N=ADD($N,1)</Set>
+                </While>
+                <!--登记退票查询表-->
+
             </Else>
 
             <!-- 交易成功 -->
diff --git a/cap/etc/channel/cmb/SCMBPAY1_ITF.XML b/cap/etc/channel/cmb/SCMBPAY1_ITF.XML
index e61fe4f..8a19b52 100644
--- a/cap/etc/channel/cmb/SCMBPAY1_ITF.XML
+++ b/cap/etc/channel/cmb/SCMBPAY1_ITF.XML
@@ -400,25 +400,34 @@
                         <ReadElement name="dmanbr" ETF_name="dmanbr" necessary="no" desc="记账子单元编号"/>
                     </ReadElement>
                     <ReadGroupElement name="ntagcqriz" ETF_name="ntagcqriz" necessary="no" desc="明细结果 多笔">
-                        <ReadElement name="reqnbr" ETF_name="reqnbr" necessary="no" desc="流程实例号    "/>
-                        <ReadElement name="yurref" ETF_name="yurref" necessary="no" desc="业务参考号    "/>
-                        <ReadElement name="trxseq" ETF_name="trxseq" necessary="no" desc="交易序号      "/>
-                        <ReadElement name="accnbr" ETF_name="accnbr" necessary="no" desc="账号          "/>
-                        <ReadElement name="accnam" ETF_name="accnam" necessary="no" desc="户名          "/>
-                        <ReadElement name="trsamt" ETF_name="trsamt" necessary="no" desc="金额          "/>
-                        <ReadElement name="lgramt" ETF_name="lgramt" necessary="no" desc="实际代扣金额  "/>
-                        <ReadElement name="trsdsp" ETF_name="trsdsp" necessary="no" desc="注释          "/>
-                        <ReadElement name="stscod" ETF_name="stscod" necessary="no" desc="记录状态      "/>
-                        <ReadElement name="errcod" ETF_name="errcod" necessary="no" desc="错误码        "/>
-                        <ReadElement name="errtxt" ETF_name="errtxt" necessary="no" desc="错误信息      "/>
-                        <ReadElement name="bnkflg" ETF_name="bnkflg" necessary="no" desc="系统内标志    "/>
-                        <ReadElement name="eacbnk" ETF_name="eacbnk" necessary="no" desc="他行户口开户行"/>
-                        <ReadElement name="eaccty" ETF_name="eaccty" necessary="no" desc="他行户口开户地"/>
-                        <ReadElement name="fstflg" ETF_name="fstflg" necessary="no" desc="他行快速标志  "/>
-                        <ReadElement name="rcvbnk" ETF_name="rcvbnk" necessary="no" desc="他行户口联行号"/>
-                        <ReadElement name="cpract" ETF_name="cpract" necessary="no" desc="客户代码      "/>
-                        <ReadElement name="cprref" ETF_name="cprref" necessary="no" desc="合作方流水号  "/>
-                        <ReadElement name="rsv30z" ETF_name="rsv30z" necessary="no" desc="保留字段30    "/>
+                        <ReadElement name="reqnbr" ETF_name="req_nbr" necessary="no" desc="流程实例号    "/>
+                        <ReadElement name="yurref" ETF_name="yur_ref" necessary="no" desc="业务参考号    "/>
+                        <ReadElement name="trxseq" ETF_name="trx_seq" 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="trsamt" ETF_name="trs_amt" necessary="no" desc="金额          "/>
+                        <ReadElement name="lgramt" ETF_name="lgr_amt" necessary="no" desc="实际代扣金额  "/>
+                        <ReadElement name="trsdsp" ETF_name="trs_dsp" necessary="no" desc="注释          "/>
+                        <ReadElement name="stscod" ETF_name="sts_cod" necessary="no" desc="记录状态      "/>
+                        <ReadElement name="errcod" ETF_name="err_cod" necessary="no" desc="错误码        "/>
+                        <ReadElement name="errtxt" ETF_name="err_txt" necessary="no" desc="错误信息      "/>
+                        <ReadElement name="bnkflg" ETF_name="bnk_flg" necessary="no" desc="系统内标志    "/>
+                        <ReadElement name="eacbnk" ETF_name="eac_bnk" necessary="no" desc="他行户口开户行"/>
+                        <ReadElement name="eaccty" ETF_name="eac_cty" necessary="no" desc="他行户口开户地"/>
+                        <ReadElement name="fstflg" ETF_name="fst_flg" necessary="no" desc="他行快速标志  "/>
+                        <ReadElement name="rcvbnk" ETF_name="rcv_bnk" necessary="no" desc="他行户口联行号"/>
+                        <ReadElement name="cpract" ETF_name="cpr_act" necessary="no" desc="客户代码      "/>
+                        <ReadElement name="cprref" ETF_name="cpr_ref" necessary="no" desc="合作方流水号  "/>
+                        <ReadElement name="rsv30z" ETF_name="rsv" necessary="no" desc="保留字段30    "/>
+                        <If condition="IS_EQUAL_STRING($stscod,S)">
+                            <AddItem name="TTXN_ST"  value="S" />
+                        </If>
+                        <ElseIf condition="IS_EQUAL_STRING($stscod,A,C,I)">
+                            <AddItem name="TTXN_ST"  value="P" />
+                        </ElseIf>
+                        <Else>
+                            <AddItem name="TTXN_ST"  value="F" />
+                        </Else>
                     </ReadGroupElement>
                     <ReadElement name="ntagcqriy" necessary="no" desc="查询 单记录">
                         <ReadElement name="buscod" ETF_name="buscod" necessary="yes" desc="业务类型  "/>
@@ -455,7 +464,7 @@
                 <Quote name="ReadHead"/>
                 <!-- 报文体 -->
                 <ReadElement name="body" necessary="no">
-                    <ReadGroupElement name="ntagdrfdz1" ETF_name="ntagdrfdz1" necessary="no" desc="明细结果 多笔">
+                    <ReadGroupElement name="ntagdrfdz1" ETF_name="ntagdrfdz1" repeat_num="LIST_NUM" necessary="no" desc="明细结果 多笔" >
                         <ReadElement name="reqnbr" ETF_name="reqnbr" necessary="no" desc="流程实例号    "/>
                         <ReadElement name="yurref" ETF_name="yurref" necessary="no" desc="业务参考号    "/>
                         <ReadElement name="bthdtl" ETF_name="bthdtl" necessary="no" desc="明细序号      "/>
@@ -486,6 +495,68 @@
             </ReadElement>
         </Response>
     </Transaction>
+    <Transaction code="DCLISMOD" log_switch="1" desc="可经办业务模式查询">
+    <Request>
+        <!-- 报文头 -->
+        <WriteElement name="CMS">
+            <Quote name="WriteHead"/>
+            <!-- 报文体 -->
+            <WriteElement name="body">
+                <WriteElement name="buscod" ETF_name="buscod" necessary="yes" desc="业务类别      "/>
+            </WriteElement>
+        </WriteElement>
+    </Request>
+    <Response>
+        <!-- 返回报文头 -->
+        <ReadElement name="CMS">
+            <Quote name="ReadHead"/>
+            <!-- 报文体 -->
+            <ReadElement name="body" necessary="no">
+                <ReadGroupElement name="ntqmdlstz" ETF_name="ntqmdlstz" necessary="no" desc="明细结果 多笔">
+                    <ReadElement name="busmod" ETF_name="busmod" necessary="no" desc="业务模式编号    "/>
+                    <ReadElement name="modals" ETF_name="modals" necessary="no" desc="业务模式名称    "/>
+                </ReadGroupElement>
+            </ReadElement>
+        </ReadElement>
+    </Response>
+</Transaction>
+    <Transaction code="NTAGTLS2" log_switch="1" desc="查询代发代扣交易代码">
+        <Request>
+            <!-- 报文头 -->
+            <WriteElement name="CMS">
+                <Quote name="WriteHead"/>
+                <!-- 报文体 -->
+                <WriteElement name="body">
+                    <WriteElement name="ntagtls2x" necessary="yes" desc="单记录">
+                    <WriteElement name="buscod" ETF_name="buscod" necessary="yes" desc="业务代码      "/>
+                        <WriteElement name="accnbr" ETF_name="accnbr" necessary="yes" desc="账户      "/>
+                        <WriteElement name="ccynbr" ETF_name="ccynbr" necessary="no" desc="币种     "/>
+                    </WriteElement>
+                </WriteElement>
+            </WriteElement>
+        </Request>
+        <Response>
+            <!-- 返回报文头 -->
+            <ReadElement name="CMS">
+                <Quote name="ReadHead"/>
+                <!-- 报文体 -->
+                <ReadElement name="body" necessary="no">
+                    <ReadGroupElement name="ntagtls2z" ETF_name="ntagtls2z" necessary="no" desc="明细结果 多笔">
+                        <ReadElement name="accnbr" ETF_name="accnbr" necessary="no" desc="账户    "/>
+                        <ReadElement name="cnvnbr" ETF_name="cnvnbr" necessary="no" desc="协议号    "/>
+                        <ReadElement name="trstyp" ETF_name="trstyp" necessary="no" desc="交易代码    "/>
+                        <ReadElement name="c_trstyp" ETF_name="c_trstyp" necessary="no" desc="交易代码名称    "/>
+                        <ReadElement name="ccynbr" ETF_name="ccynbr" necessary="no" desc="币别    "/>
+                        <ReadElement name="eftdat" ETF_name="eftdat" necessary="no" desc="生效日期    "/>
+                        <ReadElement name="expdat " ETF_name="expdat " necessary="no" desc="失效日期    "/>
+                        <ReadElement name="sgndat" ETF_name="sgndat" necessary="no" desc="签约日期    "/>
+                        <ReadElement name="cltcnv" ETF_name="cltcnv" necessary="no" desc="三方协议标志    "/>
+                        <ReadElement name="stscod" ETF_name="stscod" necessary="no" desc="协议状态    "/>
+                    </ReadGroupElement>
+                </ReadElement>
+            </ReadElement>
+        </Response>
+    </Transaction>
 </Application>
 
 
diff --git a/cap/etc/common/CAP01_FMT.XML b/cap/etc/common/CAP01_FMT.XML
index 008a835..ff50958 100644
--- a/cap/etc/common/CAP01_FMT.XML
+++ b/cap/etc/common/CAP01_FMT.XML
@@ -23,7 +23,7 @@
         <Head type="deli_str" deli_str=";">
             <Item name="TOTAL_COUNT"/> <!--总笔数-->
             <AddItem name="ORN_CNT" expression="$TOTAL_COUNT"/>
-            <Item name="TOTAL_AMOUNT"/> <!--总金额-->
+            <Item name="TOTAL_AMOUNT" expression="FDIV($TOTAL_AMOUNT),100,2)"/> <!--总金额-->
             <AddItem name="ORN_AMT" expression="$TOTAL_AMOUNT"/>
             <Item name="TITLE_ID"/> <!--支付地抬头-->
             <Item name="CUSTOMER_ID"/> <!--客户编号-->
@@ -33,7 +33,7 @@
             <Item name="ACCT_NO"/>              <!-- 账号 -->
             <Item name="ACCT_NAME"/>            <!-- 姓名 -->
             <Item name="REF_ID"/>           <!-- 参考号 HRO明细流水号 -->
-            <Item name="AMOUNT"/>          <!-- 	金额 分为单位 -->
+            <Item name="AMOUNT" expression="FDIV($AMOUNT),100,2)"/>          <!-- 	金额 分为单位 -->
             <AddItem name="TXN_AMT" expression="$AMOUNT"/>
             <Item name="BANK_TYPE"/>            <!-- 银行名称 -->
             <Item name="BANK_CITY"/>           <!-- 开户行所在城市 -->
@@ -42,4 +42,35 @@
             <Item name="REMARK"/>             <!-- 	备注 -->
         </Data>
     </Process>
+
+    <Process name="HroFmt02" begin_ignore_line="0"
+             end_ignore_line="0" stat_flag="N">
+        <Head type="deli_str" deli_str=";">
+            <Item name="TOTAL_COUNT"/> <!--总笔数-->
+            <Item name="TOTAL_AMOUNT" expression="FMUL($TOTAL_AMOUNT),100,0)"/> <!--总金额-->
+            <Item name="SUCC_COUNT"/><!--成功笔数-->
+            <Item name="SUCC_AMOUNT" expression="FMUL($SUCC_AMOUNT),100,0)"/> <!--成功金额-->
+            <Item name="FAIL_COUNT"/><!--成功笔数-->
+            <Item name="FAIL_AMOUNT" expression="FMUL($FAIL_AMOUNT),100,0)"/> <!--成功金额-->
+            <Item name="TITLE_ID"/> <!--支付地抬头-->
+            <Item name="CUSTOMER_ID"/> <!--客户编号-->
+        </Head>
+        <Data type="deli_str" deli_str=";">
+            <Item name="ACCT_TYPE"/>              <!-- 账号类型 01：借记卡 02：贷记卡 03：准贷记卡 00：其他 -->
+            <Item name="ACCT_NO"/>              <!-- 账号 -->
+            <Item name="ACCT_NAME"/>            <!-- 姓名 -->
+            <Item name="TRANS_ID"/>           <!-- 业务平台流水号 -->
+            <Item name="REF_ID"/>           <!-- 参考号 HRO明细流水号 -->
+            <Item name="BANK_REF_ID"/>           <!-- 参考号 HRO明细流水号 -->
+            <Item name="AMOUNT" expression="FMUL($AMOUNT),100,0)"/>          <!-- 	金额 分为单位 -->
+            <Item name="BANK_TYPE"/>          <!-- 	银行类型 -->
+            <Item name="POSTSCRIPT"/>         <!-- 银行附言 -->
+            <Item name="PAYER_ACCT_NO"/>         <!-- 出账账户 -->
+            <Item name="PAYER_ACCT_NAME"/>            <!-- 出款名称 -->
+            <Item name="ORG_NO"/>            <!-- 合作机构编号 -->
+            <Item name="TRANS_STS"/>            <!-- 交易明细状态 U：未处理 S：成功 P：处理中 F：失败 T：超时 X：未知错误 -->
+            <Item name="REMARK"/>             <!-- 	备注 -->
+            <Item name="resp_Message"/>           <!-- 返回信息 -->
+        </Data>
+    </Process>
 </BATCH>
diff --git a/cap/etc/common/MACRO_CAP_COMMON.XML b/cap/etc/common/MACRO_CAP_COMMON.XML
index f879ab1..f3f695b 100644
--- a/cap/etc/common/MACRO_CAP_COMMON.XML
+++ b/cap/etc/common/MACRO_CAP_COMMON.XML
@@ -15,7 +15,7 @@
           <Set>ORD_DT=SUBSTR($ORD_DT_TM,1,8)</Set>           <!--订单交易日期-->
        </If>
        <If condition="ISNULL($TXN_CNL)">
-           <Set>TXN_CNL=CAP</Set>
+           <Set>TXN_CNL=HRO</Set>
        </If>
     </Macro>
     
@@ -249,7 +249,7 @@
           <Set>Rsp_Msg=内部错误</Set>
           <Return />
        </If>
-       <Set>CAP_ORD_NO=STRCAT(SUBSTR($CORG_MERC_ID,4,4),SUBSTR($CORG_MERC_ID,12,4),$nextval)</Set>
+       <Set>CAP_ORD_NO=STRCAT(GETDATE(),$nextval)</Set>
        <Delete>nextval</Delete>
     </Macro>
     
@@ -298,20 +298,6 @@
        <Set>CAP_ORD_NO=STRCAT(GETDATE(),$nextval)</Set>
        <Delete>nextval</Delete>
     </Macro>
-    <Macro name="GET_CMB_CAP_ORD_NO" desc="招行订单号">
-        <Exec func="PUB:GetUniqueNo">
-            <Arg name="Name" value="nextval" />
-            <Arg name="SeqNam" value="cmb_cap_sequence" />
-            <Arg name="Len" value="8" />
-        </Exec>
-        <If condition="~RetCod!=0">
-            <Set>Rsp_Cd=80</Set>
-            <Set>Rsp_Msg=内部错误</Set>
-            <Return />
-        </If>
-        <Set>CAP_ORD_NO=STRCAT(GETDATE(),$nextval)</Set>
-        <Delete>nextval</Delete>
-    </Macro>
     
     <Macro name="GET_SZFS_CAP_ORD_NO" desc="结算中心订单号">
        <Exec func="PUB:GetUniqueNo">
diff --git a/cap/etc/test/OTATEST1_CTL.XML b/cap/etc/test/OTATEST1_CTL.XML
index 0760b41..4e2395b 100644
--- a/cap/etc/test/OTATEST1_CTL.XML
+++ b/cap/etc/test/OTATEST1_CTL.XML
@@ -23,6 +23,16 @@
            <Flow>
                    <Set>RSP_CD=000000</Set>
                    <Set>RSP_MSG=000000</Set>
+                   <!--Set>@MSG.OIP=http://127.0.0.1:6666/auth?token=ZW9xpZTdvamE4SWVTNmkK&amp;permissions=10001</Set-->
+                   <!--Set>@MSG.OIP=http://127.0.0.1:6666/auth?token=ZW9xpZTdvamE4SWVTNmkK</Set-->
+                   <!--Set>@MSG._path=token=ZW9xpZTdvamE4SWVTNmkK&amp;permissions=10001</Set-->
+
+                   <Set>token=ZW9xpZTdvamE4SWVTNmkK</Set>
+                   <Set>permissions=10001</Set>
+                   <Exec func="PUB:CallThirdComm" error="IGNORE">
+                           <Arg name="HTxnCd"           value="TEST"/>
+                           <Arg name="ObjSvr"           value="SCAAUTH1"/>
+                   </Exec>
            </Flow>
    </Transaction>
 </Application>
diff --git a/cap/etc/test/SCAAUTH1_ATR.XML b/cap/etc/test/SCAAUTH1_ATR.XML
new file mode 100644
index 0000000..87b3124
--- /dev/null
+++ b/cap/etc/test/SCAAUTH1_ATR.XML
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE Server PUBLIC "-//HISUN//DTD//ATR" "ATR.dtd">
+<Server name="SCAAUTH1" type="SCA" trace="DEBUG">
+       
+        <!--Declare name="connector" class="com.hisun.protocol.http.HiHttpConnectorFormImpl"-->
+        <!--Declare name="connector" class="com.hisun.protocol.http.HiHttpConnectorImpl"-->
+        <Declare name="connector" class="com.hisun.protocol.http.HiHttpConnectorFormXmlImpl">
+            <Param name="url"    value="http://127.0.0.1:7777/auth" />
+            <Param name="method" value="GET" />
+            <Param name="tmOut"  value="3" />
+            <Param name="contentType"  value="application/x-www-form-urlencoded" />
+        </Declare>
+
+
+        <Declare name="itfengine" class="com.hisun.engine.HiEngine">
+                <Param name="ITF" value="etc/test/SCAAUTH1_ITF.XML" />
+        </Declare>
+
+        <Process name="proc1" msgtype="DEFAULT">
+                <Handler name="itfengine" />
+                <Handler name="connector" />
+                <Handler name="itfengine" />
+        </Process>
+</Server>
+
diff --git a/cap/etc/test/SCAAUTH1_ITF.XML b/cap/etc/test/SCAAUTH1_ITF.XML
new file mode 100644
index 0000000..910b0e5
--- /dev/null
+++ b/cap/etc/test/SCAAUTH1_ITF.XML
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding = "UTF-8"?>
+<Application name="cmb">
+    <Transaction code="TEST" desc="测试">
+        <Request necessary="no">
+            <WriteElement name="root">
+                    <WriteElement name="token"       ETF_name="token"       necessary="no"/>
+                    <WriteElement name="permissions" ETF_name="permissions" necessary="no"/>
+            </WriteElement>
+        </Request>
+        <Response necessary="no">
+        </Response>
+    </Transaction>
+</Application>
+
+
diff --git a/cap/etc/test/restart b/cap/etc/test/restart
new file mode 100755
index 0000000..7fbd0fc
--- /dev/null
+++ b/cap/etc/test/restart
@@ -0,0 +1 @@
+hishutdown -s OTATEST1 && hiboot -s OTATEST1 && hishutdown -s SCAAUTH1 && hiboot -s SCAAUTH1