kaifabu/AssetsTenantServer
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

增加支付回调的逻辑

Browse Source
This commit is contained in:
RuicyWu
2026-06-10 10:36:43 +08:00
parent ac32c13ad6
commit 2022f778d1
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/seeyon/apps/assetstenant/bill/BillService.java
View File

@@ -309,7 +309,7 @@ public class BillService {
subTableRowData.put("账单-资产编号", fieldsMap.get("资产编号")); subTableRowData.put("账单-资产编号", fieldsMap.get("资产编号"));
subTableRowData.put("账单-资产名称", fieldsMap.get("资产名称")); subTableRowData.put("账单-资产名称", fieldsMap.get("资产名称"));
FormFieldBean formFieldBean = subTableBean.getFieldBeanByDisplay("收款结果"); FormFieldBean formFieldBean = subTableBean.getFieldBeanByDisplay("收款结果");
subTableRowData.put("账单-收款结果", EnumMapUtils.getEnumItemValueByEnumId("已结清",formFieldBean.getEnumId())); subTableRowData.put("收款结果", EnumMapUtils.getEnumItemValueByEnumId("已结清",formFieldBean.getEnumId()));
subFormDataList.add(subTableRowData); subFormDataList.add(subTableRowData);
// 9. 获取合同信息 + 非空校验 // 9. 获取合同信息 + 非空校验
String contractNo = (String) fieldsMap.get("合同编号"); String contractNo = (String) fieldsMap.get("合同编号");
@@ -338,7 +338,7 @@ public class BillService {
} }
// 11. 组装主表数据（线程安全日期） // 11. 组装主表数据（线程安全日期）
TableContext receivePayFlowTableContext = FormTableExecutor.master(templateCode); TableContext receivePayFlowTableContext = FormTableExecutor.master(templateCode);
mainData.put("选择收款项", EnumMapUtils.getEnumItemValueByDisplayValue(receivePayFlowTableContext.getTableBean(), "收款项", "租金")); mainData.put("选择收款项", EnumMapUtils.getEnumItemValueByDisplayValue(receivePayFlowTableContext.getTableBean(), "选择收款项", "租金"));
mainData.put("经办日期", LocalDate.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))); mainData.put("经办日期", LocalDate.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
mainData.put("合同编号", contractNo); mainData.put("合同编号", contractNo);
mainData.put("本次收款金额", actualReceipts); mainData.put("本次收款金额", actualReceipts);

4
src/main/java/com/seeyon/apps/assetstenant/bill/FeeRecordService.java
View File

@@ -94,12 +94,10 @@ public class FeeRecordService {
} }
public void payCallBack(String billNo, String bizType, String payDate) throws Exception { public void payCallBack(String billNo, String bizType, String payDate) throws Exception {
if("rent".equals(bizType)) { if("rent".equals(bizType) || "margin".equals(bizType)) {
billService.payCallBack(billNo,payDate); billService.payCallBack(billNo,payDate);
}else if("wae".equals(bizType)){ }else if("wae".equals(bizType)){
// waeBillService.payCallBack(billNo,payDate); // waeBillService.payCallBack(billNo,payDate);
}else if("margin".equals(bizType)){
} }
} }