From 8e503e2e7a28d8aaaa59b47023aad732f97105dd Mon Sep 17 00:00:00 2001
From: yeg <1347747024@qq.com>
Date: 星期五, 18 九月 2026 12:56:22 +0800
Subject: [PATCH] feat(settlement): 结算记录只查通道侧收款能力正常的商户，并支持按商家/电话/类型/状态筛选
---
talent-card-server/src/main/java/com/talentcard/server/business/admin/AdminManagementController.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/talent-card-server/src/main/java/com/talentcard/server/business/admin/AdminManagementController.java b/talent-card-server/src/main/java/com/talentcard/server/business/admin/AdminManagementController.java
index b2e5cb6..d69efa4 100644
--- a/talent-card-server/src/main/java/com/talentcard/server/business/admin/AdminManagementController.java
+++ b/talent-card-server/src/main/java/com/talentcard/server/business/admin/AdminManagementController.java
@@ -40,12 +40,14 @@
/**
* 结算记录：向斗拱查询指定区间的真实结算流水，用于监控每天自动结算了多少到银行卡。
* 日期格式 yyyyMMdd，默认最近 30 天；通道单页上限 50，默认值必须落在上限内。
+ * 商家、联系电话、商家类型按本地商户字段先筛掉不匹配的商户（顺带少打几次通道），
+ * 状态是通道的流水结算状态（S 已结算 / F 失败 / P 处理中）。
*/
- @GetMapping("/merchant-settlement/settlements") public ApiResponse<Map<String,Object>> settlements(@RequestParam(required = false) String beginDate, @RequestParam(required = false) String endDate, @RequestParam(defaultValue = "50") int size) {
+ @GetMapping("/merchant-settlement/settlements") public ApiResponse<Map<String,Object>> settlements(@RequestParam(required = false) String beginDate, @RequestParam(required = false) String endDate, @RequestParam(defaultValue = "50") int size, @RequestParam(required = false) String merchantName, @RequestParam(required = false) String contactMobile, @RequestParam(required = false) String merchantType, @RequestParam(required = false) String status) {
java.time.LocalDate today = java.time.LocalDate.now();
String end = (endDate == null || endDate.isBlank()) ? today.format(java.time.format.DateTimeFormatter.BASIC_ISO_DATE) : endDate.trim();
String begin = (beginDate == null || beginDate.isBlank()) ? today.minusDays(30).format(java.time.format.DateTimeFormatter.BASIC_ISO_DATE) : beginDate.trim();
- return ApiResponse.success(settlementService.settlements(begin, end, size));
+ return ApiResponse.success(settlementService.settlements(begin, end, size, merchantName, contactMobile, merchantType, status));
}
@GetMapping("/payment-reconciliation/issues") public ApiResponse<com.talentcard.server.business.PageResult<Map<String,Object>>> reconciliationIssues(@RequestParam(defaultValue = "open") String status, @RequestParam(defaultValue = "1") int page, @RequestParam(defaultValue = "20") int size) { return ApiResponse.success(reconciliationService.issues(status, page, size)); }
@PatchMapping("/payment-reconciliation/issues/{id}") public ApiResponse<Map<String,Object>> closeReconciliationIssue(@PathVariable Long id, @RequestBody Map<String,String> body) { return ApiResponse.success(reconciliationService.close(id, body.get("status"), body.get("operator"))); }
--
Gitblit v1.7.1