From ccff3913e0e6854a3811788d5d41614463110095 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期三, 04 十一月 2026 16:44:53 +0800
Subject: [PATCH] feat(crm): 开票管理支持关联销售订单,开票金额按订单未开票金额校验
---
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/invoice/CrmInvoiceMapper.java | 21 +++++++++++++++++++--
1 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/invoice/CrmInvoiceMapper.java b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/invoice/CrmInvoiceMapper.java
index a5a814f..acc9eeb 100644
--- a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/invoice/CrmInvoiceMapper.java
+++ b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/invoice/CrmInvoiceMapper.java
@@ -51,6 +51,7 @@
query.selectAll(CrmInvoiceDO.class)
.eqIfPresent(CrmInvoiceDO::getNo, pageReqVO.getNo())
.eqIfPresent(CrmInvoiceDO::getContractId, pageReqVO.getContractId())
+ .eqIfPresent(CrmInvoiceDO::getSaleOrderId, pageReqVO.getSaleOrderId())
.eqIfPresent(CrmInvoiceDO::getAuditStatus, pageReqVO.getAuditStatus())
.orderByDesc(CrmInvoiceDO::getId);
return selectJoinPage(pageReqVO, CrmInvoiceDO.class, query);
@@ -72,14 +73,21 @@
.in(CrmInvoiceDO::getAuditStatus, auditStatuses));
}
+ default List<CrmInvoiceDO> selectListBySaleOrderIdAndStatus(Long saleOrderId, Collection<Integer> auditStatuses) {
+ return selectList(new LambdaQueryWrapperX<CrmInvoiceDO>()
+ .eq(CrmInvoiceDO::getSaleOrderId, saleOrderId)
+ .in(CrmInvoiceDO::getAuditStatus, auditStatuses));
+ }
+
default Map<Long, BigDecimal> selectInvoicePriceMapByContractId(Collection<Long> contractIds) {
if (CollUtil.isEmpty(contractIds)) {
return Collections.emptyMap();
}
- // SQL sum 鏌ヨ
+ // SQL sum 鏌ヨ锛堝鎵归�氳繃 + 瀹℃壒涓紝涓庡紑绁ㄩ槻瓒呮牎楠屽彛寰勪竴鑷达級
List<Map<String, Object>> result = selectMaps(new QueryWrapper<CrmInvoiceDO>()
.select("contract_id, SUM(price) AS total_price")
- .eq("audit_status", CrmAuditStatusEnum.APPROVE.getStatus())
+ .in("audit_status", CrmAuditStatusEnum.APPROVE.getStatus(),
+ CrmAuditStatusEnum.PROCESS.getStatus())
.groupBy("contract_id")
.in("contract_id", contractIds));
// 鑾峰緱閲戦
@@ -90,4 +98,13 @@
return selectCount(CrmInvoiceDO::getContractId, contractId);
}
+ /**
+ * 鏌ヨ鍚堝悓涓嬬殑鍏ㄩ儴寮�绁紙瀵煎叆鍘婚噸鐢級
+ */
+ default List<CrmInvoiceDO> selectListByContractId(Long contractId) {
+ return selectList(new LambdaQueryWrapperX<CrmInvoiceDO>()
+ .eq(CrmInvoiceDO::getContractId, contractId)
+ .orderByAsc(CrmInvoiceDO::getId));
+ }
+
}
--
Gitblit v1.9.3