diff --git a/cap/applib/ctg.jar b/cap/applib/ctg.jar index d409400..bd0ce2d 100644 Binary files a/cap/applib/ctg.jar and b/cap/applib/ctg.jar differ diff --git a/cap/etc/api/CCAHRO1_ITF.XML b/cap/etc/api/CCAHRO1_ITF.XML index 8ade34f..fe01f0d 100644 --- a/cap/etc/api/CCAHRO1_ITF.XML +++ b/cap/etc/api/CCAHRO1_ITF.XML @@ -92,7 +92,7 @@ - + diff --git a/cap/etc/batch/204025_CTL.XML b/cap/etc/batch/204025_CTL.XML index 6b05830..795deee 100644 --- a/cap/etc/batch/204025_CTL.XML +++ b/cap/etc/batch/204025_CTL.XML @@ -1,6 +1,6 @@ - + diff --git a/cap/etc/batch/BAT_GET_DISK_RESULT_CTL.XML b/cap/etc/batch/BAT_GET_DISK_RESULT_CTL.XML index 7e73abd..364cb92 100644 --- a/cap/etc/batch/BAT_GET_DISK_RESULT_CTL.XML +++ b/cap/etc/batch/BAT_GET_DISK_RESULT_CTL.XML @@ -6,15 +6,19 @@ - select dsk_nam from + 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 CAPBATINF b where b.dsk_nam in - (select DSK_NAM from CAPDSKINF a where a.dsk_sts = '1')) group by dsk_nam) c - where c.unfinished_num = 0 and c.finish_num > 0 + (select DSK_NAM from CAPDSKINF a where a.dsk_sts = '1' and DSK_DAT >= ? )) 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 < '10' - | + DSK_DAT| @@ -62,6 +66,7 @@ + DSK_DAT=CALCDATE(GETDATE(),-,d,7) @@ -157,14 +162,22 @@ Rsp_Cd=80 Rsp_Msg=批次不存在 - + DISK_NO=$DSK_NO - DISK_STS=$DSK_STS + + DISK_STS=4 + + + DISK_STS=3 + + + DISK_STS=2 + DISK_MESSAGE=$DISK_MESSAGE LAST_DATE=SUBSTR($TM_SMP,0,8) LAST_TIME=SUBSTR($TM_SMP,9,6) diff --git a/cap/etc/batch/BAT_GET_TIMER_CTL.XML b/cap/etc/batch/BAT_GET_TIMER_CTL.XML index f0916ff..934115b 100644 --- a/cap/etc/batch/BAT_GET_TIMER_CTL.XML +++ b/cap/etc/batch/BAT_GET_TIMER_CTL.XML @@ -10,7 +10,17 @@ ,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,CORG_JRN_NO FROM CAPBATINF - WHERE (BAT_STS='1' OR BAT_STS='3') AND ORD_DT > ? AND CORG_NO =? AND PRO_JRL = '0' AND (GET_TIME <=? OR GET_TIME IS NULL) AND ROWNUM = '1' FOR UPDATE skip locked + where Corg_Dsk_No in (select Corg_Dsk_No from ( SELECT A.Corg_Dsk_No + FROM CAPBATINF A,CAPDSKINF B,CAPCUSINF C + WHERE (A.BAT_STS='1' OR A.BAT_STS='3') + AND A.ORD_DT > ? + AND A.CORG_NO =? + AND A.PRO_JRL = '0' + 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| diff --git a/cap/etc/batch/BAT_SEND_TIMER_CTL.XML b/cap/etc/batch/BAT_SEND_TIMER_CTL.XML index 980f9f2..719e6b0 100644 --- a/cap/etc/batch/BAT_SEND_TIMER_CTL.XML +++ b/cap/etc/batch/BAT_SEND_TIMER_CTL.XML @@ -6,14 +6,18 @@ - SELECT * - FROM CAPBATINF - WHERE BAT_STS = '0' - AND ORD_DT > ? - AND PRO_JRL = '0' - AND (SND_TIME <=? OR SND_TIME IS NULL) - AND CORG_NO = ? - AND ROWNUM = '1' FOR UPDATE skip locked + select * from CAPBATINF + where Corg_Dsk_No in (select Corg_Dsk_No from ( SELECT A.Corg_Dsk_No + FROM CAPBATINF A,CAPDSKINF B,CAPCUSINF C + WHERE A.BAT_STS = '0' + AND A.ORD_DT > ? + AND A.PRO_JRL = '0' + 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 + order by rank) + where ROWNUM = '1' ) + FOR UPDATE skip locked TOD_DT|C_SND_TIME|CORG_NO| diff --git a/cap/etc/batch/DISK_RESULT_CTL.XML b/cap/etc/batch/DISK_RESULT_CTL.XML index 6301ee0..0100ea2 100644 --- a/cap/etc/batch/DISK_RESULT_CTL.XML +++ b/cap/etc/batch/DISK_RESULT_CTL.XML @@ -27,14 +27,15 @@ Rsp_Msg=批次不存在 - CAP_STS=$DSK_STS - - - - - - - DISK_STS=$HRO_STS + + DISK_STS=4 + + + DISK_STS=3 + + + DISK_STS=2 + DISK_MESSAGE=$DISK_MESSAGE LAST_DATE=SUBSTR($TM_SMP,0,8) LAST_TIME=SUBSTR($TM_SMP,9,6) diff --git a/cap/etc/batch/REFUND_QUERY_CTL.XML b/cap/etc/batch/REFUND_QUERY_CTL.XML index 9c02957..fa17bd5 100644 --- a/cap/etc/batch/REFUND_QUERY_CTL.XML +++ b/cap/etc/batch/REFUND_QUERY_CTL.XML @@ -31,7 +31,7 @@ - RSP_CD=00 + RSP_CD=80 RSP_MSG=无查询结果 PAG_CNT=0 diff --git a/cap/etc/batch/RTR_PKG.XML b/cap/etc/batch/RTR_PKG.XML index 7d57b92..56ade73 100644 --- a/cap/etc/batch/RTR_PKG.XML +++ b/cap/etc/batch/RTR_PKG.XML @@ -19,7 +19,7 @@ AND (TRA_CD = '%s' OR TRA_CD IS NULL or TRA_CD = '') AND (CRD_FLG = '%s' OR CRD_FLG IS NULL or CRD_FLG = '') AND (b.BNK_TYP = '%s' OR b.BNK_TYP IS NULL or b.BNK_TYP = '') - AND ((TO_NUMBER(NVL(ATM_LOW,0)) <= '%s' AND TO_NUMBER(NVL(ATM_UP,99999999999)) >= '%s') OR + AND ((TO_NUMBER(NVL(ATM_LOW,0)) < '%s' AND TO_NUMBER(NVL(ATM_UP,99999999999)) >= '%s') OR (TO_NUMBER(NVL(ATM_LOW,0)) = '0' AND TO_NUMBER(NVL(ATM_UP,99999999999)) = '99999999999')) AND (DAT_LOW <= '%s' AND DAT_UP >= '%s') AND (TIM_LOW <= '%s' AND TIM_UP >= '%s') diff --git a/cap/etc/batch/ZLL_TEST_CTL.XML b/cap/etc/batch/ZLL_TEST_CTL.XML index ab1bc3a..58a37fa 100644 --- a/cap/etc/batch/ZLL_TEST_CTL.XML +++ b/cap/etc/batch/ZLL_TEST_CTL.XML @@ -35,7 +35,7 @@ TESTNAME=CARDINFO_QUERY - CARD_NO=6216610200016587010 + CARD_NO=6212260200197040005 @@ -85,4 +85,30 @@ + + + + SELECT '1' ordNo,'2' batNo from dual + + + + CAP_STS=4 + CAP_STS=FSCI0000 + + + + + + + + + HRO_STS=$HRO_STS + Rsp_CD=$Rsp_CD + RSP_CD=000000 + TRSP_CD=000000 + RSP_MSG=交易成功 + + + + diff --git a/cap/etc/channel/icbc/BATCH_ICBC.XML b/cap/etc/channel/icbc/BATCH_ICBC.XML index 14b8fce..c40199d 100644 --- a/cap/etc/channel/icbc/BATCH_ICBC.XML +++ b/cap/etc/channel/icbc/BATCH_ICBC.XML @@ -218,7 +218,9 @@ '%s' AS ori_voucher_name,'%s' AS ori_voucher_no,'%s' AS related_ref_no,CAP_ORD_NO AS i_seq_no,AC_NO AS payee_account, CUS_NAM AS payee_cnname,LBNK_NO AS payee_bank_no,'CNY' AS currency, TXN_AMT * 100 AS amount,'工资' AS purpose,POSTSCRIPT AS summary,POSTSCRIPT AS postscript,CAP_ORD_NO AS ref_no,'%s' AS payee_city, - '%s' AS payee_bank_name,'%s' AS purpose_code,'%s' AS summary_en,decode(ROUT_FLG,'SUPER','3','LARGE','1','SMALL','2') AS pay_type,decode(BNK_FLG,'Y','1','N','2') AS io_flag + '%s' AS payee_bank_name,'%s' AS purpose_code,'%s' AS summary_en, + case when BNK_FLG='Y' then '1' when BNK_FLG='N' then decode(ROUT_FLG,'SUPER','3','LARGE','1','SMALL','2') end pay_type, + decode(BNK_FLG,'Y','1','N','2') AS io_flag FROM CAPTXNJNL WHERE DSK_NAM=? AND CORG_NO = ? @@ -926,7 +928,7 @@ tran_time=STRCAT($TXN_TM,000) f_seq_no=STRCAT(SUBSTR($TXN_DT,3,6),$fSeqno) language=zh_CN - qry_f_seq_no=1 + qry_f_seq_no=202103050000000014 qry_serial_no=$qry_serial_no @@ -967,4 +969,8 @@ + + + + diff --git a/cap/etc/channel/icbc/OFRTCAPZ_CTL.XML b/cap/etc/channel/icbc/OFRTCAPZ_CTL.XML index 83914bc..21823f9 100644 --- a/cap/etc/channel/icbc/OFRTCAPZ_CTL.XML +++ b/cap/etc/channel/icbc/OFRTCAPZ_CTL.XML @@ -54,4 +54,213 @@ + + + + + + SELECT * + FROM CAPBATINF + WHERE BAT_STS = '0' + AND PRO_JRL = '0' + AND CORG_NO = 'ICBC' + AND MERC_ID='HRO' + AND ROWNUM = '1' + + + + + + SELECT * + FROM CAPBATINF + WHERE CORG_DSK_NO=? + AND ORD_DT=? + AND PRO_JRL='1' + + CORG_DSK_NO|ORD_DT| + + + + + + SELECT TAC_NO AS payer_account,TAC_NAM AS payer_cnname, + '%s' AS payer_enname,'%s' AS payee_enname,'%s' AS manager_card_no, + '%s' AS manager_card_name,'%s' AS erp_serial_no,'%s' AS busi_code,'%s' AS erp_check_no,'%s' AS ori_voucher_type, + '%s' AS ori_voucher_name,'%s' AS ori_voucher_no,'%s' AS related_ref_no,CAP_ORD_NO AS i_seq_no,AC_NO AS payee_account, + CUS_NAM AS payee_cnname,LBNK_NO AS payee_bank_no,'CNY' AS currency, + TXN_AMT * 100 AS amount,'工资' AS purpose,POSTSCRIPT AS summary,POSTSCRIPT AS postscript,CAP_ORD_NO AS ref_no,'%s' AS payee_city, + '%s' AS payee_bank_name,'%s' AS purpose_code,'%s' AS summary_en,decode(ROUT_FLG,'SUPER','3','LARGE','1','SMALL','2') AS pay_type,decode(BNK_FLG,'Y','1','N','2') AS io_flag + FROM CAPTXNJNL + WHERE DSK_NAM=? + AND CORG_NO = ? + AND CORG_DSK_NO = ? + AND ORD_DT=? + AND TXN_MOD=? + AND DSK_NAM_STS='0' + AND TXN_STS='U' + + PayAccNameEN|RecAccNameEN|ReqReserved1|ReqReserved2|ERPSqn|BusCode|ERPcheckno|CrvouhType|CrvouhName|CrvouhNo|Ref|RecCityName|RecBankName|UseCode|EnSummary|DSK_NAM|CORG_NO|CORG_DSK_NO|ORD_DT|TXN_MOD| + + + + + + + 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| + + + + + TXN_MOD=02 + ORD_TYP=12 + + + + + + + + + + + + + + + + + + + + + Rsp_Cd=80 + Rsp_Msg=查询数据库出错 + + + + BatCnt=$BAT_ORN_CNT + BatAmt=$BAT_ORN_AMT + + + TXN_DT=GETDATE() + TXN_TM=GETDATETIME(HHMISS) + SignTime=STRCAT(GETDATETIME(),000) + + StartDate=GETDATE() + StartTime=GETDATETIME(HHMISS) + MAX_CNT=$PARA.MAX_CNT + + + BAT_SEQ=0 + TTXNSERVICE=PAYENT + TTXNSERVICE1=PAYENT + QryExport=Qry_Export + ICBC_CYC_CD=001 + + CORG_DSK_NO=$CORG_DSK_NO + CORG_MERC_ID=$CORG_MERC_ID + TACC_TM=$TACC_TM + TXN_TM=SUBSTR(GETDATETIME(),9,6) + BAT_TYP=$BAT_TYP + RSP_CD=STRCAT( , ) + RSP_MSG=STRCAT( , ) + + + CIS=$GRP_CIS + Bank_Code=102 + TranDate=GETDATE() + TranTime=STRCAT(GETDATETIME(HHMISS),000) + + PayAccNameEN=STRCAT( , ) + RecAccNameEN=STRCAT( , ) + ReqReserved1=STRCAT( , ) + ReqReserved2=STRCAT( , ) + ERPSqn=STRCAT( , ) + BusCode=STRCAT( , ) + ERPcheckno=STRCAT( , ) + CrvouhType=STRCAT( , ) + CrvouhName=STRCAT( , ) + CrvouhNo=STRCAT( , ) + ReqReserved3=STRCAT( , ) + ReqReserved4=STRCAT( , ) + RecCityName=STRCAT( , ) + RecBankName=STRCAT( , ) + UseCode=STRCAT( , ) + EnSummary=STRCAT( , ) + Ref=STRCAT( , ) + + + @MSG.className=com.icbc.api.request.MybankEnterprisePayPayentRequestV1 + @MSG.uri=mybank/enterprise/pay/payent/V1 + + + trans_code=PAYENT + tran_date=$TXN_DT + tran_time=$SignTime + f_seq_no=$CORG_DSK_NO + zip_flag=0 + language=zh_CN + settle_mode=2 + busi_type=$CORG_BUS_TYP + total_amount=AMTPOWER($BatAmt,2) + instr_count=$BatCnt + summary_total=$summary_total + batch_sum_flag=$batch_sum_flag + + + + + + + + + + + + + + + + + + + BAT_STS=3 + RSP_CD=80 + RSP_MSG=文件发送成功 + + + + BAT_STS=3 + RSP_CD=80 + RSP_MSG=文件发送成功 + + + + BAT_STS=2 + RSP_CD=$TRSP_CD + RSP_MSG=$TRSP_MSG + + + + + + BAT_STS=1 + Rsp_Cd=$TRsp_Cd + TRsp_Msg=交易成功 + Rsp_Msg=$TRsp_Msg + + + + + BAT_STS=3 + RSP_CD=80 + RSP_MSG=交易发送成功 + + + + + diff --git a/cap/etc/channel/icbc/SCAICBC_ATR.XML b/cap/etc/channel/icbc/SCAICBC_ATR.XML index 2dff63b..2b48b18 100644 --- a/cap/etc/channel/icbc/SCAICBC_ATR.XML +++ b/cap/etc/channel/icbc/SCAICBC_ATR.XML @@ -1,6 +1,6 @@ - + diff --git a/cap/etc/channel/icbc/SCAICBC_ITF.XML b/cap/etc/channel/icbc/SCAICBC_ITF.XML index dd5510c..11d5771 100644 --- a/cap/etc/channel/icbc/SCAICBC_ITF.XML +++ b/cap/etc/channel/icbc/SCAICBC_ITF.XML @@ -55,7 +55,7 @@ - + @@ -69,7 +69,7 @@ - + @@ -92,30 +92,35 @@ - - - + + + - - + + - + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + @@ -123,14 +128,14 @@ - + - - - + + + - + @@ -143,7 +148,7 @@ - + @@ -164,4 +169,7 @@ + + + \ No newline at end of file diff --git a/cap/etc/common/CAP01_CSW.XML b/cap/etc/common/CAP01_CSW.XML index 61852a8..de3991c 100644 --- a/cap/etc/common/CAP01_CSW.XML +++ b/cap/etc/common/CAP01_CSW.XML @@ -1512,11 +1512,16 @@ - +
- + + + + + +
diff --git a/cap/etc/scheduler/TIMCON_PUB.XML b/cap/etc/scheduler/TIMCON_PUB.XML index 565d6a0..376c775 100644 --- a/cap/etc/scheduler/TIMCON_PUB.XML +++ b/cap/etc/scheduler/TIMCON_PUB.XML @@ -19,9 +19,9 @@ - +