From 9cf42b4105a5630755d4fccd4726515b53ff97a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=B3=89=E4=BD=B3?= <1107186916@qq.com>
Date: Tue, 29 Sep 2026 10:28:27 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=94=B6=E6=AC=BE=E6=B5=81=E6=B0=B4?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E8=A1=A5=E5=85=85=E6=94=B6=E6=AC=BE=E9=87=91?=
 =?UTF-8?q?=E9=A2=9D=E5=8C=BA=E9=97=B4=E4=B8=8E=E8=AE=A4=E9=A2=86=E4=BA=BA?=
 =?UTF-8?q?=E7=AD=9B=E9=80=89=EF=BC=88=E8=AE=A4=E9=A2=86=E4=BA=BA=E7=BB=8F?=
 =?UTF-8?q?=E8=AE=A4=E9=A2=86=E8=AE=B0=E5=BD=95=E5=8F=82=E6=95=B0=E5=8C=96?=
 =?UTF-8?q?=E4=B8=A4=E6=AE=B5=E6=9F=A5=E8=AF=A2=E8=BF=87=E6=BB=A4=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../transport/pojo/vo/ReceiptFlowVO.java      | 10 +++++++++
 .../service/impl/ReceiptFlowServiceImpl.java  | 21 +++++++++++++++++++
 2 files changed, 31 insertions(+)

diff --git a/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/ReceiptFlowVO.java b/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/ReceiptFlowVO.java
index 585ba107..f32a9491 100644
--- a/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/ReceiptFlowVO.java
+++ b/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/ReceiptFlowVO.java
@@ -79,6 +79,16 @@ public class ReceiptFlowVO extends KingdeeReceiptFlow {
 	@TableField(exist = false)
 	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
 	private LocalDateTime transactionEndTime;
+	/**
+	 * 收款金额区间-最小值（查询条件）
+	 */
+	@TableField(exist = false)
+	private BigDecimal receiptAmountStart;
+	/**
+	 * 收款金额区间-最大值（查询条件）
+	 */
+	@TableField(exist = false)
+	private BigDecimal receiptAmountEnd;
 	@TableField(exist = false)
 	private List<ReceiptFlowRecord> claimRecords = new ArrayList<>();
 }
diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/ReceiptFlowServiceImpl.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/ReceiptFlowServiceImpl.java
index ee987b62..dc463142 100644
--- a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/ReceiptFlowServiceImpl.java
+++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/ReceiptFlowServiceImpl.java
@@ -144,6 +144,10 @@ public class ReceiptFlowServiceImpl extends BaseServiceImpl<KingdeeReceiptFlowMa
 				query.getPushStatus())
 			.eq(Func.isNotEmpty(query.getKingdeeBillStatus()), KingdeeReceiptFlow::getKingdeeBillStatus,
 				query.getKingdeeBillStatus())
+			.ge(query.getReceiptAmountStart() != null, KingdeeReceiptFlow::getReceiptAmount,
+				query.getReceiptAmountStart())
+			.le(query.getReceiptAmountEnd() != null, KingdeeReceiptFlow::getReceiptAmount,
+				query.getReceiptAmountEnd())
 			.ge(query.getTransactionStartTime() != null, KingdeeReceiptFlow::getTransactionTime,
 				query.getTransactionStartTime())
 			.le(query.getTransactionEndTime() != null, KingdeeReceiptFlow::getTransactionTime,
@@ -151,6 +155,23 @@ public class ReceiptFlowServiceImpl extends BaseServiceImpl<KingdeeReceiptFlowMa
 			.eq(KingdeeReceiptFlow::getStatus, 1)
 			.orderByDesc(KingdeeReceiptFlow::getTransactionTime)
 			.orderByDesc(KingdeeReceiptFlow::getCreateTime);
+		// 认领人筛选：先查该认领人有效认领的流水id（参数化查询，避免拼接 SQL），空则直接返回空页
+		if (Func.isNotEmpty(query.getClaimerName())) {
+			List<Long> claimedFlowIds = claimMapper.selectList(Wrappers.<ReceiptClaim>lambdaQuery()
+					.select(ReceiptClaim::getReceiptFlowId)
+					.like(ReceiptClaim::getClaimerName, query.getClaimerName())
+					.eq(ReceiptClaim::getClaimStatus, CLAIMED)).stream()
+				.map(ReceiptClaim::getReceiptFlowId)
+				.filter(Objects::nonNull)
+				.distinct()
+				.toList();
+			if (claimedFlowIds.isEmpty()) {
+				page.setRecords(List.of());
+				page.setTotal(0);
+				return page.convert(ReceiptFlowWrapper.build()::entityVO);
+			}
+			wrapper.in(KingdeeReceiptFlow::getId, claimedFlowIds);
+		}
 		return page(page, wrapper).convert(ReceiptFlowWrapper.build()::entityVO);
 	}