anpeng/apzl_leasing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改租金红冲对应保证金代偿数据出现的问题

Browse Source
This commit is contained in:
tangfutang 2021-02-10 15:26:02 +08:00
parent 7295d6e2ec
commit df5934be46
7 changed files with 202 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
WebContent/WEB-INF/etc/jbo/jbo_lease.xml
View File

@ -2444,6 +2444,27 @@
</manager>
</class>
<class name="VI_BOND_COMPENSATORY" label="经销保证金代偿数据查询" keyAttributes="">
<attributes>
<attribute name="id" label="租金计划ID" type="STRING" />
<attribute name="rent" label="租金" type="STRING"/>
<attribute name="irent" label="已还租金" type="STRING" />
<attribute name="caution_money" label="已代偿金额" type="STRING"/>
<attribute name="plan_date" label="计划期次" type="STRING" />
<attribute name="contract_id" label="合同id" type="STRING" />
<attribute name="distributor_id" label="经销编号" type="STRING" />
<attribute name="project_id" label="项目ID" type="STRING" />
<attribute name="plan_list" label="计划期次" type="STRING" />
<attribute name="need_caution_money" label="需要代偿的金额" type="STRING" />
</attributes>
<manager>
<managerProperties>
<property name="table" value="VI_BOND_COMPENSATORY" />
</managerProperties>
</manager>
</class>
<class name="LB_CONTRACT_INVOICE_TYPE" label="租金开票信息" keyAttributes="ID">
<attributes>
<attribute name="ID" label="标识" type="STRING" length="32"/>

56
src_jbo/jbo/com/tenwa/lease/comm/VI_BOND_COMPENSATORY.java Normal file
View File

@ -0,0 +1,56 @@
package jbo.com.tenwa.lease.comm;
import java.lang.String;
/**
* 经销保证金代偿数据查询 - JBO命名常量类<br><br>
* Note: This file is generated by ADE tools, <em>dont</em> modify it.<br>
*/
public interface VI_BOND_COMPENSATORY{
/**
* 经销保证金代偿数据查询<br><br>
* 代表本类映射的BizObjectClass
*/
public static final String CLASS_NAME = "jbo.com.tenwa.lease.comm.VI_BOND_COMPENSATORY";
/**
* 租金计划ID STRING(20)<br>
*/
public static final String id = "id";
/**
* 租金 STRING(20)<br>
*/
public static final String rent = "rent";
/**
* 已还租金 STRING(20)<br>
*/
public static final String irent = "irent";
/**
* 已代偿金额 STRING(20)<br>
*/
public static final String caution_money = "caution_money";
/**
* 计划期次 STRING(20)<br>
*/
public static final String plan_date = "plan_date";
/**
* 合同id STRING(20)<br>
*/
public static final String contract_id = "contract_id";
/**
* 经销编号 STRING(20)<br>
*/
public static final String distributor_id = "distributor_id";
/**
* 项目ID STRING(20)<br>
*/
public static final String project_id = "project_id";
/**
* 计划期次 STRING(20)<br>
*/
public static final String plan_list = "plan_list";
/**
* 需要代偿的金额 STRING(20)<br>
*/
public static final String need_caution_money = "need_caution_money";
}

13
src_sql/dailyfix/tft_dailyfix.sql
View File

@ -12,4 +12,15 @@ CREATE TABLE lc_card_tlsign_his (
PRIMARY KEY (ID)
) ENGINE=InnoDB DEFAULT CHARSET=gbk;
-- 添加通联签约验证从正式到历史表的方法
Insert Into Class_Method (classname,methodname,methodtype,methoddescribe,returntype,methodargs,methodcode,inputuser,inputorg,inputtime,updateuser,updatetime,remark) Values ('审批流程','通联签约状态从正式到历史','Bizlet','通联签约状态从正式到历史','String','String ObjectNo','com.tenwa.lease.flow.project.commbusiness.LcCardTlSignFormalToHisBusiness','','','','','','');
Insert Into Class_Method (classname,methodname,methodtype,methoddescribe,returntype,methodargs,methodcode,inputuser,inputorg,inputtime,updateuser,updatetime,remark) Values ('审批流程','通联签约状态从正式到历史','Bizlet','通联签约状态从正式到历史','String','String ObjectNo','com.tenwa.lease.flow.project.commbusiness.LcCardTlSignFormalToHisBusiness','','','','','','');
-- 添加保证金代偿红冲反冲方法
insert into `class_method` (`classname`, `methodname`, `methodtype`, `methoddescribe`, `returntype`, `methodargs`, `methodcode`, `inputuser`, `inputorg`, `inputtime`, `updateuser`, `updatetime`, `remark`) values('审批流程','保证金代偿红冲反冲','Bizlet','保证金代偿红冲反冲','String','String ObjectNo','com.tenwa.lease.flow.rent.rentreback.DepositRedOffset','','','','','','');
-- 将保证金代偿红冲反冲方法添加到租金红冲结束脚本
delete from FLOW_MODEL where FlowNo='RentRebackFlow' and PhaseNo='1000';
insert into `FLOW_MODEL` (`flowno`, `phaseno`, `phasetype`, `phasename`, `phasedescribe`, `phaseattribute`, `prescript`, `initscript`, `choicedescribe`, `choicescript`, `actiondescribe`, `actionscript`, `postscript`, `attribute1`, `attribute2`, `attribute3`, `attribute4`, `attribute5`, `attribute6`, `attribute7`, `attribute8`, `attribute9`, `attribute10`, `aaenabled`, `aapointinitscript`, `aapointcomp`, `aapointcompurl`, `standardtime1`, `standardtime2`, `costlob`, `strips`, `checklist`, `decisionscript`, `riskscanrule`, `buttonset2`, `inputuser`, `inputtime`, `updateuser`, `updatetime`, `distributerule`, `id`, `type`, `name`, `xcoordinate`, `ycoordinate`, `width`, `height`, `version`, `swimlane`, `nodetype`, `flowphasecontext`, `OPINIONSREQUIRED`, `isreadonly`, `flowpageconfig`, `flowprocessclass`, `flowpagecheck`, `backstepnexttype`, `backsteps`, `backscript`, `deletescript`, `phasescript`, `loadproductcheck`, `nextsteps`, `flowtiptype`, `remindnoticttype`, `flowoverdate`, `overnoticetype`, `overnoticeUser`) values('RentRebackFlow','1000','1040','通过',NULL,NULL,'!基础操作.租金红冲临时表到正式表(#ObjectNo)+!基础操作.租金红冲后更新网银正式表(#ObjectNo)+!审批流程.凭证输出--回款红冲(#ObjectNo)+!审批流程.保证金代偿红冲反冲(#ObjectNo)','{\"system\"}',NULL,'commroute',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'01',NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0','0',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'586','550','50','50','1',NULL,'END',NULL,NULL,'Y','RentRebackFlow0010',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);

28
src_sql/view/vi_bond_compensatory.sql Normal file
View File

@ -0,0 +1,28 @@
create view vi_bond_compensatory as (
select
lrp.ID AS id,
lrp.RENT AS rent,
IFNULL(lri.irent,0) AS irent,
IFNULL(ddi.CAUTION_MONEY,0) AS caution_money,
lrp.PLAN_DATE AS plan_date,
lrp.CONTRACT_ID AS contract_id,
lci.distributor_id AS distributor_id,
lci.PROJECT_ID AS project_id,
lrp.PLAN_LIST AS plan_list,
lrp.RENT-IFNULL(lri.irent,0)-IFNULL(ddi.CAUTION_MONEY,0) as need_caution_money
from lb_contract_info lci
left join lc_rent_plan lrp
on lci.ID = lrp.CONTRACT_ID
left join (select
SUM(IFNULL(RENT,0)) AS irent,
PLAN_ID AS plan_id
from lc_rent_income
group by PLAN_ID) lri on lri.plan_id = lrp.ID
left join (select
RENT_PLAN_ID AS RENT_PLAN_ID,
SUM(IFNULL(CAUTION_MONEY,0)) AS CAUTION_MONEY
from d_depositreturn_info
where MONEY_TYPE = 'bondRepay'
group by RENT_PLAN_ID) ddi on ddi.RENT_PLAN_ID = lrp.ID
where lci.BUSINESSTYPE = '1' and lci.CONTRACT_STATUS = '31' and (lrp.BATCH_STATUS<>'process' or lrp.BATCH_STATUS IS NULL) );

25
src_tenwa/com/tenwa/collectaudit/cache/CollectAuditInfoCache.java vendored
View File

@ -45,6 +45,7 @@ import jbo.com.tenwa.entity.comm.flow.D_DEPOSITRETURN_INFO;
import jbo.com.tenwa.lease.comm.LB_BUCKLE_LOG;
import jbo.com.tenwa.lease.comm.LB_CLEAR_FILE_RECORD;
import jbo.com.tenwa.lease.comm.LB_INTFACE_FILE_RECORD;
import jbo.com.tenwa.lease.comm.VI_BOND_COMPENSATORY;
import jbo.com.tenwa.lease.comm.VI_LC_AUDIT_RENT_PLAN;
import jbo.loan.VI_RENT_COLLECT;
import jbo.sys.CODE_LIBRARY;
@ -679,20 +680,22 @@ public class CollectAuditInfoCache {
public String afterCollectManageDistributor(JBOTransaction tx) throws Exception{
int i = 0,j = 0;
String[] ids = id.split("@");
String[] penaltyArray = penaltys.split("@");
//String[] penaltyArray = penaltys.split("@");
String COMPENSATORY_CON=null;
BizObjectManager bm = JBOFactory.getFactory().getManager(VI_LC_AUDIT_RENT_PLAN.CLASS_NAME,tx);
BizObjectManager bm = JBOFactory.getFactory().getManager(VI_BOND_COMPENSATORY.CLASS_NAME,tx);
BizObjectManager bc = JBOFactory.getFactory().getManager(LC_RENT_PLAN.CLASS_NAME,tx);
BizObjectManager bd = JBOFactory.getFactory().getManager(D_DEPOSITRETURN_INFO.CLASS_NAME,tx);
BizObjectManager bdi = JBOFactory.getFactory().getManager(DISTRIBUTOR_INFO.CLASS_NAME,tx);
for(int c=0;c<ids.length;c++){
BizObject bom = bm.createQuery("select distinct O.contract_id,O.plan_list,O.plan_date,O.id,O.corpus,O.interest,ca.ACC_NUMBER,ca.ACCOUNT,O.rent from O , jbo.app.tenwa.customer.CUSTOMER_ACCOUNT ca where O.contract_id=ca.contract_id and ca.acc_type = 'Debit' and O.id ='"+ids[c]+"'").getSingleResult(false);
BigDecimal corpus =new BigDecimal(bom.getAttribute("corpus").getString());
BigDecimal interest =new BigDecimal(bom.getAttribute("interest").getString());
BigDecimal penalty = new BigDecimal(penaltyArray[c]);
String t_rent = corpus.add(interest).add(penalty).toString();
BizObject bom = bm.createQuery(" select distinct O.contract_id,O.plan_list,O.plan_date,O.id,O.need_caution_money from O where O.id ='"+ids[c]+"' ").getSingleResult(false);
//BigDecimal corpus =new BigDecimal(bom.getAttribute("corpus").getString());
//BigDecimal interest =new BigDecimal(bom.getAttribute("interest").getString());
//BigDecimal penalty = new BigDecimal(penaltyArray[c]);
//跟客户确认目前只代偿租金
BigDecimal t_rent = new BigDecimal( bom.getAttribute("need_caution_money").getString() );
//String t_rent = corpus.add(interest).add(penalty).toString();
/**
* 获取上一期是否有代偿记录
@ -712,18 +715,18 @@ public class CollectAuditInfoCache {
//Map<String, String> map = handcraftsingleCollectMoenyDistrbutor(tx,bc,bom,t_rent,penaltyArray[c]);
i++;
//更新收付状态
bc.createQuery("update O set O.COLLECT_STATUS=:COLLECT_STATUS ,O.COLLECT_MSG=:COLLECT_MSG,O.PENALTY=:PENALTY where O.id=:id")
bc.createQuery("update O set O.COLLECT_STATUS=:COLLECT_STATUS ,O.COLLECT_MSG=:COLLECT_MSG where O.id=:id")
.setParameter("COLLECT_STATUS", "代偿")
.setParameter("COLLECT_MSG", "经销商保证金代偿")
.setParameter("PENALTY", penaltyArray[c])
//.setParameter("PENALTY", penaltyArray[c])
.setParameter("id", bom.getAttribute("id").toString()).executeUpdate();
//在这里插入经销商保证金退回表的数据
BizObject bobdi = bdi.createQuery("distributor_no=:distributor_id").setParameter("distributor_id", distributor_id).getSingleResult(false);
BigDecimal sum = new BigDecimal(bobdi.getAttribute("sums").getString());
double account_balance = sum.subtract(new BigDecimal(t_rent)).doubleValue();
double account_balance = sum.subtract(t_rent).doubleValue();
BizObject bod = bd.newObject();
bod.setAttributeValue("DISTRIBUTOR_ID", distributor_id);
bod.setAttributeValue("CAUTION_MONEY", t_rent);
bod.setAttributeValue("CAUTION_MONEY", t_rent.toString() );
bod.setAttributeValue("ACCOUNT_BALANCE", account_balance);
bod.setAttributeValue("MONEY_TYPE","bondRepay");
bod.setAttributeValue("INPUTTIME",StringFunction.getTodayNow());

15
src_tenwa/com/tenwa/lease/app/quartzmession/DistributorMarginCompensation.java
View File

@ -20,6 +20,7 @@ import com.tenwa.comm.util.date.DateAssistant;
import com.tenwa.flow.action.comm.SelectBalance;
import jbo.com.tenwa.lease.carbrand.lb_automatic_compensatory;
import jbo.com.tenwa.lease.comm.VI_BOND_COMPENSATORY;
import jbo.com.tenwa.lease.comm.VI_LC_AUDIT_RENT_PLAN;
public class DistributorMarginCompensation implements Job {
@ -61,24 +62,24 @@ public class DistributorMarginCompensation implements Job {
Date dt_add = cal.getTime();
String repay_date = sdf.format(dt_add);
System.out.println("代偿计划日期日期为："+repay_date+"之前的租金计划");
List<BizObject> bos = JBOFactory.getBizObjectManager(VI_LC_AUDIT_RENT_PLAN.CLASS_NAME, tx).createQuery(" select id,penalty,rent from O left join jbo.app.tenwa.calc.LC_FUND_RENT_ADJUST_TEMP lfrat on lfrat.payment_number=O.payment_number where O.COLLECT_STATUS IN ('δÊÕ¿î', '²¿·ÖÊÕ¿î') and O.rent>0 and O.PLAN_DATE <= '"+repay_date+"' and ( O.BATCH_STATUS<>'process' or o.BATCH_STATUS IS NULL ) and lfrat.id is null and O.DISTRIBUTOR_ID='"+distributor_no+"' and not exists ( select 1 from jbo.com.tenwa.entity.comm.flow.D_DEPOSITRETURN_INFO ddi where ddi.RENT_PLAN_ID=O.id)").getResultList(false);
//VI_BOND_COMPENSATORY专门经销代偿查询的数据表，代偿金额不减流程中的金额（如果减去流程中，网银核销没有结束，然后代偿了。网银核销结束的时候，判断有代偿就会红冲，最总导致红冲金额比代偿金额大）
List<BizObject> bos = JBOFactory.getBizObjectManager(VI_BOND_COMPENSATORY.CLASS_NAME, tx).createQuery(" select id,need_caution_money from O where O.need_caution_money > 0 and O.plan_date <= '"+repay_date+"' and O.distributor_id='"+distributor_no+"' and not exists (select 1 from jbo.app.tenwa.calc.LC_FUND_RENT_ADJUST_TEMP lfrat where lfrat.contract_id=O.contract_id) ").getResultList(false);
if(bos.size()==0){
System.out.println("经销商："+distributor_no+"没有可以核销的租金");
continue;
}
String ids = "";
double rent = 0;
String penaltys = "";
//String penaltys = "";
for(int i=0;i<bos.size();i++){
if("".equals(ids)){
ids=bos.get(i).getAttribute("id").toString();
penaltys = bos.get(i).getAttribute("penalty").toString();
//penaltys = bos.get(i).getAttribute("penalty").toString();
}else{
ids+="@"+bos.get(i).getAttribute("id").toString();
penaltys +="@"+bos.get(i).getAttribute("penalty").toString();
//penaltys +="@"+bos.get(i).getAttribute("penalty").toString();
}
rent += bos.get(i).getAttribute("rent").getDouble();
rent += bos.get(i).getAttribute("need_caution_money").getDouble();
}
if("".equals(ids)){
continue;
@ -102,7 +103,7 @@ public class DistributorMarginCompensation implements Job {
}
//核销
ca.setDistributor_id(distributor_no);
ca.setPenaltys(String.valueOf(penaltys));
//ca.setPenaltys(String.valueOf(penaltys));
String result_Collect = ca.afterCollectManageDistributor(tx);
System.out.println("经销商："+distributor_no+result_Collect);
}

63
src_tenwa/com/tenwa/lease/flow/rent/rentreback/DepositRedOffset.java Normal file
View File

@ -0,0 +1,63 @@
package com.tenwa.lease.flow.rent.rentreback;
import java.math.BigDecimal;
import java.util.List;
import jbo.app.tenwa.calc.LC_RENT_INCOME_TEMP;
import jbo.app.tenwa.calc.LC_RENT_PLAN;
import jbo.app.tenwa.customer.DISTRIBUTOR_INFO;
import jbo.com.tenwa.entity.comm.flow.D_DEPOSITCHARGE_INFO;
import jbo.com.tenwa.entity.comm.flow.D_DEPOSITRETURN_INFO;
import com.amarsoft.are.jbo.BizObject;
import com.amarsoft.are.jbo.BizObjectManager;
import com.amarsoft.are.jbo.JBOFactory;
import com.amarsoft.are.util.StringFunction;
import com.amarsoft.awe.util.Transaction;
import com.tenwa.flow.baseBussion.BaseBussiness;
public class DepositRedOffset extends BaseBussiness{
public Object run(Transaction Sqlca) throws Exception{
this.initBussinessParam(Sqlca);
String flowUnid = (String)this.getAttribute("ObjectNo");
BizObjectManager lriTemp = JBOFactory.getBizObjectManager(LC_RENT_INCOME_TEMP.CLASS_NAME , Sqlca);
List<BizObject> lrits = lriTemp.createQuery("select plan_id,rent from O where flowunid=:flowunid group by plan_id").setParameter("flowunid", flowUnid).getResultList(false);
if(lrits.size()>0){
BizObjectManager ddiMange = JBOFactory.getFactory().getManager(D_DEPOSITCHARGE_INFO.CLASS_NAME , Sqlca);
BizObjectManager diManage = JBOFactory.getFactory().getManager(DISTRIBUTOR_INFO.CLASS_NAME, Sqlca);
BizObjectManager bc = JBOFactory.getFactory().getManager(LC_RENT_PLAN.CLASS_NAME,Sqlca);
for(BizObject lrit:lrits){
//查询该期次是否代偿
BizObject boDRI=JBOFactory.createBizObjectQuery(D_DEPOSITRETURN_INFO.CLASS_NAME,"RENT_PLAN_ID=:rentPlanId").setParameter("rentPlanId", lrit.getAttribute("plan_id").getString()).getSingleResult(false);
if(boDRI!=null&&boDRI.getAttribute("CAUTION_MONEY")!=null){
String planId = lrit.getAttribute("plan_id").getString();
BigDecimal rent = new BigDecimal(lrit.getAttribute("rent").getString());
//查询下红冲金额是否在保证金红冲中
BizObject ddi = ddiMange.createQuery(" rent_plan_id=:planId and CAUTION_MONEY=:rent and MONEY_TYPE='bondBack' ").setParameter("planId", planId).setParameter("rent", rent.abs().toString()).getSingleResult(false);
if(ddi != null){
//D_DEPOSITCHARGE_INFO插入新数据
BizObject bDCI_N = ddiMange.newObject();
String distributorId = boDRI.getAttribute("DISTRIBUTOR_ID").toString();
bDCI_N.setAttributeValue("DISTRIBUTOR_ID", distributorId);
bDCI_N.setAttributeValue("CAUTION_MONEY", rent.toString());
bDCI_N.setAttributeValue("MONEY_TYPE","bondBack");
bDCI_N.setAttributeValue("INPUTTIME",StringFunction.getTodayNow());
bDCI_N.setAttributeValue("INPUTUSERID",(String)this.getAttribute("CurUserID"));
bDCI_N.setAttributeValue("INPUTORGID",(String)this.getAttribute("ObjectNo"));
bDCI_N.setAttributeValue("RENT_PLAN_ID",lrit.getAttribute("plan_id").getString());
ddiMange.saveObject(bDCI_N);
//将对应的租金计划表中的状态改为代偿红冲
bc.createQuery("update O set O.COLLECT_STATUS=:COLLECT_STATUS where O.id=:id")
.setParameter("COLLECT_STATUS", "代偿").setParameter("id", planId ).executeUpdate();
//修改经销商信息表里的金额
BizObject bDI = diManage.createQuery("distributor_no=:distributor_id").setParameter("distributor_id", distributorId).getSingleResult(true);
String sum = new BigDecimal(bDI.getAttribute("sums").getString()).add(rent).toString();
bDI.setAttributeValue("sums", sum);
diManage.saveObject(bDI);
}
}
}
}
return "true";
}
}