From 4635770544e2d57416ad88a8983ee293919f5fec Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期一, 25 五月 2026 09:25:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/java/com/ruoyi/ai/tools/SalesAgentTools.java | 114 --------------------------------------------------------
1 files changed, 1 insertions(+), 113 deletions(-)
diff --git a/src/main/java/com/ruoyi/ai/tools/SalesAgentTools.java b/src/main/java/com/ruoyi/ai/tools/SalesAgentTools.java
index 8a63db7..0f7e586 100644
--- a/src/main/java/com/ruoyi/ai/tools/SalesAgentTools.java
+++ b/src/main/java/com/ruoyi/ai/tools/SalesAgentTools.java
@@ -121,60 +121,6 @@
@P(value = "杩斿洖鏉℃暟锛岄粯璁�10锛屾渶澶�30", required = false) Integer limit) {
LoginUser loginUser = currentLoginUser(memoryId);
DateRange range = resolveDateRange(startDate, endDate, null);
- /*
- List<AccountSalesCollection> collections = queryCollections(loginUser, range);
- if (collections.isEmpty()) {
- return jsonResponse(true, "sales_customer_interaction_list", "閺堫亝鐓＄拠銏犲煂鐎广垺鍩涘鈧弶銉唶瑜�?, rangeSummary(range, 0, keyword), Map.of("items", List.of()), Map.of());
- }
-
- Map<Integer, Set<Long>> ledgerIdsByCollectionId = mapCollectionLedgerIds(loginUser, collections);
- Set<Long> ledgerIds = ledgerIdsByCollectionId.values().stream()
- .flatMap(Collection::stream)
- .collect(Collectors.toSet());
- Map<Long, SalesLedger> ledgerMap = defaultList(salesLedgerMapper.selectBatchIds(ledgerIds)).stream()
- .filter(ledger -> tenantMatched(ledger.getTenantId(), loginUser.getTenantId()))
- .collect(Collectors.toMap(SalesLedger::getId, item -> item, (a, b) -> a, LinkedHashMap::new));
-
- int finalLimit = normalizeLimit(limit);
- List<Map<String, Object>> items = new ArrayList<>();
- for (AccountSalesCollection collection : collections) {
- Set<Long> relatedLedgerIds = ledgerIdsByCollectionId.get(collection.getId());
- if (relatedLedgerIds == null || relatedLedgerIds.isEmpty()) {
- if (!matchInteractionKeyword(collection, null, keyword)) {
- continue;
- }
- items.add(toInteractionItem(collection, null));
- if (items.size() >= finalLimit) {
- break;
- }
- continue;
- }
- for (Long ledgerId : relatedLedgerIds) {
- SalesLedger ledger = ledgerMap.get(ledgerId);
- if (ledger == null || !matchInteractionKeyword(collection, ledger, keyword)) {
- continue;
- }
- items.add(toInteractionItem(collection, ledger));
- if (items.size() >= finalLimit) {
- break;
- }
- }
- if (items.size() >= finalLimit) {
- break;
- }
- }
-
- BigDecimal totalReceiptAmount = items.stream()
- .map(item -> asBigDecimal(item.get("receiptPaymentAmount")))
- .reduce(BigDecimal.ZERO, BigDecimal::add);
- Map<String, Object> summary = rangeSummary(range, items.size(), keyword);
- summary.put("totalReceiptAmount", totalReceiptAmount);
- summary.put("customerCount", items.stream()
- .map(item -> String.valueOf(item.get("customerName")))
- .filter(StringUtils::hasText)
- .distinct()
- .count());
- */
LambdaQueryWrapper<SalesQuotation> wrapper = new LambdaQueryWrapper<>();
applyTenantFilter(wrapper, loginUser.getTenantId(), SalesQuotation::getTenantId);
applyDeptFilter(wrapper, loginUser.getCurrentDeptId(), SalesQuotation::getDeptId);
@@ -398,59 +344,7 @@
.filter(StringUtils::hasText)
.distinct()
.count());
- if (summary.size() >= 0) {
- return jsonResponse(true, "sales_customer_interaction_list", "ok", summary, Map.of("items", items), Map.of());
- }
-// LambdaQueryWrapper<ReceiptPayment> wrapper = new LambdaQueryWrapper<>();
-// applyTenantFilter(wrapper, loginUser.getTenantId(), ReceiptPayment::getTenantId);
-// applyDeptFilter(wrapper, loginUser.getCurrentDeptId(), ReceiptPayment::getDeptId);
-// wrapper.ge(ReceiptPayment::getReceiptPaymentDate, range.start())
-// .le(ReceiptPayment::getReceiptPaymentDate, range.end())
-// .orderByDesc(ReceiptPayment::getReceiptPaymentDate, ReceiptPayment::getId);
-// List<ReceiptPayment> payments = defaultList(receiptPaymentMapper.selectList(wrapper));
-// if (payments.isEmpty()) {
-// return jsonResponse(true, "sales_customer_interaction_list", "鏈煡璇㈠埌瀹㈡埛寰�鏉ヨ褰�", rangeSummary(range, 0, keyword), Map.of("items", List.of()), Map.of());
-// }
-//
-// List<Long> ledgerIds = payments.stream()
-// .map(ReceiptPayment::getSalesLedgerId)
-// .filter(Objects::nonNull)
-// .distinct()
-// .collect(Collectors.toList());
-// Map<Long, SalesLedger> ledgerMap = defaultList(salesLedgerMapper.selectBatchIds(ledgerIds)).stream()
-// .filter(ledger -> tenantMatched(ledger.getTenantId(), loginUser.getTenantId()))
-// .collect(Collectors.toMap(SalesLedger::getId, item -> item, (a, b) -> a, LinkedHashMap::new));
-//
-// List<ReceiptPayment> filtered = payments.stream()
-// .filter(item -> matchInteractionKeyword(item, ledgerMap.get(item.getSalesLedgerId()), keyword))
-// .limit(normalizeLimit(limit))
-// .collect(Collectors.toList());
-//
-// BigDecimal totalReceiptAmount = filtered.stream()
-// .map(ReceiptPayment::getReceiptPaymentAmount)
-// .filter(Objects::nonNull)
-// .reduce(BigDecimal.ZERO, BigDecimal::add);
-
-// List<Map<String, Object>> items = filtered.stream().map(item -> {
-// SalesLedger ledger = ledgerMap.get(item.getSalesLedgerId());
-// Map<String, Object> map = new LinkedHashMap<>();
-// map.put("id", item.getId());
-// map.put("salesLedgerId", item.getSalesLedgerId());
-// map.put("salesContractNo", ledger == null ? "" : safe(ledger.getSalesContractNo()));
-// map.put("customerName", ledger == null ? "" : safe(ledger.getCustomerName()));
-// map.put("projectName", ledger == null ? "" : safe(ledger.getProjectName()));
-// map.put("receiptPaymentDate", formatDate(item.getReceiptPaymentDate()));
-// map.put("receiptPaymentAmount", item.getReceiptPaymentAmount());
-// map.put("receiptPaymentType", safe(item.getReceiptPaymentType()));
-// map.put("registrant", safe(item.getRegistrant()));
-// return map;
-// }).collect(Collectors.toList());
-
-// Map<String, Object> summary = rangeSummary(range, items.size(), keyword);
-// summary.put("totalReceiptAmount", totalReceiptAmount);
-// summary.put("customerCount", items.stream().map(item -> String.valueOf(item.get("customerName"))).filter(StringUtils::hasText).distinct().count());
-// return jsonResponse(true, "sales_customer_interaction_list", "宸茶繑鍥炲鎴峰線鏉ユ槑缁�", summary, Map.of("items", items), Map.of());
- return jsonResponse(true, "sales_customer_interaction_list", "宸茶繑鍥炲鎴峰線鏉ユ槑缁�", null, Map.of("items", List.of()), Map.of());
+ return jsonResponse(true, "sales_customer_interaction_list", "ok", summary, Map.of("items", items), Map.of());
}
@Tool(name = "鏌ヨ鍙戣揣鍙拌处", value = "鎸夊叧閿瘝鍜屾椂闂磋寖鍥存煡璇㈠彂璐у彴璐�")
@@ -965,12 +859,6 @@
return Map.of();
}
Map<Long, BigDecimal> result = new HashMap<>();
-// for (InvoiceLedgerDto item : defaultList(invoiceLedgerMapper.invoicedTotal(ledgerIds))) {
-// if (item.getSalesLedgerId() == null) {
-// continue;
-// }
-// result.merge(item.getSalesLedgerId().longValue(), defaultDecimal(item.getInvoiceTotal()), BigDecimal::add);
-// }
return result;
}
--
Gitblit v1.9.3