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 @@ + 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 @@ - - + + + - - - - - - - - - - - + + + + + + + + + + + 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 @@ 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 > ? AND CORG_NO!='SZFS' AND PRO_JRL = '0' AND (GET_TIME <=? OR GET_TIME IS NULL) AND ROWNUM = '1' FOR UPDATE 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 @@ - SELECT MERC_ID,CORG_DSK_NO,SND_DT,SND_TM FROM CAPBATINF WHERE SND_TM <= 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 <= TO_CHAR(SYSDATE-20/24/60,'YYYYMMDDHH24MISS') AND BAT_STS in('1','3') @@ -146,4 +146,4 @@ Rsp_Msg=交易成功 - + 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 @@ + + + + + + + + + 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 = ? + + DSK_NO|APPLY_DATE| + + + + + + + + DSK_NO=$DISK_NO + APPLY_DATE=$APPLY_DATE + MAKE_FILE=$MAKE_FILE + + + + + + Rsp_Cd=80 + Rsp_Msg=批次不存在 + + + + + + + + DISK_STS=$DSK_STS + DISK_MESSAGE=$DISK_MESSAGE + LAST_DATE=SUBSTR($TM_SMP,0,8) + LAST_TIME=SUBSTR($TM_SMP,9,6) + TOTAL_COUNT=$ORN_CNT + TOTAL_AMOUNT=FMUL($ORN_AMT,100,0) + SUCC_COUNT=$SUC_CNT + SUCC_AMOUNT=FMUL($SUC_AMT,100,0) + FAIL_COUNT=$FAL_CNT + FAIL_AMOUNT=FMUL($FAL_AMT,100,0) + FILE_PATH=$FILE_PATH + MD5=$MMD5_RESULT + + + Rsp_Cd=00 + Rsp_Msg=交易成功 + + + 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 @@ + + + + + + + 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 = ? + + DSK_NO| + + + + SELECT count(1) BAT_NUM FROM CAPDSKINF + WHERE DSK_NAM = ? AND (BAT_STS <4 OR BAT_STS >4) + + DSK_NO| + + + + 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 = ? + + DSK_NAM| + + + + + + + + + + Rsp_Cd=80 + Rsp_Msg=批次不存在 + + + + Rsp_Cd=80 + Rsp_Msg=批次未完成 + + + + + + + + Rsp_Cd=80 + Rsp_Msg=系统异常 + + + + Rsp_Cd=80 + Rsp_Msg=批次未完成 + + + + + FIL_PTH=STRCAT(GETENV(WORKDIR),/dat/cap/send/) + FIL_NAM=STRCAT(CAP_HSTCHK_,$CHK_DAT) + + + + + + + + + Rsp_Cd=80 + Rsp_Msg=失败 + + + + + + + Rsp_Cd=80 + Rsp_Msg=数据不存在 + + + + + + + + Rsp_Cd=00 + Rsp_Msg=成功 + + + + + + + + + + + + + + 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 @@ - + + 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 @@ - 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 ? 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 @@ TESTNAME=CUSTOMER_SYNC - CUSTOMER_ID=1111 - CUSTOMER_NAME=HAHAHAHHAH - CUSTOMER_CODE=1111 - RANK=1111 + CUSTOMER_ID=1112 + CUSTOMER_NAME=测试客户2 + CUSTOMER_CODE=1112 + RANK=112 ENABLED=Y TESTNAME=TITLE_SYNC - TITLE_ID=1111 - TITLE_NAME=HAHAHAHHAH - BANK_CODE=1111 - BR_NO=1111 - ACCT_NO=11111111 - ACCT_NAME=HAHAHAHAH + TITLE_ID=1112 + TITLE_NAME=测试数据2 + BANK_CODE=1112 + BR_NO=1112 + ACCT_TYPE=B + ACCT_NO=11111112 + ACCT_NAME=测试账户2 COST_ITEM=1111 ENABLED=Y 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' - BAT_STS|RSP_CD|RSP_MSG|ORD_DT|CORG_NO|CORG_DSK_NO|AC_DT + BAT_STS|RSP_CD|RSP_MSG|CORG_JRN_NO|ORD_DT|CORG_NO|CORG_DSK_NO|AC_DT + + + UPDATE CAPBATINF SET PRO_JRL ='0' + WHERE ORD_DT=? AND CORG_NO=? AND CORG_DSK_NO=? AND AC_DT=? AND PRO_JRL='1' + + ORD_DT|CORG_NO|CORG_DSK_NO|AC_DT| + @@ -327,8 +335,6 @@ RSP_CD RSP_MSG SUM - REC - rd @@ -349,6 +355,7 @@ sql_cmd=Qry_Export_CW grp_nam=ntagcsaix2 busmod= + payacc=$tac_no @@ -358,6 +365,7 @@ sql_cmd=Qry_Export_CW grp_nam=ntagcsaix2 busmod= + payacc=$tac_no @@ -367,6 +375,7 @@ sql_cmd=Qry_Export grp_nam=ntagcdtly1 busmod= + accnbr=$tac_no @@ -376,6 +385,7 @@ sql_cmd=Qry_Export grp_nam=ntagcdtly1 busmod= + accnbr=$tac_no Rsp_Cd=80 @@ -392,7 +402,6 @@ ttlnum=1 ccynbr=10 bbknbr=$BR_NO - accnbr=$tac_no ccymkt=0 @@ -443,6 +452,8 @@ + ~RetCod=0 + RET_CODE=SUC0000 @@ -478,7 +489,6 @@ BAT_STS=3 Rsp_Cd=$resultcode TRsp_Msg=$resultmsg - @@ -506,6 +516,7 @@ + CORG_JRN_NO=$reqnbr @@ -549,18 +560,19 @@ 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 @@ - 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') @@ -643,12 +655,12 @@ - SELECT COST_ITEM,ROUT_FLG + SELECT TAC_TYP,ROUT_FLG FROM CAPTXNJNL WHERE DSK_NAM=? AND CORG_DSK_NO=? - DSK_NAM|CORG_DSK_NO| + ODSK_NAM|OCORG_DSK_NO| @@ -699,8 +711,6 @@ ORD_TYP=$OBAT_TYP - - @@ -710,11 +720,11 @@ Rsp_Msg=查询批次流水表失败 - + buscod=N03010 - + buscod=N03020 @@ -738,7 +748,7 @@ - buscod= + yurref=$OCORG_DSK_NO @@ -761,6 +771,7 @@ + ~RetCod=0 Rsp_Cd=80 @@ -771,9 +782,6 @@ Rsp_Cd=80 Rsp_Msg=查询第三方失败 - - - @@ -793,6 +801,8 @@ + TACC_DT=$TXN_DT + TACC_TM=$TXN_TM @@ -890,7 +900,7 @@ - + select br_no brNo,acct_no acctNo from CAPACCOUNTINF @@ -898,6 +908,13 @@ | + + + select MERC_ORD_NO,CAP_ORD_NO,TAC_NO,TAC_NAM from CAPTXNJNL + where trx_seq=? and corg_dsk_no=? + + BTH_DTL|yur_ref + @@ -917,20 +934,41 @@ + ~RetCod=0 Rsp_Cd=80 Rsp_Msg=查询失败 - - - - + + - - - + N=1 + + yur_ref=ntagdrfdz1[$REC_NUM].reqnbr + BTH_DTL=ntagdrfdz1[$REC_NUM].bthdtl + + + + + RSP_CD=80 + RSP_MSG=查询批次流水表失败 + + + + + + + + + + yur_ref + BTH_DTL + N=ADD($N,1) + + + 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 @@ - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -455,7 +464,7 @@ - + @@ -486,6 +495,68 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 @@ - + @@ -33,7 +33,7 @@ - + @@ -42,4 +42,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 @@ ORD_DT=SUBSTR($ORD_DT_TM,1,8) - TXN_CNL=CAP + TXN_CNL=HRO @@ -249,7 +249,7 @@ Rsp_Msg=内部错误 - CAP_ORD_NO=STRCAT(SUBSTR($CORG_MERC_ID,4,4),SUBSTR($CORG_MERC_ID,12,4),$nextval) + CAP_ORD_NO=STRCAT(GETDATE(),$nextval) nextval @@ -298,20 +298,6 @@ CAP_ORD_NO=STRCAT(GETDATE(),$nextval) nextval - - - - - - - - Rsp_Cd=80 - Rsp_Msg=内部错误 - - - CAP_ORD_NO=STRCAT(GETDATE(),$nextval) - nextval - 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 @@ RSP_CD=000000 RSP_MSG=000000 + + + + + token=ZW9xpZTdvamE4SWVTNmkK + permissions=10001 + + + + 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 @@ + + + + + + + + + + + + + + + + + + + + + + + + + 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 @@ + + + + + + + + + + + + + + + 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