diff --git a/config/cgb.properties b/config/cgb.properties index 06fe0febb..3da6ba946 100644 --- a/config/cgb.properties +++ b/config/cgb.properties @@ -1,15 +1,17 @@ #客户号 -cifMaster=60000002922 +cifMaster=60000078430 #操作员 entUserId=100001 #操作密码 password=1q2w3e4r #前置机地址 -cgbUrl=http://114.242.219.170:63312/CGBClient/BankAction +#cgbUrl=http://114.242.219.170:63312/CGBClient/BankAction +cgbUrl=http://127.0.0.1:9528/CGBClient/BankAction +#cgbUrl=http://192.168.7.11:9528/CGBClient/BankAction #本方账号 #广发银行 ownAccBank=\u5e7f\u53d1\u94f6\u884c #安鹏融资租赁（天津）有限公司 -ownAccName=\u5b89\u9e4f\u878d\u8d44\u79df\u8d41\uff08\u5929\u6d25\uff09\u6709\u9650\u516c\u53f8 -ownAccNumber=9550880217136700372 +ownAccName=\u9020\u6570\u5ba1\u6e29\u8ba9\u6709\u9650\u516c\u53f8 +ownAccNumber=9550885271830400172 diff --git a/src_tenwa/com/tenwa/cgbbank/dao/LBCgb0032LogDao.java b/src_tenwa/com/tenwa/cgbbank/dao/LBCgb0032LogDao.java index d5ed388f9..dcdf8315a 100644 --- a/src_tenwa/com/tenwa/cgbbank/dao/LBCgb0032LogDao.java +++ b/src_tenwa/com/tenwa/cgbbank/dao/LBCgb0032LogDao.java @@ -52,7 +52,9 @@ public class LBCgb0032LogDao { JBOTransaction jboTransaction = null; try { jboTransaction = JBOFactory.createJBOTransaction(); - return updateStatus(jboTransaction, id, statusEnum); + int num = updateStatus(jboTransaction, id, statusEnum); + jboTransaction.commit(); + return num; } catch (Exception e) { e.printStackTrace(); if (jboTransaction != null) { @@ -78,8 +80,10 @@ public class LBCgb0032LogDao { JBOTransaction jboTransaction = null; try { jboTransaction = JBOFactory.createJBOTransaction(); - return recordLog(jboTransaction, id, recordNum, tranCode, + int num = recordLog(jboTransaction, id, recordNum, tranCode, tranSeq, statusEnum); + jboTransaction.commit(); + return num; } catch (Exception e) { e.printStackTrace(); if (jboTransaction != null) { diff --git a/src_tenwa/com/tenwa/cgbbank/dto/CGB0032ResBodyRecord.java b/src_tenwa/com/tenwa/cgbbank/dto/CGB0032ResBodyRecord.java index ea2409f09..1d77321c9 100644 --- a/src_tenwa/com/tenwa/cgbbank/dto/CGB0032ResBodyRecord.java +++ b/src_tenwa/com/tenwa/cgbbank/dto/CGB0032ResBodyRecord.java @@ -30,11 +30,14 @@ package com.tenwa.cgbbank.dto; import com.amarsoft.are.jbo.BizObject; import com.amarsoft.are.jbo.BizObjectManager; import com.amarsoft.are.jbo.JBOException; +import com.fasterxml.jackson.annotation.JsonProperty; import com.tenwa.cgb.conf.CGBconfProperties; import com.tenwa.util.GlobalConst; import jbo.app.tenwa.calc.LC_EBANK; +import java.text.SimpleDateFormat; import java.time.LocalDateTime; +import java.util.Date; /** * @program: apzl_leasing @@ -49,6 +52,7 @@ public class CGB0032ResBodyRecord { String dealMoney; String financingSymbol; String usableMoney; + @JsonProperty("Abstract") String Abstract; String dealBranch; String upBill; @@ -244,16 +248,18 @@ public class CGB0032ResBodyRecord { - public BizObject convertToEbank(BizObjectManager manager, String userId, String orgId) throws JBOException { + public BizObject convertToEbank(BizObjectManager manager, String userId, String orgId) throws Exception { String nowDateTime = LocalDateTime.now().format(GlobalConst.dateTimeFormatter); - + SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd"); + SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy/MM/dd"); //日期格式 + String factDate = sdf1.format(sdf.parse(this.dealDate)); //将系统时间转换成上方指定类型 BizObject bizObject = manager.newObject(); bizObject.setAttributeValue(LC_EBANK.ID, ""); // bizObject.setAttributeValue(LC_EBANK.EBANK_NUMBER, ); - bizObject.setAttributeValue(LC_EBANK.EBANK_SN, this.cbsTranSeq); + bizObject.setAttributeValue(LC_EBANK.EBANK_SN, this.serialNo); bizObject.setAttributeValue(LC_EBANK.MONEY_TYPE, "currency_type1"); bizObject.setAttributeValue(LC_EBANK.FACT_MONEY, this.dealMoney); - bizObject.setAttributeValue(LC_EBANK.FACT_DATE, this.dealDate); + bizObject.setAttributeValue(LC_EBANK.FACT_DATE, factDate); bizObject.setAttributeValue(LC_EBANK.NOWITH_MONEY, 0); bizObject.setAttributeValue(LC_EBANK.RATE, 0); bizObject.setAttributeValue(LC_EBANK.OWN_BANK, CGBconfProperties.OWNACCBANK); @@ -263,7 +269,7 @@ public class CGB0032ResBodyRecord { bizObject.setAttributeValue(LC_EBANK.CLIENT_BANK, "银行"); bizObject.setAttributeValue(LC_EBANK.CLIENT_ACCOUNT, this.name); bizObject.setAttributeValue(LC_EBANK.CLIENT_ACC_NUMBER, this.oppoAccno); - bizObject.setAttributeValue(LC_EBANK.HAD_MONEY, this.dealMoney); + bizObject.setAttributeValue(LC_EBANK.HAD_MONEY,"0.00"); bizObject.setAttributeValue(LC_EBANK.MAYOPE_MONEY, this.dealMoney); // bizObject.setAttributeValue(LC_EBANK.FUND_MONEY, ); bizObject.setAttributeValue(LC_EBANK.INVALID, "N"); @@ -274,7 +280,7 @@ public class CGB0032ResBodyRecord { bizObject.setAttributeValue(LC_EBANK.UPDATEUSERID, userId); bizObject.setAttributeValue(LC_EBANK.UPDATEORGID, orgId); bizObject.setAttributeValue(LC_EBANK.UPDATETIME, nowDateTime); - bizObject.setAttributeValue(LC_EBANK.DEBIT_MONEY, this.dealMoney); + // bizObject.setAttributeValue(LC_EBANK.DEBIT_MONEY, this.dealMoney); bizObject.setAttributeValue(LC_EBANK.BUSINESS_TYPE, "汽车"); bizObject.setAttributeValue(LC_EBANK.CUSTOMER_TYPE, "外部客商"); return bizObject; diff --git a/src_tenwa/com/tenwa/cgbbank/dto/CGBMessageHead.java b/src_tenwa/com/tenwa/cgbbank/dto/CGBMessageHead.java index a4852aaaf..a5215cb65 100644 --- a/src_tenwa/com/tenwa/cgbbank/dto/CGBMessageHead.java +++ b/src_tenwa/com/tenwa/cgbbank/dto/CGBMessageHead.java @@ -45,6 +45,12 @@ public class CGBMessageHead { * @description: 企业上送报文留空（填空格），银行默认返回000 */ String retCode; + + /** + * 返回消息 + * @description: + */ + String retMsg; /** * 操作员 @@ -106,8 +112,16 @@ public class CGBMessageHead { public void setRetCode(String retCode) { this.retCode = retCode; } + + public String getRetMsg() { + return retMsg; + } - public String getEntUserId() { + public void setRetMsg(String retMsg) { + this.retMsg = retMsg; + } + + public String getEntUserId() { return entUserId; } @@ -122,4 +136,5 @@ public class CGBMessageHead { public void setPassword(String password) { this.password = password; } + } \ No newline at end of file diff --git a/src_tenwa/com/tenwa/cgbbank/service/CGBBankService.java b/src_tenwa/com/tenwa/cgbbank/service/CGBBankService.java index 83cdb1610..13f6ac84b 100644 --- a/src_tenwa/com/tenwa/cgbbank/service/CGBBankService.java +++ b/src_tenwa/com/tenwa/cgbbank/service/CGBBankService.java @@ -7,6 +7,8 @@ import com.tenwa.cgbbank.dto.*; import com.tenwa.cgbbank.enums.CGB0032LogStatusEnum; import com.tenwa.cgbbank.helper.CGBBankInterfaceHelper; import com.tenwa.comm.util.jboutil.DataOperatorUtil; +import com.tenwa.lease.app.ebank.EbankUse; + import jbo.loan.LB_CGB_0032_LOG; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -38,9 +40,9 @@ public class CGBBankService { private static LBCgb0032LogDao lbCgb0032LogDao = LBCgb0032LogDao.getInstance(); // 默认操作人ID - private String defOperUserId = "admin"; + private String defOperUserId = "8009U00000056"; // 默认操作人部门ID - private String defOperOrgId = "8009001"; + private String defOperOrgId = "8009014"; private static final Integer QUERY_PAGE_SIZE = 20; @@ -57,6 +59,7 @@ public class CGBBankService { try { jboTransaction = JBOFactory.createJBOTransaction(); lbCgb0032LogBizObj = init(jboTransaction, account, queryDate); + jboTransaction.commit(); } catch (Exception e) { e.printStackTrace(); if (jboTransaction != null) try { @@ -68,6 +71,24 @@ public class CGBBankService { } queryAndSaveTransactionDetailsToEbank(lbCgb0032LogBizObj); + //执行完成后，调用生成凭证方法 + // com.tenwa.lease.app.ebank.EbankUse + JBOTransaction jboTransactionV = null; + try { + jboTransactionV = JBOFactory.createJBOTransaction(); + EbankUse eu = new EbankUse(); + eu.createEbankVoucher2(jboTransactionV); + jboTransactionV.commit(); + } catch (Exception e) { + e.printStackTrace(); + if (jboTransactionV != null) try { + jboTransactionV.rollback(); + } catch (JBOException e1) { + e1.printStackTrace(); + } + throw new RuntimeException("生成凭证失败"); + } + System.out.println("调用广发银行接口完成！！！"); } private BizObject init(JBOTransaction jboTransaction, String account, String queryDate) throws JBOException { @@ -107,7 +128,8 @@ public class CGBBankService { try { cgb0032ResBodyCGBBEDC = cgbBankInterfaceHelper.queryTransactionDetails(reqBody); } catch (Exception e) { - // 在请求银行接口出现异常后，保存请求错误信息到【广发银行网银流水每日日志】表 + e.printStackTrace(); + // 在请求银行接口出现异常后，保存请求错误信息到【广发银行网银流水每日日志】表 lbCgb0032LogDao.recordLog(lbCgb0032LogId, recordNum, reqBody.getBeginRecTranCode(), reqBody.getBeginRecTranSeq(), CGB0032LogStatusEnum.S2); throw new RuntimeException("调用广发银行【交易明细查询-分页接口】失败！"); @@ -122,9 +144,12 @@ public class CGBBankService { BizObjectManager bizObjectManager = JBOFactory.getBizObjectManager("jbo.app.tenwa.calc.LC_EBANK", jboTransaction); // 转换成网银流水 for (CGB0032ResBodyRecord record : records) { - if (record.getFinancingSymbol().equals("+")) { + BizObject lc = bizObjectManager.createQuery("ebank_sn=:ebankSn").setParameter("ebankSn", record.getSerialNo()).getSingleResult(false); + if (lc == null && record.getLoanSign().equals("+") && !(record.getOppoAccno().indexOf("9915810001415816")>=0 || record.getOppoAccno().indexOf("9912900000582902")>=0 )) { BizObject bizObject = record.convertToEbank(bizObjectManager, defOperUserId, defOperOrgId); bizObjectManager.saveObject(bizObject); + bizObject.setAttributeValue("EBANK_NUMBER", bizObject.getAttribute("ID")); + bizObjectManager.saveObject(bizObject); recordNum++; } } diff --git a/src_tenwa/quartz/CGBOnlineBankingTransactionRecordsPullJob.java b/src_tenwa/quartz/CGBOnlineBankingTransactionRecordsPullJob.java index 7a23abbcc..692402d16 100644 --- a/src_tenwa/quartz/CGBOnlineBankingTransactionRecordsPullJob.java +++ b/src_tenwa/quartz/CGBOnlineBankingTransactionRecordsPullJob.java @@ -26,9 +26,10 @@ public class CGBOnlineBankingTransactionRecordsPullJob implements Job { @Override public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException { - String yesterday = LocalDate.now().minusDays(1).format(GlobalConst.dateFormatterNone); + String yesterday = LocalDate.now().format(GlobalConst.dateFormatterNone); try { - cgbBankService.startProcess(CGBconfProperties.OWNACCNUMBER, yesterday); + cgbBankService.startProcess(CGBconfProperties.OWNACCNUMBER, yesterday); + } catch (Throwable e) { log.error("定时任务拉取广发银行网银流水失败！拉取日期:" + yesterday + "，本方账号：" + CGBconfProperties.OWNACCNUMBER, e); }