From 1ca30d1f150fe826672ca3746b2384b00dcf2af8 Mon Sep 17 00:00:00 2001 From: xiezhiwen Date: Wed, 24 Oct 2018 11:32:21 +0800 Subject: [PATCH] =?UTF-8?q?=E5=87=AD=E8=AF=81=E7=9B=B8=E5=85=B3--=E5=88=86?= =?UTF-8?q?=E5=BD=95=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CreateVoucherLoan/ContractInterest.java | 1 - .../CreateVoucherLoanDistributor.java | 19 ++++++------------- .../ContractOnhireVoucher.java | 1 - 3 files changed, 6 insertions(+), 15 deletions(-) diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/ContractInterest.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/ContractInterest.java index 1c09f35bc..fcc1ddcd5 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/ContractInterest.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/ContractInterest.java @@ -15,7 +15,6 @@ public class ContractInterest implements VoucherJavaParamService{ Map param) throws BusinessException { MapreturnValue=new HashMap(); returnValue.putAll(param); - returnValue.put("FUNDTYPE","02"); returnValue.put("MONEY",param.get("INTEREST")); return returnValue; } diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoanDistributor.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoanDistributor.java index ed16b054e..ecd871581 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoanDistributor.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoanDistributor.java @@ -31,8 +31,6 @@ public class CreateVoucherLoanDistributor { String FIRST_ADD_FINANCING=null;//首付款+融资额 String FINANCING_SUB_OTHERS=null;//首付款+融资额-首付款-手续费-保证金-GPS String FIRST_ADD_HANDLING=null;//首付款+手续费 - String FIRST_ADD_FINANCING_INTEREST=null;//融资金额+首付款+利息（含税） - String FIRST_ADD_FINANCING_INTEREST_HANDLING=null;//融资金额+首付款+利息（含税）+手续费（不含税） String INTEREST_ADD_HANDLING=null;//利息（含税）+手续费（不含税） String ACCOUNT_DATE=null; String FACT_DATE=null; @@ -65,7 +63,7 @@ public class CreateVoucherLoanDistributor { TAX_TYPE="本金"; } //收取客户保证金 - if("PZ2018071000000004".equals(VOUCHERNO)||"PZ2018071000000006".equals(VOUCHERNO)||"PZ2018080300000070".equals(VOUCHERNO)||"PZ2018080300000071".equals(VOUCHERNO)){ + if("PZ2018071000000004".equals(VOUCHERNO)||"PZ2018080300000070".equals(VOUCHERNO)){ moneyDataSource="LCCT.CAUTION_MONEY"; TAX_TYPE="本金"; } @@ -76,20 +74,19 @@ public class CreateVoucherLoanDistributor { } if("PZ2018070900000002".equals(VOUCHERNO)||"PZ2018072400000060".equals(VOUCHERNO) || "PZ2018071000000005".equals(VOUCHERNO)||"PZ2018080300000069".equals(VOUCHERNO) || "PZ2018071000000006".equals(VOUCHERNO)||"PZ2018080300000071".equals(VOUCHERNO)) { - sql="SELECT IFNULL(LCCT.GPS_FEE, 0) AS GPS_FEE_FINANCE,IFNULL(LCCT.CAUTION_MONEY, 0) AS CAUTION_MONEY,IFNULL(LRPT.INTEREST, 0) AS INTEREST,IFNULL(LCCT.FIRST_PAYMENT,0) + IFNULL(LCCT.CLEAN_LEASE_MONEY,0) AS FIRST_ADD_FINANCING,IFNULL(LCCT.CLEAN_LEASE_MONEY,0) - IFNULL(LCCT.HANDLING_CHARGE_MONEY,0) - IFNULL(LCCT.CAUTION_MONEY,0) - IFNULL(LCCT.GPS_FEE,0) AS FINANCING_SUB_OTHERS,IFNULL(LCCT.FIRST_PAYMENT,0) + IFNULL(LCCT.HANDLING_CHARGE_MONEY,0) AS FIRST_ADD_HANDLING,IFNULL(LCCT.FIRST_PAYMENT,0) + IFNULL(LCCT.CLEAN_LEASE_MONEY,0) + IFNULL(LRPT.INTEREST,0) AS FIRST_ADD_FINANCING_INTEREST,IFNULL(LCCT.FIRST_PAYMENT,0) + IFNULL(LCCT.CLEAN_LEASE_MONEY,0) + IFNULL(LRPT.INTEREST,0) + IFNULL(ROUND(LCCT.HANDLING_CHARGE_MONEY / getTax(LCI.LEAS_FORM,'本金',LCCT.START_DATE),2),0) AS FIRST_ADD_FINANCING_INTEREST_HANDLING,IFNULL(LRPT.INTEREST,0) + IFNULL(LCCT.HANDLING_CHARGE_MONEY,0) AS INTEREST_ADD_HANDLING,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,DI.F_I_TYPE,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE,LFIT.ACC_NUMBER FROM LC_CALC_CONDITION LCCT LEFT JOIN (SELECT FLOWUNID,CONTRACT_ID,MIN(ACC_NUMBER) ACC_NUMBER FROM LC_FUND_INCOME_TEMP WHERE FEE_TYPE = 'feetype10' GROUP BY CONTRACT_ID,FLOWUNID) LFIT ON LFIT.CONTRACT_ID = LCCT.CONTRACT_ID LEFT JOIN (SELECT CONTRACT_ID,SUM(INTEREST) AS INTEREST FROM LC_RENT_PLAN GROUP BY CONTRACT_ID) LRPT ON LRPT.CONTRACT_ID = lfit.CONTRACT_ID LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID = lfit.CONTRACT_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 LPI.BUSINESSTYPE = '1' AND lfit.FLOWUNID = :FLOWUNID "; + sql="SELECT IFNULL(LCCT.GPS_FEE, 0) AS GPS_FEE_FINANCE,IFNULL(LCCT.CAUTION_MONEY, 0) AS CAUTION_MONEY,IFNULL(LRPT.INTEREST, 0) AS INTEREST,IFNULL(LCCT.FIRST_PAYMENT, 0) + IFNULL(LCCT.CLEAN_LEASE_MONEY, 0) AS FIRST_ADD_FINANCING,IFNULL(LCCT.CLEAN_LEASE_MONEY, 0) - IFNULL(LCCT.HANDLING_CHARGE_MONEY, 0) - IFNULL(LCCT.CAUTION_MONEY, 0) - IFNULL(LCCT.GPS_FEE, 0) AS FINANCING_SUB_OTHERS,IFNULL(LCCT.FIRST_PAYMENT, 0) + IFNULL(LCCT.HANDLING_CHARGE_MONEY, 0) AS FIRST_ADD_HANDLING,IFNULL(LRPT.INTEREST, 0) + IFNULL(LCCT.HANDLING_CHARGE_MONEY/getTax(LCI.LEAS_FORM,'手续费',LCCT.START_DATE), 0) AS INTEREST_ADD_HANDLING,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,DI.F_I_TYPE,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE,LFIT.ACC_NUMBER FROM LC_CALC_CONDITION LCCT LEFT JOIN (SELECT FLOWUNID,CONTRACT_ID,MIN(ACC_NUMBER) ACC_NUMBER FROM LC_FUND_INCOME_TEMP WHERE FEE_TYPE = 'feetype10' GROUP BY CONTRACT_ID,FLOWUNID) LFIT ON LFIT.CONTRACT_ID = LCCT.CONTRACT_ID LEFT JOIN (SELECT CONTRACT_ID,SUM(INTEREST) AS INTEREST FROM LC_RENT_PLAN GROUP BY CONTRACT_ID) LRPT ON LRPT.CONTRACT_ID = lfit.CONTRACT_ID LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID = lfit.CONTRACT_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 LPI.BUSINESSTYPE = '1' AND lfit.FLOWUNID = :FLOWUNID "; }else { - sql="SELECT IFNULL("+moneyDataSource+", 0) AS MONEY,IFNULL(ROUND("+moneyDataSource+"/getTax (lci.LEAS_FORM,'"+TAX_TYPE+"',LCCT.START_DATE),2),0) AS MONEYNOTAX,IFNULL("+moneyDataSource+" - ROUND("+moneyDataSource+" / getTax (lci.LEAS_FORM,'"+TAX_TYPE+"',LCCT.START_DATE),2),0) AS MONEYTAX,IFNULL(LCCT.GPS_FEE, 0) AS GPS_FEE_FINANCE,IFNULL(LCCT.CAUTION_MONEY, 0) AS CAUTION_MONEY,IFNULL(LRPT.INTEREST, 0) AS INTEREST,IFNULL(LCCT.FIRST_PAYMENT,0) + IFNULL(LCCT.CLEAN_LEASE_MONEY,0) AS FIRST_ADD_FINANCING,IFNULL(LCCT.CLEAN_LEASE_MONEY,0) - IFNULL(LCCT.HANDLING_CHARGE_MONEY,0) - IFNULL(LCCT.CAUTION_MONEY,0) - IFNULL(LCCT.GPS_FEE,0) AS FINANCING_SUB_OTHERS,IFNULL(LCCT.FIRST_PAYMENT,0) + IFNULL(LCCT.HANDLING_CHARGE_MONEY,0) AS FIRST_ADD_HANDLING,IFNULL(LCCT.FIRST_PAYMENT,0) + IFNULL(LCCT.CLEAN_LEASE_MONEY,0) + IFNULL(LRPT.INTEREST,0) AS FIRST_ADD_FINANCING_INTEREST,IFNULL(LCCT.FIRST_PAYMENT,0) + IFNULL(LCCT.CLEAN_LEASE_MONEY,0) + IFNULL(LRPT.INTEREST,0) + IFNULL(ROUND(LCCT.HANDLING_CHARGE_MONEY / getTax (LCI.LEAS_FORM,'本金',LCCT.START_DATE),2),0) AS FIRST_ADD_FINANCING_INTEREST_HANDLING,IFNULL(LRPT.INTEREST,0) + IFNULL(LCCT.HANDLING_CHARGE_MONEY,0) AS INTEREST_ADD_HANDLING,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,DI.F_I_TYPE,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE,LFIT.ACC_NUMBER FROM LC_CALC_CONDITION LCCT LEFT JOIN (SELECT FLOWUNID,CONTRACT_ID,MIN(ACC_NUMBER) ACC_NUMBER FROM LC_FUND_INCOME_TEMP WHERE FEE_TYPE = 'feetype10' GROUP BY CONTRACT_ID,FLOWUNID) LFIT ON LFIT.CONTRACT_ID = LCCT.CONTRACT_ID LEFT JOIN (SELECT CONTRACT_ID,SUM(INTEREST) AS INTEREST FROM LC_RENT_PLAN GROUP BY CONTRACT_ID) LRPT ON LRPT.CONTRACT_ID = lfit.CONTRACT_ID LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID = lfit.CONTRACT_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 LPI.BUSINESSTYPE = '1' AND lfit.FLOWUNID = :FLOWUNID "; + sql="SELECT IFNULL("+moneyDataSource+", 0) AS MONEY,IFNULL(ROUND("+moneyDataSource+"/getTax (lci.LEAS_FORM,'"+TAX_TYPE+"',LCCT.START_DATE),2),0) AS MONEYNOTAX,IFNULL("+moneyDataSource+" - ROUND("+moneyDataSource+" / getTax (lci.LEAS_FORM,'"+TAX_TYPE+"',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,DI.F_I_TYPE,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE,LFIT.ACC_NUMBER FROM LC_CALC_CONDITION LCCT LEFT JOIN (SELECT FLOWUNID,CONTRACT_ID,MIN(ACC_NUMBER) ACC_NUMBER FROM LC_FUND_INCOME_TEMP WHERE FEE_TYPE = 'feetype10' GROUP BY CONTRACT_ID,FLOWUNID) LFIT ON LFIT.CONTRACT_ID = LCCT.CONTRACT_ID LEFT JOIN (SELECT CONTRACT_ID,SUM(INTEREST) AS INTEREST FROM LC_RENT_PLAN GROUP BY CONTRACT_ID) LRPT ON LRPT.CONTRACT_ID = lfit.CONTRACT_ID LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID = lfit.CONTRACT_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 LPI.BUSINESSTYPE = '1' AND lfit.FLOWUNID = :FLOWUNID "; } - //sql="SELECT "+moneyDataSource+ " AS MONEY,ROUND("+moneyDataSource+ "/getTax(LCI.LEAS_FORM,'本金',LCCT.START_DATE),2) AS MONEYNOTAX, ("+moneyDataSource+ "-ROUND("+moneyDataSource+ "/getTax(LCI.LEAS_FORM,'本金',LCCT.START_DATE),2)) 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,LEC.ID AS CARID,LEC.MODEL,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE,LFIT.ACC_NUMBER FROM LC_CALC_CONDITION LCCT INNER JOIN (select contract_id,FLOWUNID,MAX(ACC_NUMBER) AS ACC_NUMBER from lc_fund_income_temp where fee_type='feetype10' group by contract_id,FLOWUNID) lfit ON lfit.contract_id=lcct.contract_id LEFT JOIN LB_CONTRACT_INFO LCI ON LCCT.CONTRACT_ID=LCI.ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO=LCI.DISTRIBUTOR_ID LEFT JOIN LB_EQUIPMENT_CAR LEC ON LEC.CONTRACT_ID=LCI.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 lfit.FLOWUNID=:FLOWUNID"; // 手续费收入（一次性确认收入） if("PZ2018071000000007".equals(VOUCHERNO)||"PZ2018080300000072".equals(VOUCHERNO) || "PZ2018071000000005".equals(VOUCHERNO)||"PZ2018080300000069".equals(VOUCHERNO)){ - sql+=" AND lcct.HANDLING_CHARGE_MONEY_TYPE='0010'"; + sql+=" AND (lcct.HANDLING_CHARGE_MONEY_TYPE='0010' OR lcct.HANDLING_CHARGE_MONEY_TYPE IS NULL OR lcct.HANDLING_CHARGE_MONEY_TYPE='')"; } // 收到手续费（按月分摊收入） if("PZ2018071000000009".equals(VOUCHERNO)||"PZ2018080300000073".equals(VOUCHERNO) || "PZ2018071000000006".equals(VOUCHERNO)||"PZ2018080300000071".equals(VOUCHERNO)){ - sql+=" AND lcct.HANDLING_CHARGE_MONEY_TYPE='0020'"; + sql+=" AND lcct.HANDLING_CHARGE_MONEY_TYPE='0020' "; } List> dataList=DataOperatorUtil.getDataBySql(Sqlca, sql, map); @@ -103,12 +100,10 @@ public class CreateVoucherLoanDistributor { MONEYTAX=dataList.get(i).get("MONEYTAX"); GPS_FEE_FINANCE=dataList.get(i).get("GPS_FEE_FINANCE"); CAUTION_MONEY=dataList.get(i).get("CAUTION_MONEY"); - INTEREST=dataList.get(i).get("INTEREST").toString(); + INTEREST=dataList.get(i).get("INTEREST"); FIRST_ADD_FINANCING=dataList.get(i).get("FIRST_ADD_FINANCING"); FINANCING_SUB_OTHERS=dataList.get(i).get("FINANCING_SUB_OTHERS"); FIRST_ADD_HANDLING=dataList.get(i).get("FIRST_ADD_HANDLING"); - FIRST_ADD_FINANCING_INTEREST=dataList.get(i).get("FIRST_ADD_FINANCING_INTEREST"); - FIRST_ADD_FINANCING_INTEREST_HANDLING=dataList.get(i).get("FIRST_ADD_FINANCING_INTEREST_HANDLING"); INTEREST_ADD_HANDLING=dataList.get(i).get("INTEREST_ADD_HANDLING"); ACCOUNT_DATE=dataList.get(i).get("ACCOUNT_DATE"); FACT_DATE =dataList.get(i).get("FACT_DATE"); @@ -134,8 +129,6 @@ public class CreateVoucherLoanDistributor { param.put("FIRST_ADD_FINANCING",FIRST_ADD_FINANCING); param.put("FINANCING_SUB_OTHERS",FINANCING_SUB_OTHERS); param.put("FIRST_ADD_HANDLING",FIRST_ADD_HANDLING); - param.put("FIRST_ADD_FINANCING_INTEREST",FIRST_ADD_FINANCING_INTEREST); - param.put("FIRST_ADD_FINANCING_INTEREST_HANDLING",FIRST_ADD_FINANCING_INTEREST_HANDLING); param.put("INTEREST_ADD_HANDLING",INTEREST_ADD_HANDLING); param.put("ACCOUNT_DATE",ACCOUNT_DATE); param.put("FACT_DATE",FACT_DATE); diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/ContractOnhireVoucher.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/ContractOnhireVoucher.java index 42a43b9c9..acfb65b28 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/ContractOnhireVoucher.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/ContractOnhireVoucher.java @@ -36,7 +36,6 @@ public class ContractOnhireVoucher extends BaseBussiness { cvld.CreateVoucher(FlowUnid, "PZ2018071000000009");// 收取客户手续费（按月分摊收入）--回租 cvld.CreateVoucher(FlowUnid, "PZ2018080300000073");// 收取客户手续费（按月分摊收入）--直租 - return "true"; } }