From 23cefea5cff0361f626a04b13d04d098370e2149 Mon Sep 17 00:00:00 2001 From: Alawn Date: Mon, 8 Mar 2021 10:21:03 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cap/applib/ctg.jar | Bin 44394 -> 44310 bytes cap/etc/api/CCAHRO1_ITF.XML | 2 +- cap/etc/batch/204025_CTL.XML | 2 +- cap/etc/batch/BAT_GET_DISK_RESULT_CTL.XML | 25 ++- cap/etc/batch/BAT_GET_TIMER_CTL.XML | 12 +- cap/etc/batch/BAT_SEND_TIMER_CTL.XML | 20 ++- cap/etc/batch/DISK_RESULT_CTL.XML | 17 +- cap/etc/batch/REFUND_QUERY_CTL.XML | 2 +- cap/etc/batch/RTR_PKG.XML | 2 +- cap/etc/batch/ZLL_TEST_CTL.XML | 28 ++- cap/etc/channel/icbc/BATCH_ICBC.XML | 10 +- cap/etc/channel/icbc/OFRTCAPZ_CTL.XML | 209 ++++++++++++++++++++++ cap/etc/channel/icbc/SCAICBC_ATR.XML | 2 +- cap/etc/channel/icbc/SCAICBC_ITF.XML | 64 ++++--- cap/etc/common/CAP01_CSW.XML | 9 +- cap/etc/scheduler/TIMCON_PUB.XML | 4 +- cap/etc/test/restart | 2 +- 17 files changed, 346 insertions(+), 64 deletions(-) diff --git a/cap/applib/ctg.jar b/cap/applib/ctg.jar index d4094007e47bdc17a6d2db956498fafff755d715..bd0ce2de954168d49bc85164b9632e47df996e0b 100644 GIT binary patch delta 4578 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 delta 4655 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 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 @@ - +