From 65b29adb01e3b54762c61e0e0688fcd072ee2d1c Mon Sep 17 00:00:00 2001 From: ouyangxq <775153912@qq.com> Date: Thu, 3 Sep 2026 22:05:27 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=99=BA=E8=83=BD=E8=A3=85?= =?UTF-8?q?=E6=9F=9C=E6=97=A5=E6=9C=9F=E7=AD=9B=E9=80=89=E8=B0=83=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../baiyue/firstleg/client/PendingReviewOrderClient.java | 5 ++--- .../com/baiyue/firstleg/service/SmartLoadingService.java | 6 +++++- .../baiyue/firstleg/service/SmartLoadingServiceTest.java | 4 ++-- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/firstleg/src/main/java/com/baiyue/firstleg/client/PendingReviewOrderClient.java b/firstleg/src/main/java/com/baiyue/firstleg/client/PendingReviewOrderClient.java index 0a5d4090f..cc453bef8 100644 --- a/firstleg/src/main/java/com/baiyue/firstleg/client/PendingReviewOrderClient.java +++ b/firstleg/src/main/java/com/baiyue/firstleg/client/PendingReviewOrderClient.java @@ -7,7 +7,6 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestHeader; import org.springframework.web.bind.annotation.RequestParam; -import java.time.LocalDate; import java.time.LocalDateTime; import java.util.List; @@ -22,8 +21,8 @@ public interface PendingReviewOrderClient { @RequestParam(required = false) Long warehouseId, @RequestParam(required = false) Long customerId, @RequestParam(required = false) String inboundCode, - @RequestParam(required = false) LocalDate createdStart, - @RequestParam(required = false) LocalDate createdEnd, + @RequestParam(required = false) String createdStart, + @RequestParam(required = false) String createdEnd, @RequestParam long page, @RequestParam long size); diff --git a/firstleg/src/main/java/com/baiyue/firstleg/service/SmartLoadingService.java b/firstleg/src/main/java/com/baiyue/firstleg/service/SmartLoadingService.java index fed94e1cc..2323c5a56 100644 --- a/firstleg/src/main/java/com/baiyue/firstleg/service/SmartLoadingService.java +++ b/firstleg/src/main/java/com/baiyue/firstleg/service/SmartLoadingService.java @@ -183,7 +183,7 @@ public class SmartLoadingService { ApiResponse> response; try { response = pendingReviewOrders.page(internalToken, List.copyOf(actualChannels), query.warehouseId(), - query.customerId(), query.inboundCode(), query.createdStart(), query.createdEnd(), + query.customerId(), query.inboundCode(), isoDate(query.createdStart()), isoDate(query.createdEnd()), page, size); } catch (RuntimeException exception) { throw new BizException(ResultCode.SERVICE_UNAVAILABLE, "待审核订单服务暂时不可用"); @@ -201,6 +201,10 @@ public class SmartLoadingService { return new PageResult<>(records, source.page(), source.size(), source.total(), source.pages()); } + private static String isoDate(java.time.LocalDate value) { + return value == null ? null : value.toString(); + } + private List pendingReviewRange(InboundCandidateQuery query, Set channels, long offset, long limit) { return pageRange(offset, limit, (page, size) -> pendingReviewCandidates(query, channels, page, size)); diff --git a/firstleg/src/test/java/com/baiyue/firstleg/service/SmartLoadingServiceTest.java b/firstleg/src/test/java/com/baiyue/firstleg/service/SmartLoadingServiceTest.java index 7dd9fda2c..7646e66ea 100644 --- a/firstleg/src/test/java/com/baiyue/firstleg/service/SmartLoadingServiceTest.java +++ b/firstleg/src/test/java/com/baiyue/firstleg/service/SmartLoadingServiceTest.java @@ -312,8 +312,8 @@ class SmartLoadingServiceTest { "EXX_TRUCK", "EXX海卡", 100, LocalDateTime.parse("2026-09-02T15:31:36"), "PENDING_REVIEW"); when(pendingReviewOrders.page(anyString(), anyList(), eq(193000000000200002L), - isNull(), eq("EXXHK2609020361"), eq(LocalDate.parse("2026-09-02")), - eq(LocalDate.parse("2026-09-02")), eq(1L), eq(20L))) + isNull(), eq("EXXHK2609020361"), eq("2026-09-02"), + eq("2026-09-02"), eq(1L), eq(20L))) .thenReturn(ApiResponse.success(new PageResult<>(List.of(row), 1, 20, 1, 1))); var result = service.inboundCandidates(query);