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

客户日常bug维护

Browse Source
This commit is contained in:
tangfutang 2021-01-09 18:35:13 +08:00
parent f87cde2c85
commit 7a5bf4d0b3
8 changed files with 33 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
WebContent/Tenwa/Lease/Flow/Comm/LBDebitCard/AccountChangeFlowDebitCardInfo.jsp
View File

@ -114,6 +114,8 @@
setItemValue(0,0,"sign_status","Y");
}else if("N"==meassge){
setItemValue(0,0,"sign_status","");
}else {
setItemValue(0,0,"sign_status","");
}
setItemValue(0,0,"ACC_NUMBER",allTrim(getItemValue(0,0,"ACC_NUMBER")));

14
src_app_fresh/apx/com/amarsoft/als/apzl/flow/data/service/Impl/FlowDataServiceImpl.java
View File

@ -256,7 +256,7 @@ public class FlowDataServiceImpl implements FlowDataService{
}
String projectid = flowParms.get("ProjectId");
String ContractId = flowParms.get("ContractId");
String sql = "SELECT id,acc_number,bank_name,account,customerid,project_id,mobile,certid FROM customer_account WHERE acc_type='Debit' and project_id='"+projectid+"'";
String sql = "SELECT id,acc_number,bank_name,account,customerid,project_id,mobile,certid,bank_code,bank_type FROM customer_account WHERE acc_type='Debit' and project_id='"+projectid+"'";
List<Map<String, String>> dataList = DataOperatorUtil.getDataBySql(sql);
Map<String, Object> body = new HashMap<String, Object>();
Map<String, String> data = new HashMap<String, String>();
@ -268,8 +268,16 @@ public class FlowDataServiceImpl implements FlowDataService{
data.put("project_id", dataList.get(0).get("project_id")+"");
data.put("mobile", dataList.get(0).get("mobile")+"");
data.put("certid", dataList.get(0).get("certid")+"");
data.put("bank_code", dataList.get(0).get("bank_code")+"");
data.put("bank_type", dataList.get(0).get("bank_type")+"");
String bank_code = dataList.get(0).get("bank_code");
if(bank_code==null||"null".equals(bank_code)){
bank_code="";
}
data.put("bank_code", bank_code);
String bank_type = dataList.get(0).get("bank_type");
if(bank_type==null||"null".equals(bank_type)){
bank_type="";
}
data.put("bank_type", bank_type);
body.put("statusCode", "00");
//获取扣款文件id
String fileSql = "select * from (select * from (select lda.inputtime,lda.id as fileid ,case locate('front', FILENAME) when 0 then 'back' else 'front'end identify,FILENAME from LB_DOCRELATIVE ldra left join LB_DOCLIBRARY ldc on ldc.RELATIVE_ID=ldra.id and ldc.DOC_NAME='还款卡（正反面）' left join LB_DOCATTRIBUTE lda on lda.library_id=ldc.id where ldra.objecttype='BusinessApplyFlow' and ldra.proj_id='"+dataList.get(0).get("project_id")+"' and lda.deleteed is null ORDER BY lda.inputtime DESC) tmp where tmp.identify = 'front' limit 1) t1 union all select * from (select * from (select lda.inputtime,lda.id as fileid ,case locate('front', FILENAME) when 0 then 'back' else 'front'end identify,FILENAME from LB_DOCRELATIVE ldra left join LB_DOCLIBRARY ldc on ldc.RELATIVE_ID=ldra.id and ldc.DOC_NAME='还款卡（正反面）' left join LB_DOCATTRIBUTE lda on lda.library_id=ldc.id where ldra.objecttype='BusinessApplyFlow' and ldra.proj_id='"+dataList.get(0).get("project_id")+"' and lda.deleteed is null ORDER BY lda.inputtime DESC) tmp where tmp.identify = 'back' limit 1) t2; ";

17
src_app_fresh/apx/com/amarsoft/als/user/change/center/service/impl/ApplyArchiveServiceImpl.java
View File

@ -242,7 +242,7 @@ public class ApplyArchiveServiceImpl implements ApplyArchiveService{
String userId = fieldMap.get("userid") == null ? "" : fieldMap.get("userid").toString();
String sign = fieldMap.get("sign") == null ? "" : fieldMap.get("sign").toString();
String sql = "SELECT lrp.PROJECT_PLAN_NUMBER,lul.customer_name,cp.mobile,cp.SEX,cp.WORKCORP,cp.WORKADD,ca.fulladdress,cp.EMERGENCY_CONTACT_PERSON,lrp.contract_id,cp.customerid AS customer_id FROM lc_overdue_rent_plan lrp LEFT JOIN lb_contract_info lci ON lci.id=lrp.contract_id LEFT JOIN lb_union_lessee lul ON lul.CONTRACT_ID = lrp.CONTRACT_ID LEFT JOIN CUSTOMER_PERSON cp ON cp.customerid = lul.CUSTOMER_ID LEFT JOIN CUSTOMER_ADDRESS ca ON ca.customerid = cp.customerid WHERE lrp.plan_date < NOW() AND lrp.plan_status='δ½áÇå' ";
String sql = "SELECT lrp.PROJECT_PLAN_NUMBER,lul.customer_name,cp.mobile,cp.SEX,cp.WORKCORP,cp.WORKADD,ca.fulladdress,cp.EMERGENCY_CONTACT_PERSON,lrp.contract_id,cp.customerid AS customer_id FROM lc_overdue_rent_plan lrp LEFT JOIN lb_contract_info lci ON lci.id=lrp.contract_id LEFT JOIN lb_union_lessee lul ON lul.CONTRACT_ID = lrp.CONTRACT_ID LEFT JOIN CUSTOMER_PERSON cp ON cp.customerid = lul.CUSTOMER_ID LEFT JOIN CUSTOMER_ADDRESS ca ON ca.customerid = cp.customerid WHERE lrp.plan_date < DATE_FORMAT(NOW(),'%Y/%m/%d') AND lrp.plan_status='δ½áÇå' and lci.contract_status='31' ";
if("my".equalsIgnoreCase(sign)){
System.out.println("获取我的逾期提醒数据 ");
sql = sql + " AND lci.project_manage='"+userId+"' GROUP BY cp.customerid ";
@ -271,9 +271,20 @@ public class ApplyArchiveServiceImpl implements ApplyArchiveService{
String sql = "";
//sql = "select lrp.contract_id,lci.contract_number,lul.customer_name as lessee_name,lec.frame_number,lec.model,ifnull(sum(lrp.rent),0) - ifnull(sum(lri.rent),0) as residue_rent,lrp.rent,lcc.defaultdueday,lcc.lease_term,lrp.plan_list,lrp.penalty from lb_contract_info lci left join lc_calc_condition lcc on lcc.contract_id = lci.id left join lb_union_lessee lul on lcc.contract_id = lul.contract_id and lul.is_main = 'y' left join lb_equipment_car lec on lec.contract_id = lcc.contract_id left join lc_rent_plan lrp on lrp.contract_id=lci.id left join lc_rent_income lri on lri.plan_id=lrp.id where lul.customer_id='"+customerid+"' group by lrp.contract_id ";
//sql = "SELECT lrp.project_plan_number as plannumber,'project_plan_number' AS planCName,lul.flowunid as objectNo,lrp.contract_id,lrp.contract_plan_number AS contract_number,lul.customer_name AS lessee_name,lec.frame_number,lec.model,lrp.overinterest AS residue_rent,lrp.rent,SUBSTRING(lrp.plan_date,-2) AS defaultdueday,lcc.lease_term,COUNT(*) AS plan_list,SUM(lrp.penalty) AS penalty,ldcl.filename AS filename,ldcl.attribute_id AS fileId FROM lc_overdue_rent_plan lrp LEFT JOIN lb_union_lessee lul ON lul.contract_id=lrp.contract_id AND lul.is_main = 'y' LEFT JOIN lb_equipment_car lec ON lec.contract_id = lrp.contract_id LEFT JOIN lc_calc_condition lcc ON lcc.contract_id = lrp.contract_id LEFT JOIN lb_doc_contract_list ldcl ON ldcl.contract_id=lrp.contract_id AND ldcl.file_flag='yes' WHERE plan_status='未结清' AND lul.customer_id='"+customerid+"' GROUP BY lrp.contract_id ";
sql= "SELECT lci.id AS contract_id,lci.contract_number,lul.flowunid AS objectNo,lul.lessee_name,lec.frame_number,lec.model,IFNULL(lrp.rent,0) - IFNULL(lri.rent,0) AS residue_rent,lor.rent,lor.defaultdueday,lcc.lease_term,lor.plan_list,IFNULL(lcrl.rent,0)- IFNULL(lri.rent,0) + IFNULL(lor.penalty,0) AS penalty,lor.plannumber,lor.planCName,ld.filename,ld.fileId FROM lb_contract_info lci LEFT JOIN (SELECT contract_id,SUM(rent) AS rent FROM lc_rent_plan GROUP BY contract_id) lrp ON lrp.contract_id = lci.id LEFT JOIN (SELECT contract_id,SUM(rent) AS rent FROM lc_rent_income GROUP BY contract_id) lri ON lri.contract_id = lci.id LEFT JOIN (SELECT contract_id,SUM(rent) AS rent FROM lc_rent_plan WHERE DATE_FORMAT(NOW(),'%Y/%m/%d')>plan_date GROUP BY contract_id ) lcrl ON lcrl.contract_id = lci.id LEFT JOIN (SELECT project_plan_number AS plannumber,'project_plan_number' AS planCName,contract_plan_number AS contract_number,contract_id,SUBSTRING(plan_date,-2) AS defaultdueday,rent,plan_date,plan_status,COUNT(*) AS plan_list,SUM(penalty) - SUM(fact_penalty) AS penalty FROM lc_overdue_rent_plan WHERE plan_status='δ½áÇå' GROUP BY contract_id) lor ON lor.contract_id = lrp.contract_id LEFT JOIN (SELECT contract_id,plan_date FROM lc_rent_plan GROUP BY contract_id) lcr ON lcr.contract_id=lci.id LEFT JOIN (SELECT customer_name AS lessee_name,contract_id,is_main,customer_id,flowunid FROM lb_union_lessee WHERE is_main = 'y' GROUP BY contract_id) lul ON lul.contract_id=lci.id LEFT JOIN (SELECT frame_number,model,contract_id FROM lb_equipment_car GROUP BY contract_id) lec ON lec.contract_id = lci.id LEFT JOIN (SELECT lease_term,contract_id FROM lc_calc_condition GROUP BY contract_id) lcc ON lcc.contract_id = lci.id LEFT JOIN (SELECT contract_id,file_flag,filename AS filename,attribute_id AS fileId FROM lb_doc_contract_list WHERE file_flag='yes' GROUP BY contract_id) ld ON ld.contract_id=lci.id WHERE lul.customer_id='"+customerid+"' GROUP BY lci.id ";
sql= "SELECT 'project_plan_number' AS planCName,lci.id AS contract_id,lci.contract_number,lul.flowunid AS objectNo,lul.lessee_name,lec.frame_number,lec.model,IFNULL(lrp.rent,0) - IFNULL(lri.rent,0) AS residue_rent,lcc.lease_term,lcr.rent,lcr.defaultdueday,ld.filename,ld.fileId FROM lb_contract_info lci LEFT JOIN (SELECT contract_id,SUM(rent) AS rent FROM lc_rent_plan GROUP BY contract_id) lrp ON lrp.contract_id = lci.id LEFT JOIN (SELECT contract_id,SUM(rent) AS rent FROM lc_rent_income GROUP BY contract_id) lri ON lri.contract_id = lci.id LEFT JOIN (SELECT customer_name AS lessee_name,contract_id,is_main,customer_id,flowunid FROM lb_union_lessee WHERE is_main = 'y' GROUP BY contract_id) lul ON lul.contract_id=lci.id LEFT JOIN (SELECT frame_number,model,contract_id FROM lb_equipment_car GROUP BY contract_id) lec ON lec.contract_id = lci.id LEFT JOIN (SELECT lease_term,contract_id FROM lc_calc_condition GROUP BY contract_id) lcc ON lcc.contract_id = lci.id LEFT JOIN (SELECT contract_id,file_flag,filename AS filename,attribute_id AS fileId FROM lb_doc_contract_list WHERE file_flag='yes' GROUP BY contract_id) ld ON ld.contract_id=lci.id LEFT JOIN (SELECT contract_id,rent,SUBSTRING(plan_date,9,10) as defaultdueday FROM lc_rent_plan where plan_list='1' ) lcr ON lcr.contract_id=lci.id WHERE lci.contract_status='31' and lul.customer_id='"+customerid+"' GROUP BY lci.id ";
List<Map<String, String>> dataList = DataOperatorUtil.getDataBySql(sql);
if(dataList!=null && dataList.size()>0){
for (int i =0;i<dataList.size();i++) {
Map<String, String> map = dataList.get(i);
String rentSql = "select COUNT(1) plan_lists,IFNULL(SUM(rent_over),0)+IFNULL(SUM(penalty_over),0) as rentmoney from vi_lc_rent_plan where contract_id='"+map.get("contract_id")+"' and plan_date<DATE_FORMAT(SYSDATE(),'%Y/%m/%d') and rent_over>0";
List<Map<String, String>> rentList = DataOperatorUtil.getDataBySql(rentSql);
if(rentList!=null&& rentList.size()>0){
map.put("plan_list", rentList.get(0).get("plan_lists"));
map.put("penalty", rentList.get(0).get("rentmoney"));
dataList.set(i, map);
}
}
}
Map<String, Object> body = new HashMap<String, Object>();
body.put("datas", dataList);
ReturnMapUtil.setReturnMap(body,RestfullConstant.baseProperty.get("success").toString(), "");

15
src_sql/投产SQL/v20201022/tft_20201022.sql
View File

@ -226,21 +226,6 @@ CREATE TABLE bank_collect_type_config_log (
delee from AWE_DO_CATALOG where dono='BankCollectTypeConfigInfo';
Insert Into AWE_DO_CATALOG (dono,doname,dodescribe,dotype,doclass,isinuse,colcount,modeid,jboclass,jbofrom,jbowhere,jbogroup,jboorder,businessprocess,exportflag,inputuser,inputtime,updateuser,updatetime,remark,isvalidate,parent) Values ('BankCollectTypeConfigInfo','银行扣款方式配置',null,'30020',null,'1','1','default','jbo.loan.BANK_COLLECT_TYPE_CONFIG','O','id=:id','','','com.amarsoft.app.awe.config.customer.CustomerAccountConfigHandler',null,'SYS_Designer','2020/10/22 11:42:42','SYS_Designer','2020/12/10 14:36:40','','0','');
-- 税率编码维护添加主体字段
Alter table tax_code_info add column lease_form varchar(5) NULL COMMENT '赁类型01直租，02回租' after remark;
-- 税率编码维护list页面添加租赁类型字段
Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('taxCodeList','0045','0045','1','O','lease_form','lease_form','String','','租赁类型','','1','FlatSelect','1','1','Code','leas_form','','20','1','0','0','1','0',0,'','','','SYS_Designer','2020/12/11 09:49:25','SYS_Designer','2020/12/11 10:50:03','0','','1','','','','');
-- 税率编码维护info页面添加校验和字段
delete from AWE_DO_CATALOG where dono='taxCodeInfo';
Insert Into AWE_DO_CATALOG (dono,doname,dodescribe,dotype,doclass,isinuse,colcount,modeid,jboclass,jbofrom,jbowhere,jbogroup,jboorder,businessprocess,exportflag,inputuser,inputtime,updateuser,updatetime,remark,isvalidate,parent) Values ('taxCodeInfo','税率编码信息',null,'30',null,'1','1','default','jbo.app.tenwa.calc.TAX_CODE_INFO','O','id=:id','','','com.amarsoft.app.awe.config.classmethod.TaxCodeInfoHandler',null,'SYS_Designer','2020/07/30 16:05:18','SYS_Designer','2020/12/11 10:46:12','','0','');
delete from awe_do_library where dono='taxCodeInfo';
Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('taxCodeInfo','0010','0010','1','O','id','id','String','','id','','1','Text','1','1','','','',null,'0','0','0','1','0',0,'','','','SYS_Designer','2020/07/30 16:05:18','SYS_Designer','2020/12/11 10:46:12','','','1','','','','');
Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('taxCodeInfo','0020','0020','1','O','code','code','String','','编码','','1','Text','1','1','','','',null,'1','0','1','1','0',0,'','','','SYS_Designer','2020/07/30 16:05:18','SYS_Designer','2020/12/11 10:46:12','0','','1','','','','');
Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('taxCodeInfo','0030','0030','1','O','full_code','full_code','String','','合并编码','','1','Text','1','1','','','',null,'1','0','1','1','0',0,'','','','SYS_Designer','2020/07/30 16:05:18','SYS_Designer','2020/12/11 10:46:12','0','','1','','','','');
Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('taxCodeInfo','0040','0040','1','O','tax_type','tax_type','String','','名称','','1','Select','1','1','Code','tax_type','',null,'1','0','1','1','0',0,'','','','SYS_Designer','2020/07/30 16:05:18','SYS_Designer','2020/12/11 10:46:12','0','','1','','','','');
Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('taxCodeInfo','0045','0045','1','O','lease_form','lease_form','String','','租赁类型','','1','Select','1','1','Code','leas_form','','20','1','0','1','1','0',0,'','','','SYS_Designer','2020/12/11 09:51:16','SYS_Designer','2020/12/11 10:51:43','0','','1','','','','');
Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('taxCodeInfo','0050','0050','1','O','remark','remark','String','','简称','','1','Text','1','1','','','',null,'1','0','0','1','0',0,'','','','SYS_Designer','2020/07/30 16:05:18','SYS_Designer','2020/12/11 10:46:12','','','1','','','','');
-- 添加扣款渠道数据字典
Insert Into CODE_CATALOG (codeno,sortno,codetypeone,codetypetwo,codename,codedescribe,codeattribute,inputuser,inputorg,inputtime,updateuser,updatetime,remark) Values ('DeductionCollect','00217700','1.基础配置','扣款渠道','','','','SYS_Designer',null,'2020/12/11 15:56:58','SYS_Designer','2020/12/11 15:56:58','');
Insert Into Code_Library (codeno,itemno,itemname,bankno,sortno,isinuse,itemdescribe,itemattribute,relativecode,attribute1,attribute2,attribute3,attribute4,attribute5,attribute6,attribute7,attribute8,inputuser,inputorg,inputtime,updateuser,updatetime,remark,helptext) Values ('DeductionCollect','TLcollect','通联扣款','','0020','1','','','','','','','','','','','','SYS_Designer',null,'2020/12/11 15:59:56','SYS_Designer','2020/12/11 15:59:56','','');

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

@ -1027,7 +1027,7 @@ public class CollectAuditInfoCache {
BizObject bolri = bmlri.createQuery("select v.sum(rent) as v.rent from O where plan_id=:plan_id group by plan_id").setParameter("plan_id", plan_id).getSingleResult(false);
String rent_i = bolri.getAttribute("rent").toString();
if(Double.parseDouble(rent_p)>Double.parseDouble(rent_i)){
COLLECT_STATUS = "部分收款";
COLLECT_STATUS = collectStatusPart;
COLLECT_MSG = "手动卡扣,部分收款";
BigDecimal singleRent_over = new BigDecimal(rent);

2
src_tenwa/com/tenwa/collectaudit/cache/CollectAuditInfoCacheTj.java vendored
View File

@ -1028,7 +1028,7 @@ public class CollectAuditInfoCacheTj {
BizObject bolri = bmlri.createQuery("select v.sum(rent) as v.rent from O where plan_id=:plan_id group by plan_id").setParameter("plan_id", plan_id).getSingleResult(false);
String rent_i = bolri.getAttribute("rent").toString();
if(Double.parseDouble(rent_p)>Double.parseDouble(rent_i)){
COLLECT_STATUS = "部分收款";
COLLECT_STATUS = collectStatusPart;
COLLECT_MSG = "手动卡扣,部分收款";
BigDecimal singleRent_over = new BigDecimal(rent);

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

@ -62,7 +62,7 @@ public class DistributorMarginCompensation implements Job {
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.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+"'").getResultList(false);
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);
if(bos.size()==0){
System.out.println("经销商："+distributor_no+"没有可以核销的租金");
continue;
@ -85,12 +85,12 @@ public class DistributorMarginCompensation implements Job {
}
//扣款提前校验
ca.setId(ids);
String result = ca.checkRentIsIncome(tx);
/*String result = ca.checkRentIsIncome(tx);
String [] value = result.split("@");
if("error".equals(value[0])){
System.out.println("经销商："+distributor_no+"的"+value[1]);
continue;
}
}*/
//验证余额是否足够
sb.setDistributor_no(distributor_no);
sb.setCaution_money(String.valueOf(rent));

2
src_tenwa/com/tenwa/lease/app/quartzmession/WechatMessagePush.java
View File

@ -183,7 +183,7 @@ public class WechatMessagePush implements Job{
// 查询所有需要发送还款提醒的数据
//String selSql="SELECT CI.CUSTOMERNAME AS CUST_NAME,WUI.MOBILE_,WUI.CERTID_,LCI.CONTRACT_NUMBER,CI.CUSTOMER_NUM,LRP.PLAN_LIST,LCI.ID AS CONTRACT_ID,CI.CUSTOMERID,WUI.OPENID,CONCAT('/wechat/menu?type=payments&id=',LCI.CONTRACT_NUMBER) AS LINK,CONCAT(CONVERT(YEAR(LRP.PLAN_DATE), CHAR),'年',CONVERT(MONTH(LRP.PLAN_DATE), CHAR),'月',CONVERT(DAY(LRP.PLAN_DATE), CHAR),'日') AS KEYWORD1,CONCAT(ROUND((LRP.RENT + ROUND(IFNULL(getRentPenalty3(LRP.PAYMENT_NUMBER,LRP.PLAN_LIST,IFNULL(LRI.HIRE_DATE,DATE_FORMAT(NOW(), '%y/%m/%d'))),0),2)) - (IFNULL(LRI.RENT, 0) + IFNULL(LRI.PENALTY, 0)),2),'元') AS KEYWORD2,CONCAT((LRP.RENT - IFNULL(LRI.RENT, 0)),'元') AS KEYWORD3,CONCAT(ROUND(IFNULL(getRentPenalty(LRP.PAYMENT_NUMBER,LRP.PLAN_LIST,IFNULL(LRI.HIRE_DATE,DATE_FORMAT(NOW(), '%y/%m/%d'))),0),2),'元') AS KEYWORD4 FROM WECHAT_USER_INFO WUI LEFT JOIN CUSTOMER_INFO CI ON CI.CERTID = WUI.CERTID_ LEFT JOIN LB_UNION_LESSEE LUL ON LUL.CUSTOMER_ID = CI.CUSTOMERID AND LUL.IS_MAIN = 'Y' LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID = LUL.CONTRACT_ID AND LCI.CONTRACT_STATUS = '31' LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO=LCI.DISTRIBUTOR_ID LEFT JOIN (SELECT CONTRACT_ID,PLAN_LIST,MAX(PLAN_DATE) AS PLAN_DATE,MAX(PAYMENT_NUMBER) AS PAYMENT_NUMBER,SUM(RENT) AS RENT,SUM(IFNULL(PENALTY, 0)) AS PENALTY FROM LC_RENT_PLAN WHERE TIMESTAMPDIFF(DAY,DATE_FORMAT(PLAN_DATE, '%Y-%m-%d'),DATE_FORMAT(NOW(), '%Y-%m-%d')) >= 3 GROUP BY CONTRACT_ID,PLAN_LIST) LRP ON LRP.CONTRACT_ID = LCI.ID LEFT JOIN (SELECT CONTRACT_ID,PLAN_LIST,SUM(RENT) AS RENT,SUM(IFNULL(PENALTY, 0)) AS PENALTY,MAX(HIRE_DATE) AS HIRE_DATE FROM LC_RENT_INCOME GROUP BY CONTRACT_ID,PLAN_LIST) LRI ON LRI.CONTRACT_ID = LRP.CONTRACT_ID AND LRI.PLAN_LIST = LRP.PLAN_LIST WHERE WUI.BINDING_STATUS = 'Y' AND IFNULL(WUI.ATTENTION_STATUS,'Y')<>'N' AND DI.DISTRIBUTOR_NAME<>'辉煌国际融资租赁（天津）有限公司' AND (IFNULL(LRP.RENT, 0)+ ROUND(IFNULL(getRentPenalty3(LRP.PAYMENT_NUMBER,LRP.PLAN_LIST,IFNULL(LRI.HIRE_DATE,DATE_FORMAT(NOW(), '%y/%m/%d'))),0),2)- IFNULL(LRI.RENT, 0) - IFNULL(LRI.PENALTY, 0)) > 0 AND NOT EXISTS (SELECT 1 FROM WECHAT_MESSAGE_RECORD WHERE OPENID = WUI.OPENID AND SEND_TYPE = '2' AND CONTRACT_NUMBER = LCI.CONTRACT_NUMBER AND PLAN_LIST = LRP.PLAN_LIST AND SEND_STATUS = 'Y') ORDER BY LRP.PLAN_LIST LIMIT 0, 50000 ";
String selSql="SELECT CI.CUSTOMERNAME AS CUST_NAME,WUI.MOBILE_,WUI.CERTID_,LCI.CONTRACT_NUMBER,CI.CUSTOMER_NUM,LRP.PLAN_LIST,LCI.ID AS CONTRACT_ID,CI.CUSTOMERID,WUI.OPENID,CONCAT('/wechat/menu?type=payments&id=',LCI.CONTRACT_NUMBER) AS LINK,CONCAT(CONVERT(YEAR(LRP.PLAN_DATE), CHAR),'年',CONVERT(MONTH(LRP.PLAN_DATE), CHAR),'月',CONVERT(DAY(LRP.PLAN_DATE), CHAR),'日') AS KEYWORD1,CONCAT(ROUND((LRP.RENT + ROUND(IFNULL(getRentPenalty(LRP.PAYMENT_NUMBER,LRP.PLAN_LIST,DATE_FORMAT(NOW(), '%y/%m/%d')),0),2)) - (IFNULL(LRI.RENT, 0) + IFNULL(LRI.PENALTY, 0)),2),'元') AS KEYWORD2,CONCAT((LRP.RENT - IFNULL(LRI.RENT, 0)),'元') AS KEYWORD3,CONCAT(ROUND(IFNULL(getRentPenalty(LRP.PAYMENT_NUMBER,LRP.PLAN_LIST,DATE_FORMAT(NOW(), '%y/%m/%d')),0),2),'元') AS KEYWORD4 FROM WECHAT_USER_INFO WUI LEFT JOIN CUSTOMER_INFO CI ON CI.CERTID = WUI.CERTID_ LEFT JOIN LB_UNION_LESSEE LUL ON LUL.CUSTOMER_ID = CI.CUSTOMERID AND LUL.IS_MAIN = 'Y' LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID = LUL.CONTRACT_ID AND LCI.CONTRACT_STATUS = '31' LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO=LCI.DISTRIBUTOR_ID LEFT JOIN (SELECT CONTRACT_ID,PLAN_LIST,MAX(PLAN_DATE) AS PLAN_DATE,MAX(PAYMENT_NUMBER) AS PAYMENT_NUMBER,SUM(RENT) AS RENT,SUM(IFNULL(PENALTY, 0)) AS PENALTY FROM LC_RENT_PLAN WHERE TIMESTAMPDIFF(DAY,DATE_FORMAT(PLAN_DATE, '%Y-%m-%d'),DATE_FORMAT(NOW(), '%Y-%m-%d')) >= 3 GROUP BY CONTRACT_ID,PLAN_LIST) LRP ON LRP.CONTRACT_ID = LCI.ID LEFT JOIN (SELECT CONTRACT_ID,PLAN_LIST,SUM(RENT) AS RENT,SUM(IFNULL(PENALTY, 0)) AS PENALTY,MAX(HIRE_DATE) AS HIRE_DATE FROM LC_RENT_INCOME GROUP BY CONTRACT_ID,PLAN_LIST) LRI ON LRI.CONTRACT_ID = LRP.CONTRACT_ID AND LRI.PLAN_LIST = LRP.PLAN_LIST WHERE WUI.BINDING_STATUS = 'Y' AND IFNULL(WUI.ATTENTION_STATUS,'Y')<>'N' AND DI.DISTRIBUTOR_NAME<>'辉煌国际融资租赁（天津）有限公司' AND (IFNULL(LRP.RENT, 0)- IFNULL(LRI.RENT, 0)) > 0 AND NOT EXISTS (SELECT 1 FROM WECHAT_MESSAGE_RECORD WHERE OPENID = WUI.OPENID AND SEND_TYPE = '2' AND CONTRACT_NUMBER = LCI.CONTRACT_NUMBER AND PLAN_LIST = LRP.PLAN_LIST AND SEND_STATUS = 'Y') ORDER BY LRP.PLAN_LIST LIMIT 0, 50000 ";
String selSql="SELECT CI.CUSTOMERNAME AS CUST_NAME,WUI.MOBILE_,WUI.CERTID_,LCI.CONTRACT_NUMBER,CI.CUSTOMER_NUM,LRP.PLAN_LIST,LCI.ID AS CONTRACT_ID,CI.CUSTOMERID,WUI.OPENID,CONCAT('/wechat/menu?type=payments&id=',LCI.CONTRACT_NUMBER) AS LINK,CONCAT(CONVERT(YEAR(LRP.PLAN_DATE), CHAR),'年',CONVERT(MONTH(LRP.PLAN_DATE), CHAR),'月',CONVERT(DAY(LRP.PLAN_DATE), CHAR),'日') AS KEYWORD1,CONCAT(ROUND((LRP.RENT + ROUND(IFNULL(getRentPenalty(LRP.PAYMENT_NUMBER,LRP.PLAN_LIST,DATE_FORMAT(NOW(), '%Y/%m/%d')),0),2)) - (IFNULL(LRI.RENT, 0) + IFNULL(LRI.PENALTY, 0)),2),'元') AS KEYWORD2,CONCAT((LRP.RENT - IFNULL(LRI.RENT, 0)),'元') AS KEYWORD3,CONCAT(ROUND(IFNULL(getRentPenalty(LRP.PAYMENT_NUMBER,LRP.PLAN_LIST,DATE_FORMAT(NOW(), '%Y/%m/%d')),0)-IFNULL(LRI.PENALTY, 0),2),'元') AS KEYWORD4 FROM WECHAT_USER_INFO WUI LEFT JOIN CUSTOMER_INFO CI ON CI.CERTID = WUI.CERTID_ LEFT JOIN LB_UNION_LESSEE LUL ON LUL.CUSTOMER_ID = CI.CUSTOMERID AND LUL.IS_MAIN = 'Y' LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID = LUL.CONTRACT_ID AND LCI.CONTRACT_STATUS = '31' LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO=LCI.DISTRIBUTOR_ID LEFT JOIN (SELECT CONTRACT_ID,PLAN_LIST,MAX(PLAN_DATE) AS PLAN_DATE,MAX(PAYMENT_NUMBER) AS PAYMENT_NUMBER,SUM(RENT) AS RENT,SUM(IFNULL(PENALTY, 0)) AS PENALTY FROM LC_RENT_PLAN WHERE TIMESTAMPDIFF(DAY,DATE_FORMAT(PLAN_DATE, '%Y-%m-%d'),DATE_FORMAT(NOW(), '%Y-%m-%d')) >= 3 GROUP BY CONTRACT_ID,PLAN_LIST) LRP ON LRP.CONTRACT_ID = LCI.ID LEFT JOIN (SELECT CONTRACT_ID,PLAN_LIST,SUM(RENT) AS RENT,SUM(IFNULL(PENALTY, 0)) AS PENALTY,MAX(HIRE_DATE) AS HIRE_DATE FROM LC_RENT_INCOME GROUP BY CONTRACT_ID,PLAN_LIST) LRI ON LRI.CONTRACT_ID = LRP.CONTRACT_ID AND LRI.PLAN_LIST = LRP.PLAN_LIST WHERE WUI.BINDING_STATUS = 'Y' AND IFNULL(WUI.ATTENTION_STATUS,'Y')<>'N' AND DI.DISTRIBUTOR_NAME<>'辉煌国际融资租赁（天津）有限公司' AND (IFNULL(LRP.RENT, 0)- IFNULL(LRI.RENT, 0)) > 0 AND NOT EXISTS (SELECT 1 FROM WECHAT_MESSAGE_RECORD WHERE OPENID = WUI.OPENID AND SEND_TYPE = '2' AND CONTRACT_NUMBER = LCI.CONTRACT_NUMBER AND PLAN_LIST = LRP.PLAN_LIST AND SEND_STATUS = 'Y') ORDER BY LRP.PLAN_LIST LIMIT 0, 50000 ";
ASResultSet rs = Sqlca.getASResultSet(new SqlObject(selSql));
// 循环, 逐条发送