From bef91151a3edd599f03f18f1317ba1c67d48f0f1 Mon Sep 17 00:00:00 2001 From: ouyangxq <775153912@qq.com> Date: Mon, 31 Aug 2026 10:17:42 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../baiyue/order/client/FirstlegColoadGroupClient.java | 8 ++++++-- .../order/service/UnifiedOrderQueryServiceTest.java | 7 +++++-- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/order/src/main/java/com/baiyue/order/client/FirstlegColoadGroupClient.java b/order/src/main/java/com/baiyue/order/client/FirstlegColoadGroupClient.java index 03f3ee4cf..58b3ac034 100644 --- a/order/src/main/java/com/baiyue/order/client/FirstlegColoadGroupClient.java +++ b/order/src/main/java/com/baiyue/order/client/FirstlegColoadGroupClient.java @@ -7,6 +7,7 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestHeader; import java.util.List; +import java.time.LocalDateTime; /** Internal read contract for Firstleg co-load group aggregation. */ @FeignClient(name = "firstleg-service", contextId = "orderFirstlegColoadGroupClient", @@ -18,6 +19,9 @@ public interface FirstlegColoadGroupClient { record BatchQueryRequest(List orderIds) {} record OrderGroupInfo(Long orderId, GroupSnapshot group) {} - record GroupSnapshot(String status, List members) {} - record Member(Long orderId) {} + record GroupSnapshot(Long groupId, String groupNo, String status, Long warehouseId, + String channelCode, Long lockedPlanId, Integer version, + List members, Integer fullPackageCount, + LocalDateTime createdAt, LocalDateTime updatedAt) {} + record Member(Long tenantId, Long orderId, Long inboundId, Integer fullPackageCount) {} } diff --git a/order/src/test/java/com/baiyue/order/service/UnifiedOrderQueryServiceTest.java b/order/src/test/java/com/baiyue/order/service/UnifiedOrderQueryServiceTest.java index 2e2f4e1fe..d119ca3ae 100644 --- a/order/src/test/java/com/baiyue/order/service/UnifiedOrderQueryServiceTest.java +++ b/order/src/test/java/com/baiyue/order/service/UnifiedOrderQueryServiceTest.java @@ -262,8 +262,11 @@ class UnifiedOrderQueryServiceTest { otherCustomerMember.setId(78L); otherCustomerMember.setTenantId(20002L); otherCustomerMember.setInboundCode("RK-OTHER-CUSTOMER"); - var group = new FirstlegColoadGroupClient.GroupSnapshot("ACTIVE", List.of( - new FirstlegColoadGroupClient.Member(77L), new FirstlegColoadGroupClient.Member(78L))); + var group = new FirstlegColoadGroupClient.GroupSnapshot( + 700L, "CLG-700", "ACTIVE", 11L, "MATSON", null, 0, + List.of(new FirstlegColoadGroupClient.Member(10001L, 77L, 88L, 10), + new FirstlegColoadGroupClient.Member(20002L, 78L, 89L, 20)), + 30, null, null); when(orders.unifiedPage(eq(10001L), eq(query), eq(List.of(OrderStatus.SUBMITTED)))) .thenReturn(new PageResult<>(List.of(current), 1, 20, 1, 1)); when(coloadGroups.batchQuery(eq("internal-token"), any())).thenReturn(ApiResponse.success(