1.实际付款流程添加放款方式(线上付款,线下付款,无现金支出)。

2.线下不走付款接口,默认放款成功。
3.无现金支付不走付款接口,默认放款成功,结算方式改为无现金支出。
This commit is contained in:
zhangbb 2019-01-11 11:21:44 +08:00
parent cb28045b47
commit c9124fff00
5 changed files with 24 additions and 5 deletions

View File

@ -14,6 +14,7 @@
doTemp.setDataQueryClass("com.tenwa.flow.flowHistory.FlowDataListHistory");
} */
String IS_FLOWING = Sqlca.getString(new SqlObject("select IS_FLOWING from lc_fund_income_temp where flowunid='"+flowunid+"'"));
String payType = Sqlca.getString(new SqlObject("SELECT payType FROM LC_FUND_INCOME_TEMP_HXM WHERE flowunid='"+flowunid+"'"));
doTemp.appendJboWhere("AND O.IS_FLOWING='"+IS_FLOWING+"'");
ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request);
dwTemp.Style="1"; //--设置为Grid风格--
@ -34,7 +35,7 @@
//0、是否展示 1、 权限控制 2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码 6、 7、 8、 9、图标CSS层叠样式 10、风格
String[][] sButtons = null;
if("ReadOnly".equals(rightType)){
if("ReadOnly".equals(rightType)||"0020".equals(payType)||"0030".equals(payType)){
sButtons = new String[][]{
};
}else if("0020".equals(phaseNo)){

View File

@ -41,15 +41,16 @@
return;
}
var contractIds = "";
var payType = getItemValue(0,rows[0],"payType");
for(var i in rows){
if(getItemValue(0,rows[i],"payType")!=getItemValue(0,rows[0],"payType")){
if(getItemValue(0,rows[i],"payType")!=payType){
AsDebug.showMessage("提示","每次只能生成放款方式相同的合同!","","",true);
return;
}
contractIds += "@"+getItemValue(0,rows[i],"ID");
}
contractIds = contractIds.substring(1);
var result = RunJavaMethodTrans("com.tenwa.flow.fund.fundcollection.FundIncomeMethod","createActualPayment","contractIds="+contractIds+",flowunid=<%=flowunid%>,userId=<%=CurUser.getUserID()%>,orgId=<%=CurUser.getOrgID()%>");
var result = RunJavaMethodTrans("com.tenwa.flow.fund.fundcollection.FundIncomeMethod","createActualPayment","contractIds="+contractIds+",flowunid=<%=flowunid%>,userId=<%=CurUser.getUserID()%>,orgId=<%=CurUser.getOrgID()%>"+",payType="+payType);
if("SUCCESS" == result){
AsDebug.showMessage("提示","操作成功!","","",true);
reloadSelf();

View File

@ -3225,7 +3225,7 @@
<attribute name="CLIENT_BANK" label="对方银行" type="STRING"/>
<attribute name="CLIENT_ACCOUNT" label="对方帐户" type="STRING"/>
<attribute name="CLIENT_ACCNUMBER" label="对方帐号" type="STRING"/>
<attribute name="payType" label="付款方式" type="STRING"/>
</attributes>
<manager>
<managerProperties>

View File

@ -3916,7 +3916,8 @@
<attribute name="REQSTS" label="REQSTS" type="STRING"/>
<attribute name="RTNFLG" label="RTNFLG" type="STRING"/>
<attribute name="ERRTXT" label="ERRTXT" type="STRING"/>
<attribute name="IS_FLOWING" label="IS_FLOWING" type="STRING"/>
<attribute name="IS_FLOWING" label="IS_FLOWING" type="STRING"/>
<attribute name="payType" label="付款类型" type="STRING"/>
</attributes>
<manager>
<managerProperties>

View File

@ -42,6 +42,7 @@ public class FundIncomeMethod {
private String userId;
private String orgId;
private String status;
private String payType;
public String getIsChanged() {
return isChanged;
@ -154,6 +155,13 @@ public class FundIncomeMethod {
public void setStatus(String status) {
this.status = status;
}
public String getPayType() {
return payType;
}
public void setPayType(String payType) {
this.payType = payType;
}
public String getContactId(JBOTransaction tx) throws SQLException, Exception{
SqlObject s = new SqlObject("select customertype,contract_number,customer_id,"
@ -374,6 +382,12 @@ public class FundIncomeMethod {
otherProperty.put("ACC_NUMBER", boOA.getAttribute("ACC_NUMBER").getString());
otherProperty.put("INCOME_ID", bo.getAttribute("ID").getString());
otherProperty.put(LC_FUND_INCOME.EBANK_STATUS, "03");
if("0020".equals(payType)||"0030".equals(payType)){
otherProperty.put(LC_FUND_INCOME.EBANK_STATUS, "05");
}
if("0030".equals(payType)){
otherProperty.put(LC_FUND_INCOME.SETTLE_METHOD, "settlemethod13");
}
otherProperty.put("FACT_DATE", StringFunction.getToday());
DataOperatorUtil.copySingleJBO(LC_FUND_INCOME.CLASS_NAME, fromCondition,LC_FUND_INCOME_TEMP.CLASS_NAME, null, otherProperty,tx);
}
@ -433,4 +447,6 @@ public class FundIncomeMethod {
// double CerificationMoney= Double.valueOf(corpus)+Double.valueOf(interest)+Double.valueOf(penalty);
return c.doubleValue()+"";
}
}