diff --git a/cap/etc/batch/204025_CTL.XML b/cap/etc/batch/204025_CTL.XML index ed2aac8..ed903b7 100644 --- a/cap/etc/batch/204025_CTL.XML +++ b/cap/etc/batch/204025_CTL.XML @@ -168,6 +168,10 @@ + + + REG_ID=@SYS.ics.sys.regionid + NOD_ID=@SYS.ics.sys.nodeid diff --git a/cap/etc/batch/BAT_GET_TIMER_CTL.XML b/cap/etc/batch/BAT_GET_TIMER_CTL.XML index 40de1e2..c1ea18c 100644 --- a/cap/etc/batch/BAT_GET_TIMER_CTL.XML +++ b/cap/etc/batch/BAT_GET_TIMER_CTL.XML @@ -15,6 +15,8 @@ WHERE (A.BAT_STS='1' OR A.BAT_STS='3') AND A.ORD_DT > ? AND A.CORG_NO =? + AND A.REG_ID = ? + AND A.NOD_ID = ? AND A.PRO_JRL = '0' AND (SND_TIME<=?) AND (A.GET_TIME <=? OR A.GET_TIME IS NULL) @@ -23,16 +25,18 @@ where ROWNUM = '1' ) FOR UPDATE skip locked - TOD_DT|CORG_NO|C_SND_TIME|C_GET_TIME| + TOD_DT|CORG_NO|REG_ID|NOD_ID|C_SND_TIME|C_GET_TIME| - UPDATE CAPBATINF SET PRO_JRL = '1' , GET_TIME = ? , REG_ID = ? , NOD_ID = ? WHERE CORG_NO = ? AND CORG_DSK_NO = ? AND AC_DT = ? + UPDATE CAPBATINF SET PRO_JRL = '1' , GET_TIME = ? WHERE CORG_NO = ? AND CORG_DSK_NO = ? AND AC_DT = ? - N_GET_TIME|REG_ID|NOD_ID|OCORG_NO|OCORG_DSK_NO|OAC_DT| + N_GET_TIME|OCORG_NO|OCORG_DSK_NO|OAC_DT| - + + REG_ID=@SYS.ics.sys.regionid + NOD_ID=@SYS.ics.sys.nodeid @MSG.WSO=/do_success.jsp IS_TEST=FALSE @@ -63,8 +67,8 @@ N_GET_TIME=GETDATETIME(DDHHMISS) - REG_ID=@SYS.ics.sys.regionid - NOD_ID=@SYS.ics.sys.nodeid + diff --git a/cap/etc/batch/BAT_SEND_TIMER_CTL.XML b/cap/etc/batch/BAT_SEND_TIMER_CTL.XML index c0eecbb..c1862d6 100644 --- a/cap/etc/batch/BAT_SEND_TIMER_CTL.XML +++ b/cap/etc/batch/BAT_SEND_TIMER_CTL.XML @@ -12,6 +12,8 @@ WHERE A.BAT_STS = '0' AND A.ORD_DT > ? AND A.PRO_JRL = '0' + AND A.REG_ID = ? + AND A.NOD_ID = ? AND (A.SND_TIME<=? OR A.SND_TIME IS NULL) AND A.CORG_NO = ? AND A.DSK_NAM = B.DSK_NAM AND B.Customer_Id = C.Customer_Id @@ -19,13 +21,13 @@ where ROWNUM = '1' ) FOR UPDATE skip locked - TOD_DT|C_SND_TIME|CORG_NO| + TOD_DT|REG_ID|NOD_ID|C_SND_TIME|CORG_NO| - UPDATE CAPBATINF SET PRO_JRL = '1' , SND_TIME = ? , REG_ID = ? , NOD_ID = ?,CORG_SND_DT=? WHERE CORG_NO = ? AND CORG_DSK_NO = ? AND AC_DT = ? + UPDATE CAPBATINF SET PRO_JRL = '1' , SND_TIME = ?, CORG_SND_DT=? WHERE CORG_NO = ? AND CORG_DSK_NO = ? AND AC_DT = ? - N_SND_TIME|REG_ID|NOD_ID|CORG_SND_DT|CORG_NO|CORG_DSK_NO|AC_DT| + N_SND_TIME|CORG_SND_DT|CORG_NO|CORG_DSK_NO|AC_DT| @@ -44,7 +46,8 @@ END_TM=$CRE_TM TOD_DT=CALCDATE(GETDATE(),-,d,3) - + REG_ID=@SYS.ics.sys.regionid + NOD_ID=@SYS.ics.sys.nodeid C_SND_TIME=SUBSTR(CALCTIME(GETDATETIME(MMDDHHMISS),-,m,10),3,8) @@ -62,8 +65,8 @@ TMP_SND_TIME=GETDATETIME() N_SND_TIME=SUBSTR($TMP_SND_TIME,7,8) CORG_SND_DT=SUBSTR($TMP_SND_TIME,1,8) - REG_ID=@SYS.ics.sys.regionid - NOD_ID=@SYS.ics.sys.nodeid + diff --git a/cap/etc/channel/cmb/Batch_CMB.XML b/cap/etc/channel/cmb/Batch_CMB.XML index d9398f2..7b2f0b8 100644 --- a/cap/etc/channel/cmb/Batch_CMB.XML +++ b/cap/etc/channel/cmb/Batch_CMB.XML @@ -61,6 +61,22 @@ DSK_NAM|ORD_DT|CORG_NO|CORG_DSK_NO + + + UPDATE CAPTXNJNL SET CORG_DSK_NO =' ', + TXN_CD = '204020', + ACC_VER_STS= 'S', + TXN_STS='F', + DSK_NAM_STS='4', + RSP_CD='80', + RSP_MSG='大小额渠道本代他交易银行名称或城市名称为空' + WHERE (TRIM(BANK_NAM) IS NULL OR TRIM(CITY) IS NULL) AND BNK_FLG='N' AND + DSK_NAM=? AND ROUT_FLG IN ('LARGE','SMALL') AND ORD_DT=? AND CORG_NO=? AND + TXN_MOD=? AND DSK_NAM_STS='0' AND TXN_STS='U' AND CORG_DSK_NO = '0' + + DSK_NAM|ORD_DT|CORG_NO|TXN_MOD| + + RSP_CD @@ -76,6 +92,15 @@ CORG_NO=CMB MAX_CNT=$PARA.MAX_CNT + + + + + + Rsp_Cd=80 + Rsp_Msg=更新数据失败 + + @@ -301,6 +326,8 @@ SET BAT_STS=?, RSP_CD = ?, RSP_MSG = ?, + S_RSP_CD = ?, + S_RSP_MSG = ?, CORG_JRN_NO=?, BAT_FAL_CNT =?, BAT_FAL_AMT=? @@ -310,7 +337,7 @@ AND CORG_DSK_NO=? AND BAT_STS='0' - BAT_STS|RSP_CD|RSP_MSG|CORG_JRN_NO|BAT_FAL_CNT|BAT_FAL_AMT|ORD_DT|CORG_NO|CORG_DSK_NO| + BAT_STS|RSP_CD|RSP_MSG|RSP_CD|RSP_MSG|CORG_JRN_NO|BAT_FAL_CNT|BAT_FAL_AMT|ORD_DT|CORG_NO|CORG_DSK_NO| @@ -381,6 +408,9 @@ RSP_CD RSP_MSG SUM + RET_CODE + REQNBR + @@ -413,7 +443,7 @@ reqid=STRCAT(GETDATETIME(),$CORG_DSK_NO) - + userid=$PARA.USERID TAC_NO=$TAC_NO @@ -514,13 +544,13 @@ BAT_STS=3 RSP_CD=80 - RSP_MSG=文件发送成功 + RSP_MSG=文件发送超时 BAT_STS=3 RSP_CD=80 - RSP_MSG=文件发送成功 + RSP_MSG=文件发送超时 @@ -548,9 +578,9 @@ BAT_STS=1 - Rsp_Cd=80 - TRsp_Msg=交易成功 - Rsp_Msg=SUBSTR($resultmsg,1,100) + Rsp_Cd=00 + TRsp_Msg=批次提交成功 + Rsp_Msg=$TRsp_Msg TRSP_CD=$resultcode @@ -559,7 +589,7 @@ BAT_STS=3 RSP_CD=80 - RSP_MSG=交易发送成功 + RSP_MSG=交易发送超时 @@ -589,7 +619,8 @@ SUM REC rd - + RET_CODE + REQNBR @@ -656,12 +687,12 @@ ?, ?, ERR_COD, - ERR_TXT, - decode(TTXN_ST,'S','00',ERR_COD) rsp_cd, - decode(TTXN_ST,'S','交易成功',ERR_TXT) RSP_MSG, + ERR_DSP, + decode(TTXN_ST,'S','00',80) rsp_cd, + decode(TTXN_ST,'S','交易成功',ERR_DSP) RSP_MSG, REQ_NBR CORG_JRN_NO FROM CAPCMBPERD B - WHERE B.TRX_SEQ = A.TRX_SEQ + WHERE B.TRX_SEQ = A.TRX_SEQ AND B.YUR_REF=A.CORG_DSK_NO ) WHERE A.CORG_NO = 'CMB' @@ -792,10 +823,10 @@ TRSP_CD TRSP_MSG SUM - - - - + REQNBR + RTNFLG + CORG_JRN_NO + ORD_TYP=$OBAT_TYP CORG_NO=CMB @@ -924,17 +955,21 @@ - + Rsp_Cd=80 Rsp_Msg=第三方业务未完成 - + TACC_DT=GETDATE() TACC_TM=GETDATETIME(HHMISS) - + REQNBR=$REQNBR + CORG_JRN_NO=TRIM($REQNBR,both) + + + TX_COD=NTAGDINF reqnbr=$CORG_JRN_NO @@ -956,12 +991,16 @@ + + + + req_nbr=$CORG_JRN_NO yur_ref=$OCORG_DSK_NO - + @@ -1027,7 +1066,7 @@ Rsp_Cd=00 - Rsp_Msg=交易成功 + Rsp_Msg=批次处理完成 BAT_STS=4 @@ -1056,7 +1095,7 @@ BAT_STS=2 - Rsp_Cd=00 + Rsp_Cd=80 Rsp_Msg=交易整批处理失败 BAT_SUC_AMT=0 BAT_SUC_CNT=0 @@ -1112,7 +1151,7 @@ rep_num ntagdrfdz1_NUM - + CORG_DSK_NO=STRCAT(GETDATETIME(),$CORG_DSK_NO) @@ -1257,4 +1296,43 @@ + + + + TX_COD=NTAGTLS2 + reqid=STRCAT(GETDATETIME(),000000) + userid=$PARA.USERID + buscod=N03020 + + + + + + + + RSP_CD=00 + RSP_MSG=交易成功 + + + + + + + + TX_COD=NTAGDINF + reqid=STRCAT(GETDATETIME(),000000) + userid=$PARA.USERID + reqnbr=$reqnbr + + + + + + + + RSP_CD=00 + RSP_MSG=交易成功 + + + diff --git a/cap/etc/channel/icbc/BATCH_ICBC.XML b/cap/etc/channel/icbc/BATCH_ICBC.XML index 7bc22cf..2645796 100644 --- a/cap/etc/channel/icbc/BATCH_ICBC.XML +++ b/cap/etc/channel/icbc/BATCH_ICBC.XML @@ -279,6 +279,8 @@ SET BAT_STS=?, RSP_CD = ?, RSP_MSG = ?, + S_RSP_CD = ?, + S_RSP_MSG = ?, CORG_JRN_NO=?, BAT_FAL_CNT =?, BAT_FAL_AMT=? @@ -288,7 +290,7 @@ AND CORG_DSK_NO=? AND BAT_STS='0' - BAT_STS|RSP_CD|RSP_MSG|CORG_JRN_NO|BAT_FAL_CNT|BAT_FAL_AMT|ORD_DT|CORG_NO|CORG_DSK_NO + BAT_STS|RSP_CD|RSP_MSG|RSP_CD|RSP_MSG|CORG_JRN_NO|BAT_FAL_CNT|BAT_FAL_AMT|ORD_DT|CORG_NO|CORG_DSK_NO @@ -492,14 +494,14 @@ TRSP_CD=$TRSP_CD BAT_STS=3 - RSP_CD=80 - RSP_MSG=批次已发送 + RSP_CD=$TRSP_CD + RSP_MSG=SUBSTR($TRSP_MSG,1,100) BAT_STS=2 RSP_CD=$TRSP_CD - RSP_MSG=$TRSP_MSG + RSP_MSG=SUBSTR($TRSP_MSG,1,100) BAT_FAL_CNT=$BAT_ORN_CNT BAT_FAL_AMT=$BAT_ORN_AMT @@ -515,8 +517,8 @@ - - SMS_FLAG=0 + + SMS_FLAG=0 BAT_STS=1 Rsp_Cd=$TRsp_Cd @@ -773,10 +775,7 @@ - - - - + ORD_TYP=$OBAT_TYP @@ -920,7 +919,7 @@ Rsp_Msg=更新该批次为发送处理状态失败 - + BAT_STS=5 @@ -937,6 +936,10 @@ + + + + SMS_FLAG=0 @@ -1101,12 +1104,12 @@ Rsp_Cd=00 - Rsp_Msg=成功 + Rsp_Msg=心跳检查成功 - Rsp_Cd=80 - Rsp_Msg=失败 + Rsp_Cd=00 + Rsp_Msg=心跳检查成功