From 4b2a6e312b7e2e9b5cdd86723c9a56bebbe6cbe1 Mon Sep 17 00:00:00 2001 From: xiezhiwen Date: Thu, 11 Apr 2019 14:05:59 +0800 Subject: [PATCH] =?UTF-8?q?=E5=87=AD=E8=AF=81=E7=9B=B8=E5=85=B3-=E8=B4=B4?= =?UTF-8?q?=E6=81=AF=E5=88=A0=E9=99=A4=E6=97=B6=E7=BD=91=E9=93=B6=E9=87=91?= =?UTF-8?q?=E9=A2=9D=E5=8F=8D=E5=86=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CreateVoucherForCardSummarizing.java | 2 +- .../CreateVoucherForInterestSubsidyImport.java | 18 +++++++++++++++--- .../serviceImp/CreateVoucherServiceImpl.java | 2 +- .../lease/app/quartzmession/SplitInts2.java | 5 +++++ 4 files changed, 22 insertions(+), 5 deletions(-) diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherForCardSummarizing.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherForCardSummarizing.java index e6891e3be..6633cdb2b 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherForCardSummarizing.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherForCardSummarizing.java @@ -28,7 +28,7 @@ public class CreateVoucherForCardSummarizing { private String ACC_TITLE; // 银行科目 /** - * 导入贴息生成凭证 + * 卡扣汇总核销 * @param tx * @throws Exception */ diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherForInterestSubsidyImport.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherForInterestSubsidyImport.java index 1694fb7dc..a3759b80d 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherForInterestSubsidyImport.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherForInterestSubsidyImport.java @@ -125,8 +125,14 @@ public class CreateVoucherForInterestSubsidyImport { Sqlca.executeSQL(updSql2); } Sqlca.commit(); + if(Sqlca != null) { + Sqlca.disConnect(); + } } + /** + * 贴息删除生成凭证 + */ public void createInterSubsidyRecoilVoucher(JBOTransaction tx) throws Exception { Transaction Sqlca = null; Sqlca = Transaction.createTransaction(CacheLoaderFactory.getDataSource()); @@ -144,14 +150,14 @@ public class CreateVoucherForInterestSubsidyImport { String DISTRIBUTOR_NAME=null; String CUSTID=null; String CUSTNAME=null; - String SUBJECTCODE=null; + String EBANK_SN=null; String ACC_NUMBER=null; String TAX_NUM=null; String voucherNo = "PZ2018072100000041"; Map param = new HashMap(); // 获取新导入的贴息数据 - String sql = "SELECT ROUND((getTax(lci.LEAS_FORM,'租息',LCCT.START_DATE)-1)*100,0) AS TAX_NUM,- IFNULL(LD.DISCOUNT_MONEY, 0) AS MONEY,- IFNULL(ROUND(LD.DISCOUNT_MONEY / getTax (LCI.LEAS_FORM,'租息',LCCT.START_DATE),2),0) AS MONEYNOTAX,- IFNULL((LD.DISCOUNT_MONEY - ROUND(LD.DISCOUNT_MONEY / getTax (LCI.LEAS_FORM,'租息',LCCT.START_DATE),2)),0) AS MONEYTAX,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE,LCCT.CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME FROM LB_DISCOUNT LD LEFT JOIN LC_EBANK LE ON LE.EBANK_SN=LD.EBAND_NO LEFT JOIN LB_CONTRACT_INFO LCI ON LD.CONTRACT_NO=LCI.CONTRACT_NUMBER LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.CONTRACT_ID=LCI.ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO = LCI.DISTRIBUTOR_ID LEFT JOIN lb_union_lessee lul ON lul.contract_id = lci.id LEFT JOIN customer_info cif ON cif.customerid = lul.customer_id LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID = LUL.PROJECT_ID WHERE lul.is_main='Y' AND LD.ID = :ID "; + String sql = "SELECT ROUND((getTax(lci.LEAS_FORM,'租息',LCCT.START_DATE)-1)*100,0) AS TAX_NUM,LD.EBAND_NO AS EBANK_SN,- IFNULL(LD.DISCOUNT_MONEY, 0) AS MONEY,- IFNULL(ROUND(LD.DISCOUNT_MONEY / getTax (LCI.LEAS_FORM,'租息',LCCT.START_DATE),2),0) AS MONEYNOTAX,- IFNULL((LD.DISCOUNT_MONEY - ROUND(LD.DISCOUNT_MONEY / getTax (LCI.LEAS_FORM,'租息',LCCT.START_DATE),2)),0) AS MONEYTAX,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE,LCCT.CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME FROM LB_DISCOUNT LD LEFT JOIN LC_EBANK LE ON LE.EBANK_SN=LD.EBAND_NO LEFT JOIN LB_CONTRACT_INFO LCI ON LD.CONTRACT_NO=LCI.CONTRACT_NUMBER LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.CONTRACT_ID=LCI.ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO = LCI.DISTRIBUTOR_ID LEFT JOIN lb_union_lessee lul ON lul.contract_id = lci.id LEFT JOIN customer_info cif ON cif.customerid = lul.customer_id LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID = LUL.PROJECT_ID WHERE lul.is_main='Y' AND LD.ID = :ID "; // 查询sql, 将结果集封装到list集合中 Mapmap1 = new HashMap(); map1.put("ID",id); @@ -178,6 +184,7 @@ public class CreateVoucherForInterestSubsidyImport { CUSTID=dataList.get(i).get("CUSTOMERID"); CUSTNAME=dataList.get(i).get("CUSTOMERNAME"); TAX_NUM=dataList.get(i).get("TAX_NUM"); + EBANK_SN=dataList.get(i).get("EBANK_SN"); // 通过税率获取编码 BizObject TAX_CODES=null; if(TAX_NUM!=null && !"".equals(TAX_NUM)) { @@ -211,8 +218,13 @@ public class CreateVoucherForInterestSubsidyImport { vs.createVoucher(vouch.getAttribute("id").getString(),vouch.getAttribute("MODULAR_NUMBER").getString(),vouch.getAttribute("OWNED_COMPANY").getString(), "02", VOUCHER_TYPE, userid, param, Sqlca); } } + double mon = Math.abs(Double.parseDouble(MONEY)); + String updateSql="UPDATE LC_EBANK SET MAYOPE_MONEY=(MAYOPE_MONEY+"+mon+"),HAD_MONEY=(HAD_MONEY-"+mon+") WHERE EBANK_SN='"+EBANK_SN+"'"; + Sqlca.executeSQL(updateSql); + Sqlca.commit(); + if(Sqlca !=null) { - Sqlca.commit(); + Sqlca.disConnect(); } } } diff --git a/src_core/com/tenwa/voucher/serviceImp/CreateVoucherServiceImpl.java b/src_core/com/tenwa/voucher/serviceImp/CreateVoucherServiceImpl.java index 747be3f52..f5cc08a2c 100644 --- a/src_core/com/tenwa/voucher/serviceImp/CreateVoucherServiceImpl.java +++ b/src_core/com/tenwa/voucher/serviceImp/CreateVoucherServiceImpl.java @@ -394,7 +394,7 @@ public class CreateVoucherServiceImpl { subData.put("F8",dataTemp.get("MONEY"));//贷方金额 subData.put("ENTRYDC", "-1"); //凭证信息是经销商名称 - if("PZ2018081600000120".equals(VOUCHERNO)){ + if("PZ2018081600000120".equals(VOUCHERNO) || "PZ2018080400000091".equals(VOUCHERNO)){ subData.put("CUSTID","APZL00000000DC"); // 虚拟客户 subData.put("CUSTNAME","汽车C端待查客户"); // 虚拟客户 // 传统-网银导入 diff --git a/src_tenwa/com/tenwa/lease/app/quartzmession/SplitInts2.java b/src_tenwa/com/tenwa/lease/app/quartzmession/SplitInts2.java index 8c9b7fea2..af4d24199 100644 --- a/src_tenwa/com/tenwa/lease/app/quartzmession/SplitInts2.java +++ b/src_tenwa/com/tenwa/lease/app/quartzmession/SplitInts2.java @@ -55,6 +55,11 @@ public class SplitInts2 implements Job{ Sqlca = Transaction.createTransaction("als"); Sqlca.executeSQL(new SqlObject("{call proc_contract_rent_month_temp()}")); Sqlca.executeSQL(new SqlObject("{call proc_contract_discount_month_temp()}")); + + /* + * 传统业务 + */ + Sqlca.executeSQL(new SqlObject("{call proc_contract_rent_month_tradition_temp()}")); Sqlca.commit(); //传统业务