From d39e4f7d839167c16425086dfa2f8747bccfdff9 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期四, 05 十一月 2026 17:39:01 +0800
Subject: [PATCH] feat: 打通销售采购财务闭环并完成累计业务优化

---
 yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/finance/ErpFinancePaymentMapper.java |   74 ++++++++++++++++++++++++++++++++++++-
 1 files changed, 72 insertions(+), 2 deletions(-)

diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/finance/ErpFinancePaymentMapper.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/finance/ErpFinancePaymentMapper.java
index 5ad0ccc..84657d2 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/finance/ErpFinancePaymentMapper.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/finance/ErpFinancePaymentMapper.java
@@ -1,18 +1,31 @@
 package cn.iocoder.yudao.module.erp.dal.mysql.finance;
 
+import cn.hutool.core.collection.CollUtil;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.framework.mybatis.core.query.MPJLambdaWrapperX;
 import cn.iocoder.yudao.module.erp.controller.admin.finance.vo.payment.ErpFinancePaymentPageReqVO;
 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.enums.ErpAuditStatus;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import org.apache.ibatis.annotations.Mapper;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
+import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertMap;
 
 /**
  * ERP 浠樻鍗� Mapper
  *
- * @author 鑺嬮亾婧愮爜
+ * @author 瓒呯骇绠$悊鍛�
  */
 @Mapper
 public interface ErpFinancePaymentMapper extends BaseMapperX<ErpFinancePaymentDO> {
@@ -24,9 +37,11 @@
                 .eqIfPresent(ErpFinancePaymentDO::getSupplierId, reqVO.getSupplierId())
                 .eqIfPresent(ErpFinancePaymentDO::getCreator, reqVO.getCreator())
                 .eqIfPresent(ErpFinancePaymentDO::getFinanceUserId, reqVO.getFinanceUserId())
-                .eqIfPresent(ErpFinancePaymentDO::getAccountId, reqVO.getAccountId())
+                .likeIfPresent(ErpFinancePaymentDO::getAccountName, reqVO.getAccountName())
                 .eqIfPresent(ErpFinancePaymentDO::getStatus, reqVO.getStatus())
                 .likeIfPresent(ErpFinancePaymentDO::getRemark, reqVO.getRemark())
+                .eqIfPresent(ErpFinancePaymentDO::getSourceType, reqVO.getSourceType())
+                .likeIfPresent(ErpFinancePaymentDO::getSourceNo, reqVO.getSourceNo())
                 .orderByDesc(ErpFinancePaymentDO::getId);
         if (reqVO.getBizNo() != null) {
             query.leftJoin(ErpFinancePaymentItemDO.class, ErpFinancePaymentItemDO::getPaymentId, ErpFinancePaymentDO::getId)
@@ -45,4 +60,59 @@
         return selectOne(ErpFinancePaymentDO::getNo, no);
     }
 
+    default List<ErpFinancePaymentDO> selectListByInvoiceIdAndStatus(Long invoiceId, Collection<Integer> statuses) {
+        return selectList(new LambdaQueryWrapperX<ErpFinancePaymentDO>()
+                .eq(ErpFinancePaymentDO::getInvoiceId, invoiceId)
+                .in(ErpFinancePaymentDO::getStatus, statuses));
+    }
+
+    /**
+     * 缁熻姣忓紶鏉ョエ宸蹭粯娆鹃噾棰濓紙鏈鏍� + 瀹℃壒涓� + 宸插鏍革紝鎺掗櫎浣滃簾锛夛紝鐢ㄤ簬鏍¢獙鍓╀綑鍙粯閲戦
+     *
+     * @param invoiceIds 鏉ョエ缂栧彿鍒楄〃
+     * @return key 涓烘潵绁ㄧ紪鍙凤紝value 涓哄凡浠樻閲戦
+     */
+    default Map<Long, BigDecimal> selectPaymentPriceMapByInvoiceId(Collection<Long> invoiceIds) {
+        if (CollUtil.isEmpty(invoiceIds)) {
+            return Collections.emptyMap();
+        }
+        // SQL sum 鏌ヨ
+        List<Map<String, Object>> result = selectMaps(new QueryWrapper<ErpFinancePaymentDO>()
+                .select("invoice_id, SUM(payment_price) AS total_payment_price")
+                .in("status", ErpAuditStatus.PROCESS.getStatus(), // 鏈鏍� + 瀹℃壒涓� + 宸插鏍�
+                        ErpAuditStatus.APPROVING.getStatus(), ErpAuditStatus.APPROVE.getStatus())
+                .groupBy("invoice_id")
+                .in("invoice_id", invoiceIds));
+        // 鑾峰緱閲戦
+        return convertMap(result, obj -> (Long) obj.get("invoice_id"), obj -> (BigDecimal) obj.get("total_payment_price"));
+    }
+
+    /**
+     * 鎸変緵搴斿晢涓庝粯娆炬椂闂磋寖鍥存煡璇粯娆惧崟锛堜緵搴斿晢寰�鏉ワ級
+     */
+    default List<ErpFinancePaymentDO> selectListBySupplierIdAndPaymentTimeBetween(Long supplierId,
+                                                                                 LocalDateTime beginTime,
+                                                                                 LocalDateTime endTime,
+                                                                                 Collection<Integer> statuses) {
+        return selectList(new LambdaQueryWrapperX<ErpFinancePaymentDO>()
+                .eq(ErpFinancePaymentDO::getSupplierId, supplierId)
+                .geIfPresent(ErpFinancePaymentDO::getPaymentTime, beginTime)
+                .leIfPresent(ErpFinancePaymentDO::getPaymentTime, endTime)
+                .inIfPresent(ErpFinancePaymentDO::getStatus, statuses)
+                .orderByAsc(ErpFinancePaymentDO::getPaymentTime)
+                .orderByAsc(ErpFinancePaymentDO::getId));
+    }
+
+    /**
+     * 鎸変粯娆炬椂闂磋寖鍥存煡璇㈠叏閮ㄤ緵搴斿晢鐨勪粯娆惧崟锛堜緵搴斿晢寰�鏉ユ眹鎬伙級
+     */
+    default List<ErpFinancePaymentDO> selectListByPaymentTimeBetween(LocalDateTime beginTime,
+                                                                     LocalDateTime endTime,
+                                                                     Collection<Integer> statuses) {
+        return selectList(new LambdaQueryWrapperX<ErpFinancePaymentDO>()
+                .geIfPresent(ErpFinancePaymentDO::getPaymentTime, beginTime)
+                .leIfPresent(ErpFinancePaymentDO::getPaymentTime, endTime)
+                .inIfPresent(ErpFinancePaymentDO::getStatus, statuses));
+    }
+
 }
\ No newline at end of file

--
Gitblit v1.9.3