From 9fceeaad9af96bc58ba714560814c6e94f8af406 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期一, 10 八月 2026 17:13:01 +0800
Subject: [PATCH] feat(crm): 增强合同开票与回款功能
---
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/finance/ErpFinancePaymentController.java | 30 +++++++++++++++++++++++++++---
1 files changed, 27 insertions(+), 3 deletions(-)
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/finance/ErpFinancePaymentController.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/finance/ErpFinancePaymentController.java
index 718419a..21fe41e 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/finance/ErpFinancePaymentController.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/finance/ErpFinancePaymentController.java
@@ -12,13 +12,16 @@
import cn.iocoder.yudao.module.erp.controller.admin.finance.vo.payment.ErpFinancePaymentPageReqVO;
import cn.iocoder.yudao.module.erp.controller.admin.finance.vo.payment.ErpFinancePaymentRespVO;
import cn.iocoder.yudao.module.erp.controller.admin.finance.vo.payment.ErpFinancePaymentSaveReqVO;
+import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.invoice.ErpPurchaseInvoiceRespVO;
import cn.iocoder.yudao.module.erp.dal.dataobject.finance.ErpAccountDO;
import cn.iocoder.yudao.module.erp.dal.dataobject.finance.ErpFinancePaymentDO;
import cn.iocoder.yudao.module.erp.dal.dataobject.finance.ErpFinancePaymentItemDO;
+import cn.iocoder.yudao.module.erp.dal.dataobject.purchase.ErpPurchaseInvoiceDO;
import cn.iocoder.yudao.module.srm.api.supplier.SrmSupplierApi;
import cn.iocoder.yudao.module.srm.api.supplier.dto.SrmSupplierRespDTO;
import cn.iocoder.yudao.module.erp.service.finance.ErpAccountService;
import cn.iocoder.yudao.module.erp.service.finance.ErpFinancePaymentService;
+import cn.iocoder.yudao.module.erp.service.purchase.ErpPurchaseInvoiceService;
import cn.iocoder.yudao.module.system.api.storage.StorageAttachmentApi;
import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
@@ -53,6 +56,8 @@
private SrmSupplierApi srmSupplierApi;
@Resource
private ErpAccountService accountService;
+ @Resource
+ private ErpPurchaseInvoiceService invoiceService;
@Resource
private AdminUserApi adminUserApi;
@@ -102,9 +107,23 @@
return success(null);
}
List<ErpFinancePaymentItemDO> paymentItemList = financePaymentService.getFinancePaymentItemListByPaymentId(id);
- return success(BeanUtils.toBean(payment, ErpFinancePaymentRespVO.class, financePaymentVO ->
- financePaymentVO.setItems(BeanUtils.toBean(paymentItemList, ErpFinancePaymentRespVO.Item.class))
- .setAttachmentList(storageAttachmentApi.listAttachments("erp_finance_payment", id))));
+ return success(buildFinancePaymentVO(payment, paymentItemList));
+ }
+
+ private ErpFinancePaymentRespVO buildFinancePaymentVO(ErpFinancePaymentDO payment,
+ List<ErpFinancePaymentItemDO> paymentItemList) {
+ ErpPurchaseInvoiceRespVO invoiceVO = null;
+ if (payment.getInvoiceId() != null) {
+ ErpPurchaseInvoiceDO invoice = invoiceService.getPurchaseInvoice(payment.getInvoiceId());
+ if (invoice != null) {
+ invoiceVO = BeanUtils.toBean(invoice, ErpPurchaseInvoiceRespVO.class);
+ }
+ }
+ ErpPurchaseInvoiceRespVO invoiceFinal = invoiceVO;
+ return BeanUtils.toBean(payment, ErpFinancePaymentRespVO.class, financePaymentVO ->
+ financePaymentVO.setInvoice(invoiceFinal)
+ .setItems(BeanUtils.toBean(paymentItemList, ErpFinancePaymentRespVO.Item.class))
+ .setAttachmentList(storageAttachmentApi.listAttachments("erp_finance_payment", payment.getId())));
}
@GetMapping("/page")
@@ -145,6 +164,9 @@
// 1.4 绠＄悊鍛樹俊鎭�
Map<Long, AdminUserRespDTO> userMap = adminUserApi.getUserMap(convertListByFlatMap(pageResult.getList(),
contact -> Stream.of(NumberUtils.parseLong(contact.getCreator()), contact.getFinanceUserId())));
+ // 1.5 鏉ョエ淇℃伅
+ Map<Long, ErpPurchaseInvoiceDO> invoiceMap = invoiceService.getPurchaseInvoiceMap(
+ convertSet(pageResult.getList(), ErpFinancePaymentDO::getInvoiceId));
// 2. 寮�濮嬫嫾鎺�
return BeanUtils.toBean(pageResult, ErpFinancePaymentRespVO.class, payment -> {
payment.setItems(BeanUtils.toBean(financePaymentItemMap.get(payment.getId()), ErpFinancePaymentRespVO.Item.class));
@@ -152,6 +174,8 @@
MapUtils.findAndThen(accountMap, payment.getAccountId(), account -> payment.setAccountName(account.getName()));
MapUtils.findAndThen(userMap, Long.parseLong(payment.getCreator()), user -> payment.setCreatorName(user.getNickname()));
MapUtils.findAndThen(userMap, payment.getFinanceUserId(), user -> payment.setFinanceUserName(user.getNickname()));
+ MapUtils.findAndThen(invoiceMap, payment.getInvoiceId(), invoice ->
+ payment.setInvoice(BeanUtils.toBean(invoice, ErpPurchaseInvoiceRespVO.class)));
});
}
--
Gitblit v1.9.3