From 142b47f91f30c58e29bbaad6abb5847f88e7ffc9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Fri, 16 Jan 2026 15:15:29 +0800 Subject: [PATCH] =?UTF-8?q?refactor(customer):=20=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E4=BB=A3=E7=90=86=E5=95=86=E5=85=AC=E5=8F=B8=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=E9=80=BB=E8=BE=91=EF=BC=8C=E6=8C=89=E5=85=AC=E5=8F=B8=E5=90=8D?= =?UTF-8?q?=E7=A7=B0=E5=92=8C=E7=BC=96=E7=A0=81=E6=8E=92=E9=87=8D=EF=BC=8C?= =?UTF-8?q?=E4=BB=BB=E4=B8=80=E4=B8=AA=E7=9B=B8=E5=90=8C=E8=B4=A3=E8=AE=A4?= =?UTF-8?q?=E4=B8=BA=E6=98=AF=E7=9B=B8=E5=90=8C=E7=9A=84=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=EF=BC=8C=E4=BC=9A=E8=A6=86=E7=9B=96=E6=97=A7=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/service/AdminCustomerService.java | 24 ++++++++++++------- .../src/test/java/TTest.java | 7 +++++- 2 files changed, 22 insertions(+), 9 deletions(-) diff --git a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/service/AdminCustomerService.java b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/service/AdminCustomerService.java index c929fc77..88f8e72f 100644 --- a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/service/AdminCustomerService.java +++ b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/service/AdminCustomerService.java @@ -22,7 +22,6 @@ import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.time.LocalDateTime; -import java.time.format.DateTimeFormatter; import java.util.*; import java.util.stream.Collectors; @@ -99,10 +98,10 @@ public class AdminCustomerService { */ public void syncFromCrm(SyncFromCrmDTO dateParam) { - DateTimeFormatter dateFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd"); +// DateTimeFormatter dateFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd"); // 循环从起始日期到结束日期，每次增加一天 - List result = new ArrayList<>(); +// List result = new ArrayList<>(); // for (LocalDate date = stDate; !date.isAfter(edDate); date = date.plusDays(1)) { @@ -110,12 +109,19 @@ public class AdminCustomerService { if (CollUtil.isEmpty(agentList)) { return; } - Set crmComanyCodes = agentList.stream().map(u -> u.getId()).collect(Collectors.toSet()); - List crmCompanyList = baseCustomerService.lambdaQuery().in(TBaseCustomer::getAgencyCompanyCode, crmComanyCodes).list(); - Map crmCompanyMap = crmCompanyList.stream().collect(Collectors.toMap(TBaseCustomer::getAgencyCompanyCode, cm -> cm)); + List result = new ArrayList<>(); +// Set crmComanyCodes = agentList.stream().map(u -> u.getId()).collect(Collectors.toSet()); +// List crmCompanyList = baseCustomerService.lambdaQuery().in(TBaseCustomer::getAgencyCompanyCode, crmComanyCodes).list(); +// Map crmCompanyMap = crmCompanyList.stream().collect(Collectors.toMap(TBaseCustomer::getAgencyCompanyCode, cm -> cm)); + List customers = baseCustomerService.list(); agentList.forEach(u -> { - TBaseCustomer ent = crmCompanyMap.get(u.getId()); +// TBaseCustomer ent = crmCompanyMap.get(u.getId()); + TBaseCustomer ent = customers.stream() + .filter(c -> Objects.equals(c.getAgencyCompanyCode(), u.getId()) + || StrUtil.equals(convertName(c.getAgencyCompanyName()), convertName(u.getName()))) + .findFirst() + .orElse(null); if (Objects.nonNull(ent)) { ent.setDataModifyTime(LocalDateTime.now()); @@ -150,5 +156,7 @@ public class AdminCustomerService { } - + private String convertName(String name) { + return name.replaceAll("\\s+", ""); + } } diff --git a/nflg-mobilebroken-admin/src/test/java/TTest.java b/nflg-mobilebroken-admin/src/test/java/TTest.java index 53a90480..74f06a87 100644 --- a/nflg-mobilebroken-admin/src/test/java/TTest.java +++ b/nflg-mobilebroken-admin/src/test/java/TTest.java @@ -14,4 +14,9 @@ public class TTest { System.out.println(t2); System.out.println(ChronoUnit.DAYS.between(null, t1)); } -} + + @Test + public void test2() { + System.out.println("【" + " 打 撒sfc dffd发多少分多少 分多少分的d f ".replaceAll("\\s+", "") + "】"); + } +} \ No newline at end of file