diff --git a/cap/applib/ctg.jar b/cap/applib/ctg.jar index bd0ce2d..8a66e1f 100644 Binary files a/cap/applib/ctg.jar and b/cap/applib/ctg.jar differ diff --git a/cap/etc/batch/204025_CTL.XML b/cap/etc/batch/204025_CTL.XML index 2640b70..750f35b 100644 --- a/cap/etc/batch/204025_CTL.XML +++ b/cap/etc/batch/204025_CTL.XML @@ -304,124 +304,133 @@ - RTR_IN.BNK_TYP=$BNK_TYP - RTR_IN.CRD_FLG=$CRD_FLG - RTR_IN.CRD_NM=$CRD_NM - CAPTXNJNL.BNK_TYP=$BNK_TYP - CAPTXNJNL.CRD_FLG=$CRD_FLG - CAPTXNJNL.CRD_NM=$CRD_NM - - - - - - Rsp_Cd=80 - Rsp_Msg=查询联行号失败 - - - CAPTXNJNL.LBNK_NO=$PTY_ID - CAPTXNJNL.LBNK_NAM=$PTY_NM - - - - RTR_IN.ORD_TYP=$ORD_TYP - RTR_IN.PAY_TYP=$PAY_TYP - RTR_IN.AC_NO=$CAPTXNJNL.ACCT_NO - RTR_IN.TXN_AMT=$TXN_AMT - RTR_IN.TXN_CNL=HRO - RTR_IN.TXN_MOD=$TXN_MOD - RTR_IN.GRP_NM=$GRP_NM - - - - - RTR_IN - MSG_CD|RTR_OUT - - - - - CORG_NO=@O.RTR_OUT.CORG_NO - ROUT_FLG=@O.RTR_OUT.ROUT_FLG - CAPTXNJNL.ROUT_FLG=$ROUT_FLG - CAPTXNJNL.CORG_NO=$CORG_NO - CORG_NO=@O.RTR_OUT.CORG_NO - - CAPTXNJNL.BNK_FLG=Y - - - CAPTXNJNL.BNK_FLG=N - - - - Rsp_Cd=80 - Rsp_Msg=计算动态路由失败 - - - - - - - Rsp_Cd=99 - Rsp_Msg=路由查找失败 - - - - - Rsp_Cd=88 - Rsp_Msg=交易路由查找失败 - - - - - CORG_NO=@O.RTR_OUT.CORG_NO - Rsp_Cd=00 - - - TXN_AMT2=AMTPOWER($TXN_AMT,2) - - - - - - - - Rsp_Cd=31 - Rsp_Msg=支付地信息有误 - - - - - ACT_FLG=$ACT_FLG - ACT_FLG=PL - - - - CAPTXNJNL.JRN_NO=$JRN_NO - CAPTXNJNL.CAP_ORD_NO=$CAP_ORD_NO - - CAPTXNJNL.MERC_FEE_AMT=0 - CAPTXNJNL.AC_DT=$AC_DT - - TXN_AMT2=AMTPOWER($CAPTXNJNL.TXN_AMT,2) - - - TXN_AMT2|TIM_RAG| - MSG_CD|TXN_STS|RSP_CD|RSP_MSG| - - - CAPTXNJNL.TXN_STS=@O.TXN_STS - CAPTXNJNL.RSP_CD=@O.RSP_CD - CAPTXNJNL.RSP_MSG=@O.RSP_MSG - CAPTXNJNL.RSP_MSG=@O.RSP_MSG + + CAPTXNJNL.TXN_STS=F + CAPTXNJNL.RSP_CD=80 + CAPTXNJNL.RSP_MSG=卡宾查找失败 CAPTXNJNL.DSK_NAM_STS=4 - TIM_RAG.DAY_AMT=ADD($TIM_RAG.DAY_AMT,$TXN_AMT2) - TIM_RAG.MTH_AMT=ADD($TIM_RAG.MTH_AMT,$TXN_AMT2) - TIM_RAG.YAR_AMT=ADD($TIM_RAG.YAR_AMT,$TXN_AMT2) + RTR_IN.BNK_TYP=$BNK_TYP + RTR_IN.CRD_FLG=$CRD_FLG + RTR_IN.CRD_NM=$CRD_NM + CAPTXNJNL.BNK_TYP=$BNK_TYP + CAPTXNJNL.CRD_FLG=$CRD_FLG + CAPTXNJNL.CRD_NM=$CRD_NM + + + + + + Rsp_Cd=80 + Rsp_Msg=查询联行号失败 + + + CAPTXNJNL.LBNK_NO=$PTY_ID + CAPTXNJNL.LBNK_NAM=$PTY_NM + + + + RTR_IN.ORD_TYP=$ORD_TYP + RTR_IN.PAY_TYP=$PAY_TYP + RTR_IN.AC_NO=$CAPTXNJNL.ACCT_NO + RTR_IN.TXN_AMT=$TXN_AMT + RTR_IN.TXN_CNL=HRO + RTR_IN.TXN_MOD=$TXN_MOD + RTR_IN.GRP_NM=$GRP_NM + + + + + RTR_IN + MSG_CD|RTR_OUT + + + + + CORG_NO=@O.RTR_OUT.CORG_NO + ROUT_FLG=@O.RTR_OUT.ROUT_FLG + CAPTXNJNL.ROUT_FLG=$ROUT_FLG + CAPTXNJNL.CORG_NO=$CORG_NO + CORG_NO=@O.RTR_OUT.CORG_NO + + CAPTXNJNL.BNK_FLG=Y + + + CAPTXNJNL.BNK_FLG=N + + + + Rsp_Cd=80 + Rsp_Msg=计算动态路由失败 + + + + + + + Rsp_Cd=99 + Rsp_Msg=路由查找失败 + + + + + Rsp_Cd=88 + Rsp_Msg=交易路由查找失败 + + + + + CORG_NO=@O.RTR_OUT.CORG_NO + Rsp_Cd=00 + + + TXN_AMT2=AMTPOWER($TXN_AMT,2) + + + + + + + + Rsp_Cd=31 + Rsp_Msg=支付地信息有误 + + + + + ACT_FLG=$ACT_FLG + ACT_FLG=PL + + + + CAPTXNJNL.JRN_NO=$JRN_NO + CAPTXNJNL.CAP_ORD_NO=$CAP_ORD_NO + + CAPTXNJNL.MERC_FEE_AMT=0 + CAPTXNJNL.AC_DT=$AC_DT + + TXN_AMT2=AMTPOWER($CAPTXNJNL.TXN_AMT,2) + + + TXN_AMT2|TIM_RAG| + MSG_CD|TXN_STS|RSP_CD|RSP_MSG| + + + CAPTXNJNL.TXN_STS=@O.TXN_STS + CAPTXNJNL.RSP_CD=@O.RSP_CD + CAPTXNJNL.RSP_MSG=@O.RSP_MSG + CAPTXNJNL.RSP_MSG=@O.RSP_MSG + CAPTXNJNL.DSK_NAM_STS=4 + + + TIM_RAG.DAY_AMT=ADD($TIM_RAG.DAY_AMT,$TXN_AMT2) + TIM_RAG.MTH_AMT=ADD($TIM_RAG.MTH_AMT,$TXN_AMT2) + TIM_RAG.YAR_AMT=ADD($TIM_RAG.YAR_AMT,$TXN_AMT2) + + diff --git a/cap/etc/batch/BAT_GET_DISK_RESULT_CTL.XML b/cap/etc/batch/BAT_GET_DISK_RESULT_CTL.XML index 925881a..93f3118 100644 --- a/cap/etc/batch/BAT_GET_DISK_RESULT_CTL.XML +++ b/cap/etc/batch/BAT_GET_DISK_RESULT_CTL.XML @@ -9,14 +9,14 @@ select dsk_nam from (select A.dsk_nam,B.rank from CAPDSKINF A,CAPCUSINF B where A.dsk_nam in (select dsk_nam from (select dsk_nam,sum(unfinished_num) unfinished_num,sum(finish_num) finish_num - from (select dsk_nam,(case when BAT_STS!= '4' then 1 else 0 end) - unfinished_num ,(case when BAT_STS= '4' then 1 else 0 end) finish_num + from (select dsk_nam,(case when BAT_STS not in ('4','0') then 1 else 0 end) + unfinished_num ,(case when BAT_STS in ('4','2') then 1 else 0 end) finish_num from CAPBATINF b where b.dsk_nam in (select DSK_NAM from CAPDSKINF a where a.dsk_sts = '1' and ORD_DT >= ? )) group by dsk_nam) c where c.unfinished_num = 0 and c.finish_num > 0) AND A.Customer_Id = B.Customer_Id order by rank ) - where ROWNUM <= '5' + where ROWNUM <= '5' DT_BEFER| @@ -126,7 +126,6 @@ - @@ -214,7 +213,6 @@ DSK_STS=4 - DISK_NO=$DSK_NO diff --git a/cap/etc/batch/BAT_GET_TIMER_CTL.XML b/cap/etc/batch/BAT_GET_TIMER_CTL.XML index c438e65..f01be43 100644 --- a/cap/etc/batch/BAT_GET_TIMER_CTL.XML +++ b/cap/etc/batch/BAT_GET_TIMER_CTL.XML @@ -16,13 +16,14 @@ AND A.ORD_DT > ? AND A.CORG_NO =? AND A.PRO_JRL = '0' + AND (SND_TIME<=?) AND (A.GET_TIME <=? OR A.GET_TIME IS NULL) AND A.DSK_NAM = B.DSK_NAM AND B.Customer_Id = C.Customer_Id order by rank) where ROWNUM = '1' ) FOR UPDATE skip locked - TOD_DT|CORG_NO|C_GET_TIME| + TOD_DT|CORG_NO|C_SND_TIME|C_GET_TIME| @@ -40,15 +41,16 @@ - + SND_TIME_INTERVAL=$SND_TIME_INTERVAL END_DT=$CRE_DT END_TM=$CRE_TM TOD_DT=CALCDATE(GETDATE(),-,d,3) - - C_GET_TIME=SUBSTR(CALCTIME(GETDATETIME(MMDDHHMISS),-,m,10),3,8) + + C_SND_TIME=SUBSTR(CALCTIME(GETDATETIME(MMDDHHMISS),-,m,$SND_TIME_INTERVAL),3,8) + C_GET_TIME=SUBSTR(CALCTIME(GETDATETIME(MMDDHHMISS),-,m,5),3,8) diff --git a/cap/etc/batch/BAT_QRYRFD_TIMER_CTL.XML b/cap/etc/batch/BAT_QRYRFD_TIMER_CTL.XML index ed61f54..6200a08 100644 --- a/cap/etc/batch/BAT_QRYRFD_TIMER_CTL.XML +++ b/cap/etc/batch/BAT_QRYRFD_TIMER_CTL.XML @@ -6,11 +6,8 @@ - select br_no brNo,acct_no acctNo,'B' ACCT_TYPE from CAPACCOUNTINF - where bank_code='CMB' and enabled='Y' and acct_no='755936020410802' - union all - select br_no brNo,acct_no acctNo, 'N' ACCT_TYPE from CAPACCOUNTINF - where bank_code='CMB' and enabled='Y' and acct_no='755936020410802' + select br_no brNo,acct_no acctNo,ACCT_TYPE from CAPACCOUNTINF + where bank_code='CMB' and enabled='Y' | diff --git a/cap/etc/batch/DISKRESULLT_PKG.XML b/cap/etc/batch/DISKRESULLT_PKG.XML index 16c2744..736576b 100644 --- a/cap/etc/batch/DISKRESULLT_PKG.XML +++ b/cap/etc/batch/DISKRESULLT_PKG.XML @@ -8,7 +8,7 @@ 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,ORD_DT FROM CAPDSKINF - WHERE DSK_NO = ? + WHERE DSK_NAM = ? DSK_NAM| diff --git a/cap/etc/batch/ZLL_TEST_CTL.XML b/cap/etc/batch/ZLL_TEST_CTL.XML index a735c4b..61c87b0 100644 --- a/cap/etc/batch/ZLL_TEST_CTL.XML +++ b/cap/etc/batch/ZLL_TEST_CTL.XML @@ -69,7 +69,16 @@ - + + TESTNAME=initBatch_CMB + DSK_NAM=2021031500002 + ORD_DT=GETDATE() + TXN_MOD=02 + MERC_ID=769346321368612 + FIL_TYP=02 + AC_DT=GETDATE() + SERVER=OFRTCAP1 + diff --git a/cap/etc/channel/cmb/Batch_CMB.XML b/cap/etc/channel/cmb/Batch_CMB.XML index ae28cfc..1fa0119 100644 --- a/cap/etc/channel/cmb/Batch_CMB.XML +++ b/cap/etc/channel/cmb/Batch_CMB.XML @@ -3,7 +3,7 @@ - + SELECT COUNT(*) BAT_CNT FROM CAPTXNJNL WHERE DSK_NAM=? AND ROUT_FLG=? AND TAC_TYP=? AND ORD_DT=? AND CORG_NO=? AND TXN_MOD=? AND @@ -12,23 +12,47 @@ DSK_NAM|ROUT_FLG|TAC_TYP|ORD_DT|CORG_NO|TXN_MOD|MAX_CNT + + + + SELECT COUNT(*) BAT_CNT FROM CAPTXNJNL + WHERE DSK_NAM=? AND ROUT_FLG IN ('LARGE','SMALL') AND TAC_TYP=? AND ORD_DT=? AND CORG_NO=? AND TXN_MOD=? AND + DSK_NAM_STS='0' AND + TXN_STS='U' AND CORG_DSK_NO = '0' AND ROWNUM <= ? + + DSK_NAM|TAC_TYP|ORD_DT|CORG_NO|TXN_MOD|MAX_CNT + + - SELECT ROUT_FLG,tac_typ FROM CAPTXNJNL + SELECT ROUTFLAG,tac_typ FROM ( + SELECT decode(ROUT_FLG,'SUPER','SUPER','LARGE','NOSUP','SMALL','NOSUP') ROUTFLAG ,tac_typ FROM CAPTXNJNL WHERE DSK_NAM=? AND ORD_DT=? AND CORG_NO=? AND TXN_MOD=? AND DSK_NAM_STS='0' AND - TXN_STS='U' AND CORG_DSK_NO = '0' AND ROWNUM <= ? - group by ROUT_FLG,tac_typ + TXN_STS='U' AND CORG_DSK_NO = '0') + group by ROUTFLAG,tac_typ - DSK_NAM|ORD_DT|CORG_NO|TXN_MOD|MAX_CNT + DSK_NAM|ORD_DT|CORG_NO|TXN_MOD| + + - UPDATE CAPTXNJNL SET CORG_DSK_NO = ?,trx_seq=lpad(rownum,8,0) - WHERE DSK_NAM=? AND ROUT_FLG=? AND ORD_DT=? AND CORG_NO=? AND TXN_MOD=? AND DSK_NAM_STS='0' AND + UPDATE CAPTXNJNL SET CORG_DSK_NO = ?,trx_seq=lpad(rownum,8,0),TXN_CD = ?, TTXN_CD = ? + WHERE DSK_NAM=? AND ROUT_FLG=? AND TAC_TYP=? AND ORD_DT=? AND CORG_NO=? AND TXN_MOD=? AND DSK_NAM_STS='0' AND TXN_STS='U' AND CORG_DSK_NO = '0' AND ROWNUM <= ? - CORG_DSK_NO|DSK_NAM|ROUT_FLG|ORD_DT|CORG_NO|TXN_MOD|MAX_CNT + CORG_DSK_NO|TXN_CD|TTXN_CD|DSK_NAM|ROUT_FLG|TAC_TYP|ORD_DT|CORG_NO|TXN_MOD|MAX_CNT| + + + + UPDATE CAPTXNJNL SET CORG_DSK_NO = ?,trx_seq=lpad(rownum,8,0),TXN_CD = ?, TTXN_CD = ? + WHERE DSK_NAM=? AND ROUT_FLG IN ('LARGE','SMALL') AND TAC_TYP=? AND ORD_DT=? AND CORG_NO=? AND TXN_MOD=? AND DSK_NAM_STS='0' AND + TXN_STS='U' AND CORG_DSK_NO = '0' AND ROWNUM <= ? + + CORG_DSK_NO|TXN_CD|TTXN_CD|DSK_NAM|TAC_TYP|ORD_DT|CORG_NO|TXN_MOD|MAX_CNT + + SELECT COUNT(*) BAT_CNT,NVL(SUM(TXN_AMT),0) BAT_SUM FROM CAPTXNJNL @@ -36,21 +60,6 @@ DSK_NAM|ORD_DT|CORG_NO|CORG_DSK_NO - - - UPDATE CAPTXNJNL SET TXN_CD = ?, TTXN_CD = ? - WHERE DSK_NAM=? AND ORD_DT = ? AND CORG_NO=? AND CORG_DSK_NO = ? AND DSK_NAM_STS='0' AND TXN_STS='U' - - TXN_CD|TTXN_CD|DSK_NAM|ORD_DT|CORG_NO|CORG_DSK_NO - - - - UPDATE CAPBATINF SET BAT_VER_STS= '1' - WHERE DSK_NAM=? AND ORD_DT = ? AND CORG_NO=? AND CORG_DSK_NO = ? - - DSK_NAM|ORD_DT|CORG_NO|CORG_DSK_NO - - @@ -73,10 +82,9 @@ - - - - + Rsp_Cd=80 + Rsp_Msg=查询数据库失败 + @@ -85,15 +93,49 @@ - Rsp_Cd=80 - Rsp_Msg=循环游标失败 + Rsp_Cd=80 + Rsp_Msg=查询数据库失败 + + - ROUT_FLG=$ROUT_FLG + + ROUT_FLG=$ROUTFLAG TAC_TYP=$TAC_TYP + + + TXN_CD=204020 + + + TTXN_CD=NTAGCSAI + CHECK_TMPE=QryBatCnt + UPDATE_TMPE=UpdDskNo + + + + TTXN_CD=NTAGCAPI + CHECK_TMPE=QryBatCnt + UPDATE_TMPE=UpdDskNo + + + + TTXN_CD=NTAGCSAL + CHECK_TMPE=QryBatCnt1 + UPDATE_TMPE=UpdDskNo1 + + + + TTXN_CD=NTAGCAPY + CHECK_TMPE=QryBatCnt1 + UPDATE_TMPE=UpdDskNo1 + + + TTXN_CD= + + - + Rsp_Cd=80 @@ -115,7 +157,7 @@ - + Rsp_Cd=80 @@ -135,38 +177,8 @@ BAT_ORN_AMT=$BAT_SUM BAT_ORN_CNT=$BAT_CNT - - TXN_CD=204020 - - - TTXN_CD=NTAGCSAI - - - - TTXN_CD=NTAGCAPI - - - - TTXN_CD=NTAGCSAL - - - - TTXN_CD=NTAGCAPY - - - TTXN_CD= - - - - - - Rsp_Cd=80 - Rsp_Msg=初始化流水信息失败 - - - - + BAT_VER_STS=1 CORG_MERC_ID=CMB @@ -192,15 +204,7 @@ - - + @@ -238,9 +242,9 @@ SELECT TAC_TYP,ROUT_FLG,BR_NO,TAC_NO,substrb(POSTSCRIPT,0,40) POSTSCRIPT FROM CAPTXNJNL WHERE DSK_NAM=? - AND CORG_DSK_NO=? and rownum=1 + AND CORG_DSK_NO=? and ORD_DT = ? and rownum=1 - DSK_NAM|CORG_DSK_NO| + DSK_NAM|CORG_DSK_NO|ORD_DT| @@ -297,8 +301,7 @@ SET BAT_STS=?, RSP_CD = ?, RSP_MSG = ?, - CORG_JRN_NO=?, - snd_time=to_char(sysdate,'yyyy') + CORG_JRN_NO=? WHERE ORD_DT=? AND CORG_NO=? @@ -315,6 +318,28 @@ ORD_DT|CORG_NO|CORG_DSK_NO| + + + + UPDATE CAPTXNJNL + SET DSK_NAM_STS='1', + TXN_STS='F', + TTXN_ST='F', + RSP_CD = '80', + RSP_MSG = ?, + WHERE DSK_NAM=? + AND + ORD_DT=? + AND CORG_NO=? + AND CORG_DSK_NO = ? + AND TXN_MOD=? + AND + DSK_NAM_STS='0' + AND TXN_STS='U' + + RSP_MSG|DSK_NAM|ORD_DT|CORG_NO|CORG_DSK_NO|TXN_MOD| + + @@ -349,6 +374,8 @@ + TRSP_CD + TRSP_MSG RSP_CD RSP_MSG SUM @@ -498,16 +525,27 @@ BAT_STS=3 Rsp_Cd=$resultcode - TRsp_Msg=$resultmsg - Rsp_Msg=$resultmsg + TRsp_Msg=SUBSTR($resultmsg,1,100) + Rsp_Msg=SUBSTR($resultmsg,1,100) TRSP_CD=$resultcode + + BAT_STS=2 + + + + + + Rsp_Cd=80 + Rsp_Msg=更新该批次流水处理状态失败 + + BAT_STS=1 Rsp_Cd=80 TRsp_Msg=交易成功 - Rsp_Msg=$resultmsg + Rsp_Msg=SUBSTR($resultmsg,1,100) TRSP_CD=$resultcode @@ -580,16 +618,17 @@ UPDATE CAPTXNJNL A SET - (TTXN_ST,TXN_STS,DSK_NAM_STS,TACC_DT,TACC_TM,TRSP_CD,TRSP_MSG,RSP_MSG,CORG_JRN_NO) + (TTXN_ST,TXN_STS,DSK_NAM_STS,TACC_DT,TACC_TM,TRSP_CD,TRSP_MSG,RSP_CD,RSP_MSG,CORG_JRN_NO) = ( SELECT 'F' TTXN_ST, 'F' TXN_STS, '4', ?, ?, - ' ', - ' ', - ' ', + ?, + ?, + ?, + ?, ' ' CORG_JRN_NO from dual ) @@ -598,8 +637,9 @@ AND A.CORG_DSK_NO = ? AND (A.TTXN_ST = 'U' OR A.TTXN_ST = 'P') + AND ORD_DT=? - TACC_DT|TACC_TM|OCORG_DSK_NO + TACC_DT|TACC_TM|TRSP_CD|TRSP_MSG|RSP_CD|RSP_MSG|OCORG_DSK_NO|OORD_DT| @@ -625,8 +665,9 @@ AND A.CORG_DSK_NO = ? AND (A.TTXN_ST = 'U' OR A.TTXN_ST = 'P') + AND ORD_DT=? - TACC_DT|TACC_TM|OCORG_DSK_NO + TACC_DT|TACC_TM|OCORG_DSK_NO|OORD_DT| @@ -740,8 +781,13 @@ + RSPCOD + RESULTCODE + REQSTA RSP_CD RSP_MSG + TRSP_CD + TRSP_MSG SUM @@ -819,6 +865,7 @@ + rspcod=$rspcod EVENT.DRW_AC_BAL=0.01 @@ -833,7 +880,21 @@ - + + + Rsp_Cd=80 + Rsp_Msg=付款账户余额不足 + TRsp_Cd=$A6A0587 + TRsp_Msg=账户透支 + + + + Rsp_Cd=80 + Rsp_Msg=银行整批处理失败 + TRsp_Cd= + TRsp_Msg= + + @@ -845,8 +906,6 @@ BAT_STS=4 - Rsp_Cd=00 - Rsp_Msg=交易处理中... BAT_SUC_AMT=0 BAT_SUC_CNT=0 BAT_FAL_AMT=$BAT_SUM @@ -993,7 +1052,7 @@ BAT_STS=4 Rsp_Cd=00 - Rsp_Msg=交易处理中... + Rsp_Msg=交易整批处理失败 BAT_SUC_AMT=0 BAT_SUC_CNT=0 BAT_FAL_AMT=$BAT_SUM @@ -1028,12 +1087,15 @@ update CAPCMBRFD set (MERC_ORD_NO,CAP_ORD_NO,TAC_NO,TAC_NAM,DSK_NAM)= (select MERC_ORD_NO,CAP_ORD_NO,TAC_NO,TAC_NAM,DSK_NAM from CAPTXNJNL - where trx_seq=? and corg_dsk_no=?) + where trx_seq=? and corg_dsk_no=? and CORG_NO='CMB') where yur_ref=? and bth_dtl=? BTH_DTL|yur_ref|yur_ref|BTH_DTL + TRSP_CD + TRSP_MSG + CORG_DSK_NO=STRCAT(GETDATETIME(),$CORG_DSK_NO) bbknbr=$brNo @@ -1096,7 +1158,7 @@ RSP_MSG=交易成功 - + @@ -1108,11 +1170,12 @@ - + RET_CODE=$resultcode + - EVENT.DRW_AC_BAL=0.01 - EVENT.UDRW_AC_BAL=0.02 - EVT_TYP=EVT_ORG_AMT_OFW + EVENT.CORG_NO=CMB + EVENT.ERR_MSG=招行通道通讯异常 + EVT_TYP=EVT_CHANNEL_COMMU_FAILURE diff --git a/cap/etc/channel/cmb/SCMBPAY1_ATR.XML b/cap/etc/channel/cmb/SCMBPAY1_ATR.XML index 8fe80cb..d5f7862 100644 --- a/cap/etc/channel/cmb/SCMBPAY1_ATR.XML +++ b/cap/etc/channel/cmb/SCMBPAY1_ATR.XML @@ -1,29 +1,29 @@ - - - - - - - - - - + - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + diff --git a/cap/etc/channel/icbc/BATCH_ICBC.XML b/cap/etc/channel/icbc/BATCH_ICBC.XML index a52d080..cbb020a 100644 --- a/cap/etc/channel/icbc/BATCH_ICBC.XML +++ b/cap/etc/channel/icbc/BATCH_ICBC.XML @@ -198,7 +198,7 @@ BAT_ORN_CNT=$BAT_CNT - CORG_MERC_ID=$MERC_ID + CORG_MERC_ID=ICBC Rsp_Cd=STRCAT( , ) Rsp_Msg=STRCAT( , ) @@ -265,6 +265,30 @@ DSK_NAM|ORD_DT|CORG_NO|CORG_DSK_NO|TXN_MOD| + + + + UPDATE CAPTXNJNL + SET DSK_NAM_STS='1', + TXN_STS='F', + TTXN_ST='F', + RSP_CD = '80', + RSP_MSG = ?, + WHERE DSK_NAM=? + AND + ORD_DT=? + AND CORG_NO=? + AND CORG_DSK_NO = ? + AND TXN_MOD=? + AND + DSK_NAM_STS='0' + AND TXN_STS='U' + + RSP_MSG|DSK_NAM|ORD_DT|CORG_NO|CORG_DSK_NO|TXN_MOD| + + + + @@ -471,13 +495,13 @@ BAT_STS=3 RSP_CD=80 - RSP_MSG=文件发送成功 + RSP_MSG=批次已发送 BAT_STS=3 RSP_CD=80 - RSP_MSG=文件发送成功 + RSP_MSG=批次已发送 @@ -486,7 +510,7 @@ RSP_MSG=$TRSP_MSG - + Rsp_Cd=80 @@ -499,7 +523,7 @@ BAT_STS=1 Rsp_Cd=$TRsp_Cd - TRsp_Msg=交易成功 + TRsp_Msg=批次提交成功 Rsp_Msg=$TRsp_Msg @@ -514,9 +538,9 @@ - BAT_STS=3 + BAT_STS=3 RSP_CD=80 - RSP_MSG=交易发送成功 + RSP_MSG=批次已发送 CORG_JRN_NO=$SERIAL_NO @@ -914,7 +938,7 @@ Rsp_Cd=00 - Rsp_Msg=交易成功 + Rsp_Msg=批次处理完成 BAT_STS=4 diff --git a/cap/etc/common/MACRO_BNK_CFG.XML b/cap/etc/common/MACRO_BNK_CFG.XML index eadacbb..0308729 100644 --- a/cap/etc/common/MACRO_BNK_CFG.XML +++ b/cap/etc/common/MACRO_BNK_CFG.XML @@ -2,7 +2,7 @@ - PARA.MAX_CNT=5 + PARA.MAX_CNT=1000 GRP_CIS=020090002434552 diff --git a/cap/etc/scheduler/TIMCON_PUB.XML b/cap/etc/scheduler/TIMCON_PUB.XML index 376c775..7e30174 100644 --- a/cap/etc/scheduler/TIMCON_PUB.XML +++ b/cap/etc/scheduler/TIMCON_PUB.XML @@ -1,30 +1,36 @@ - - - - - - - - - - + - + + + + + SYS + + + + SYS + + + + SYS + + + + SYS + + + + SYS + + +