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

1.其它支付流程完善逻辑，并修改bug.

Browse Source
This commit is contained in:
zhangbb 2019-12-11 15:38:19 +08:00
parent 5a2b2828e9
commit b6cd83e57d
7 changed files with 142 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
WebContent/Tenwa/Lease/Flow/Rent/RentReback/LCEbankTemp.jsp
View File

@ -52,7 +52,6 @@
alert("请先选择需要撤回的选项");
return;
}
debugger;
ebankNumber = ebankNumber.replace(/,/ig,"@");
if(ebankNumber.startsWith("@")){
ebankNumber = ebankNumber.substring(1);

27
WebContent/Tenwa/Lease/Flow/Rent/RentReback/LCSplittingPayTemp.jsp
View File

@ -37,7 +37,7 @@
}else if("0010".equals(phaseNo)){
sButtons = new String[][]{
{"true","","Button","±£´æ","±£´æ","as_save(0)","","","","btn_icon_save",""},
{"true","","Button","³·Ïú","³·Ïú","as_delete(0)","","","","btn_icon_delete",""}
{"true","","Button","撤销","撤销","deleteProcess()","","","","btn_icon_delete",""}
};
}else{
sButtons = new String[][]{
@ -46,7 +46,30 @@
}
%><%@include file="/Frame/resources/include/ui/include_list.jspf"%>
<script type="text/javascript">
function deleteProcess(){
var planID = getItemValueArray(0,"plan_id")+","+TablePage.getCheckedItemValueArrayWithOtherPage("plan_id",s_c_p[0]);
if("," == planID){
alert("请先选择需要撤回的选项");
return;
}
planID = planID.replace(/,/ig,"@");
if(planID.startsWith("@")){
planID = planID.substring(1);
}
var sResult = RunJavaMethodTrans("com.tenwa.lease.flow.rent.rentreback.OtherPayMethod","changeSplittingStatusBatch",
"planIDs="+planID);
if("success"==sResult){
as_delete(0);
alert("撤销成功！");
reloadSelf();
TablePage.pageCheckedData = {};
TablePage.pageUncheckedData = {};
}else{
alert("撤销失败！");
TablePage.pageCheckedData = {};
TablePage.pageUncheckedData = {};
}
}
</script>
<%@ include file="/Frame/resources/include/include_end.jspf"%>

6
WebContent/Tenwa/Lease/Flow/Rent/RentReback/Splitting.jsp
View File

@ -6,9 +6,9 @@
//dwTemp.MultiSelect = true; //多选
String flowunid = CurPage.getAttribute("FlowUnid");
String PhaseNo = CurPage.getParameter("PhaseNo");
String temp = "true";
if("0020".equals(PhaseNo)){
temp = "false";
String temp = "false";
if("0010".equals(PhaseNo)){
temp = "true";
};
//参数：0.是否显示, 1.标题, 2.JS事件字符串表示(TabContentFrame会替换为真实名称), 3. 是否缓存(默认是), 4. 是否有关闭按钮(默认无), 5. Strip高度(默认600px)
String sTabStrip[][] = {

24
WebContent/WEB-INF/etc/jbo/jbo_calc.xml
View File

@ -529,6 +529,7 @@
<attribute name="SPARE_BATCH_NO" label="备用金到账批次号" type="STRING" length="32"/>
<attribute name="CORPUS_SP" label="分润成本" type="String" length="18" scale="2"/>
<attribute name="INTEREST_sp" label="分润给SP" type="String" length="18" scale="2"/>
<attribute name="SPLITTING_STATUS" label="分润支付状态" type="STRING" length="2"/>
</attributes>
<manager>
<managerProperties>
@ -1513,6 +1514,7 @@
<attribute name="SPARE_BATCH_NO" label="备用金到账批次号" type="STRING" length="32"/>
<attribute name="CORPUS_SP" label="分润成本" type="String" length="18" scale="2"/>
<attribute name="INTEREST_sp" label="分润给SP" type="String" length="18" scale="2"/>
<attribute name="SPLITTING_STATUS" label="分润支付状态" type="STRING" length="2"/>
</attributes>
<manager>
<managerProperties>
@ -2488,6 +2490,7 @@
<attribute name="SPARE_BATCH_NO" label="备用金到账批次号" type="STRING" length="32"/>
<attribute name="CORPUS_SP" label="分润成本" type="String" length="18" scale="2"/>
<attribute name="INTEREST_sp" label="分润给SP" type="String" length="18" scale="2"/>
<attribute name="SPLITTING_STATUS" label="分润支付状态" type="STRING" length="2"/>
</attributes>
<manager>
<managerProperties>
@ -4088,5 +4091,26 @@
</managerProperties>
</manager>
</class>
<class name="VI_LC_SPLITTING_PAY_LIST" label="" keyAttributes="">
<attributes>
<attribute name="ID" label="ID" type="STRING"/>
<attribute name="distributor_name" label="distributor_name" type="STRING"/>
<attribute name="contract_no" label="contract_no" type="STRING"/>
<attribute name="customername" label="customername" type="STRING"/>
<attribute name="plan_list" label="plan_list" type="STRING"/>
<attribute name="plan_date" label="plan_date" type="STRING"/>
<attribute name="rent" label="rent" type="STRING"/>
<attribute name="corpus" label="corpus" type="STRING"/>
<attribute name="interest" label="interest" type="STRING"/>
<attribute name="corpus_sp" label="corpus_sp" type="STRING"/>
<attribute name="INTEREST_sp" label="INTEREST_sp" type="STRING"/>
<attribute name="splitting_status" label="splitting_status" type="STRING"/>
</attributes>
<manager>
<managerProperties>
<property name="table" value="vi_lc_splitting_pay_list" />
</managerProperties>
</manager>
</class>
</package>
</jbo>

56
src_tenwa/com/tenwa/flow/fund/flowpayment/FundPayment.java
View File

@ -5,15 +5,19 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import jbo.app.tenwa.calc.LC_CALC_CONDITION;
import jbo.app.tenwa.calc.LC_FUND_INCOME;
import jbo.app.tenwa.calc.LC_FUND_INCOME_TEMP;
import jbo.app.tenwa.calc.LC_FUND_PLAN;
import jbo.app.tenwa.calc.VI_LC_FUND_PLAN;
import jbo.app.tenwa.customer.LPOUNDAGE_MAINTENANCE;
import jbo.com.tenwa.lease.comm.LB_CONTRACT_INFO;
import jbo.com.tenwa.lease.comm.LB_LESSOR_INFO;
import jbo.com.tenwa.lease.comm.LB_TENANTRY_INFO;
import jbo.com.tenwa.lease.comm.LC_PAY_CONDTION;
import jbo.com.tenwa.lease.comm.LC_PAY_CONDTION_TEMP;
import com.amarsoft.app.util.ProductParamUtil;
import com.amarsoft.are.jbo.BizObject;
import com.amarsoft.are.jbo.BizObjectManager;
import com.amarsoft.are.jbo.JBOFactory;
@ -271,6 +275,57 @@ public class FundPayment {
boEquipAmt.setAttributeValue("FLOWUNID", flowunid);
boEquipAmt.setAttributeValue("IS_FLOWING", 0);
bomLFIT.saveObject(boEquipAmt);
String getProductSQL = "select PRODUCT_ID from O where O.id='"+boLFPAMT.getAttribute("CONTRACT_ID").getString()+"'";
BizObject boLCI = JBOFactory.getBizObjectManager(LB_CONTRACT_INFO.CLASS_NAME,tx).createQuery(getProductSQL).getSingleResult(false);
String productId = boLCI.getAttribute("PRODUCT_ID").toString();
String isBalance = ProductParamUtil.getProductParameterValue(productId, "PRD0315", "UNITE_MONEY", "isBalance");
if("yes".equals(isBalance)){
BizObject boUniteMoney = bomLFIT.newObject();
// boUniteMoney.setAttributeValue("QUOT_ID", boLFP.getAttribute("QUOT_ID").getString());
// boUniteMoney.setAttributeValue("CUST_ID", boLFP.getAttribute("CUST_ID").getString());
boUniteMoney.setAttributeValue("PROJECT_ID", boLFPAMT.getAttribute("PROJECT_ID").getString());
boUniteMoney.setAttributeValue("RELATIVE_ID", incomeID);
boUniteMoney.setAttributeValue("PROJECT_PLAN_NUMBER", boLFPAMT.getAttribute("PROJECT_PLAN_NUMBER").getString());
boUniteMoney.setAttributeValue("CONTRACT_ID", boLFPAMT.getAttribute("CONTRACT_ID").getString());
boUniteMoney.setAttributeValue("CONTRACT_PLAN_NUMBER", boLFPAMT.getAttribute("CONTRACT_PLAN_NUMBER").getString());
boUniteMoney.setAttributeValue("PAYMENT_NUMBER", boLFPAMT.getAttribute("PAYMENT_NUMBER").getString());
// boUniteMoney.setAttributeValue("PLAN_ID", planID);
// boUniteMoney.setAttributeValue("PLAN_LIST", boLFPAMT.getAttribute("PLAN_LIST").getString());
boUniteMoney.setAttributeValue("PAY_TYPE", "pay_type_in");
boUniteMoney.setAttributeValue("FEE_TYPE", "feetype10");
boUniteMoney.setAttributeValue("SETTLE_METHOD", "settlemethod11");
// List<BizObject> boLCFI = JBOFactory.createBizObjectQuery(LC_FUND_INCOME.CLASS_NAME, "PLAN_ID=:PLAN_ID and ROLL_BACK='0' and PAY_STATUS<>'apply_return'").setParameter("PLAN_ID", planID)
// .getResultList(false);
// List<BizObject> boLCFIT = JBOFactory.createBizObjectQuery(LC_FUND_INCOME_TEMP.CLASS_NAME, "PLAN_ID=:PLAN_ID and pay_type='pay_type_out' and IS_FLOWING = '0' and ROLL_BACK='0' and PAY_STATUS is null").setParameter("PLAN_ID", planID)
// .getResultList(false);
// boUniteMoney.setAttributeValue("CHARGE_LIST", boLCFI.size()+boLCFIT.size()+1);
//安鹏要求改为当前时间
//boLFITOut.setAttributeValue("FACT_DATE", boLFPAMT.getAttribute("PLAN_DATE").getString());
// boUniteMoney.setAttributeValue("BANK", boLLI.getAttribute("LEASE_ACC_BANK").toString());
// boUniteMoney.setAttributeValue("ACCOUNT", boLLI.getAttribute("LEASE_ACC_NAME").toString());
// boUniteMoney.setAttributeValue("ACC_NUMBER", boLLI.getAttribute("LEASE_ACC_NUMBER").toString());
boUniteMoney.setAttributeValue("CLIENT_BANK", boLTI.getAttribute("CLIENT_ACC_BANK").toString());
boUniteMoney.setAttributeValue("CLIENT_ACCOUNT", boLTI.getAttribute("CLIENT_ACC_NAME").toString());
boUniteMoney.setAttributeValue("CLIENT_ACCNUMBER", boLTI.getAttribute("CLIENT_ACC_NUMBER").toString());
boUniteMoney.setAttributeValue("FACT_DATE", StringFunction.getToday());
boUniteMoney.setAttributeValue("ACCOUNTING_DATE", StringFunction.getToday());
BizObject boLCC = JBOFactory.createBizObjectQuery(LC_CALC_CONDITION.CLASS_NAME, "CONTRACT_ID=:CONTRACT_ID").setParameter("CONTRACT_ID",boLFPAMT.getAttribute("CONTRACT_ID").getString()).getSingleResult(false);
boUniteMoney.setAttributeValue("FACT_MONEY", boLCC.getAttribute("UNITE_MONEY").toString());
boUniteMoney.setAttributeValue("FEE_ADJUST", 0);
//boLFITOut.setAttributeValue("FACT_OBJECT", boLFPAMT.getAttribute("PAY_OBJ").getString());
// boUniteMoney.setAttributeValue("APPLYPAY_DATE", boLFP.getAttribute("PLAN_DATE").getString());
boUniteMoney.setAttributeValue("APPLY_PERSON", userId);
boUniteMoney.setAttributeValue("APPLY_DEPT", orgId);
boUniteMoney.setAttributeValue("MEMO", "联合出资差额放款");
boUniteMoney.setAttributeValue("ROLL_BACK", 0);
boUniteMoney.setAttributeValue("FLOWUNID", flowunid);
boUniteMoney.setAttributeValue("IS_FLOWING", 0);
bomLFIT.saveObject(boUniteMoney);
}
Map<String,String> fromCondtion = new HashMap<>();
fromCondtion.put("PAYMENT_NUMBER", boLFPAMT.getAttribute("PAYMENT_NUMBER").getString());
fromCondtion.put("FEE_TYPE", boLFPAMT.getAttribute("FEE_TYPE").getString());
@ -332,6 +387,7 @@ public class FundPayment {
boEquipAmt.setAttributeValue("FLOWUNID", flowunid);
boEquipAmt.setAttributeValue("IS_FLOWING", 0);
bomLFIT.saveObject(boEquipAmt);
Map<String,String> fromCondtion = new HashMap<>();
fromCondtion.put("PAYMENT_NUMBER", boLFPAMT.getAttribute("PAYMENT_NUMBER").getString());
fromCondtion.put("FEE_TYPE", boLFPAMT.getAttribute("FEE_TYPE").getString());

8
src_tenwa/com/tenwa/lease/flow/rent/rentreback/CopyLCSplittingPayTempToForml.java
View File

@ -4,6 +4,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import jbo.app.tenwa.calc.LC_EBANK_TEMP;
import jbo.app.tenwa.calc.LC_FUND_INCOME;
import jbo.app.tenwa.calc.LC_FUND_INCOME_TEMP;
import jbo.app.tenwa.calc.LC_RENT_INCOME;
@ -14,6 +15,7 @@ import jbo.com.tenwa.entity.comm.flow.LC_SPLITTING_PAY_TEMP;
import com.amarsoft.are.jbo.BizObject;
import com.amarsoft.are.jbo.BizObjectManager;
import com.amarsoft.are.jbo.JBOFactory;
import com.amarsoft.awe.util.SqlObject;
import com.amarsoft.awe.util.Transaction;
import com.tenwa.comm.util.jboutil.DataOperatorUtil;
import com.tenwa.flow.baseBussion.BaseBussiness;
@ -27,7 +29,11 @@ public class CopyLCSplittingPayTempToForml extends BaseBussiness{
Map<String,String>fromCondtion=new HashMap<String, String>();
fromCondtion.put("flowunid",this.getAttribute("FlowUnid").toString());
DataOperatorUtil.copyJBOSet(LC_SPLITTING_PAY_TEMP.CLASS_NAME, fromCondtion,LC_SPLITTING_PAY.CLASS_NAME, null, null, null,Sqlca);
List<BizObject> lspArray = JBOFactory.createBizObjectQuery(LC_SPLITTING_PAY_TEMP.CLASS_NAME, "FLOWUNID=:FLOWUNID").setParameter("FLOWUNID", this.getAttribute("FlowUnid").toString()).getResultList(false);
for(BizObject bo: lspArray){
SqlObject so = new SqlObject("update LC_RENT_PLAN set splitting_status='Y' where id='"+bo.getAttribute("plan_id").toString()+"'");
Sqlca.executeSQL(so);
}
String sMessage="true";
return sMessage;
}

28
src_tenwa/com/tenwa/lease/flow/rent/rentreback/OtherPayMethod.java
View File

@ -1,6 +1,7 @@
package com.tenwa.lease.flow.rent.rentreback;
import java.math.BigDecimal;
import java.sql.SQLException;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.HashMap;
@ -69,6 +70,7 @@ public class OtherPayMethod {
bolspt.setAttributeValue("flowunid", flowunid);
bolspt.setAttributeValue("inputtime", StringFunction.getTodayNow());
bomLspt.saveObject(bolspt);
changeSplittingStatus(tx,plan_id,"0");
} catch (JBOException e) {
e.printStackTrace();
return "²åÈëÁÙʱ±íʧ°Ü";
@ -78,7 +80,31 @@ public class OtherPayMethod {
}
return "success";
}
/**
* 更改分润支付状态
* @param tx
* @param planID
* @param status 已支付为Y，流程中为0，未支付为null
* @return
*/
public String changeSplittingStatus(JBOTransaction tx,String planID,String status){
SqlObject so;
try {
so = new SqlObject("update LC_RENT_PLAN set splitting_status='"+status+"' where id='"+planID+"'");
Transaction.createTransaction(tx).executeSQL(so);
} catch (Exception e) {
e.printStackTrace();
return "Error";
}
return "Success";
}
public String changeSplittingStatusBatch(JBOTransaction tx){
String[] planID = planIDs.split("@");
for(String plan_id:planID){
changeSplittingStatus(tx,plan_id,"N");
}
return "success";
}
public String createRebackList(JBOTransaction tx){
String idArray[] = ids.split("@");
String m_Money[] = mayopeMoney.split("@");