java-project/baiyue-firstleg
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(order): expose unified order channel code

Browse Source
This commit is contained in:
ouyangxq
2026-08-31 15:38:18 +08:00
parent c9792b1f63
commit 17d81b0b94
6 changed files with 34 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
order/src/test/java/com/baiyue/order/controller/UnifiedOrderApiContractTest.java
+5 -1
View File
@@ -52,7 +52,7 @@ class UnifiedOrderApiContractTest {
Map<String, Object> row = stringMap(schemas.get("UnifiedOrderRow"));
assertThat(stringMap(row.get("properties"))).containsKeys(
"orderId", "mainStatus", "inboundId", "inboundVersion", "measurement", "preload",
"orderId", "mainStatus", "channelCode", "inboundId", "inboundVersion", "measurement", "preload",
"loading", "delivery", "transport", "customerRemark", "latestInternalNote",
"expectedArrivalAt", "requestedPickupAt", "feeReviewStatus", "companyName", "businessType", "pickupMethod",
"taxMode", "containerMode", "customsInspection", "destinationType", "destinationCode",
@@ -62,6 +62,8 @@ class UnifiedOrderApiContractTest {
Map<String, Object> inboundCode = stringMap(stringMap(row.get("properties")).get("inboundCode"));
assertThat(inboundCode).containsEntry("nullable", true);
assertThat(inboundCode.get("description").toString()).contains("不得回退");
Map<String, Object> channelCode = stringMap(stringMap(row.get("properties")).get("channelCode"));
assertThat(channelCode.get("description").toString()).contains("不由 channelName 推导");
Map<String, Object> coLoadGroup = stringMap(schemas.get("UnifiedCoLoadGroupSummary"));
assertThat(stringMap(coLoadGroup.get("properties")))
.containsOnlyKeys("status", "memberCount", "memberInboundCodes");
@@ -79,6 +81,8 @@ class UnifiedOrderApiContractTest {
Method page = FirstlegUnifiedOrderClient.class.getMethod(
"page", String.class, FirstlegUnifiedOrderClient.Query.class);
assertThat(page.getAnnotation(PostMapping.class).value()).containsExactly("/query");
assertThat(List.of(FirstlegUnifiedOrderClient.Inbound.class.getRecordComponents()).stream()
.map(component -> component.getName())).contains("channelCode", "channelName");
}
@Test
order/src/test/java/com/baiyue/order/service/UnifiedOrderQueryServiceTest.java
+23
View File
@@ -72,6 +72,7 @@ class UnifiedOrderQueryServiceTest {
assertThat(row.mainStatus()).isEqualTo("PENDING_REVIEW");
assertThat(row.nextAction()).isEqualTo("APPROVE_ORDER");
assertThat(row.inboundCode()).isEqualTo("RK-77");
assertThat(row.channelCode()).isEqualTo("MATSON");
assertThat(row.inboundId()).isNull();
assertThat(row.customerRemark()).isEqualTo("客户要求提货前联系");
assertThat(row.latestInternalNote()).isEqualTo("客服已确认提货时间");
@@ -243,6 +244,7 @@ class UnifiedOrderQueryServiceTest {
UnifiedOrderQuery query = query("PENDING_REVIEW");
OrderEntity order = order(OrderStatus.SUBMITTED);
order.setInboundCode(null);
order.setChannelCode(null);
when(orders.unifiedPage(eq(10001L), eq(query), eq(List.of(OrderStatus.SUBMITTED))))
.thenReturn(new PageResult<>(List.of(order), 1, 20, 1, 1));
@@ -250,9 +252,27 @@ class UnifiedOrderQueryServiceTest {
assertThat(row.orderId()).isEqualTo(77L);
assertThat(row.orderNo()).isEqualTo("FL-77");
assertThat(row.inboundCode()).isNull();
assertThat(row.channelName()).isEqualTo("美森");
assertThat(row.channelCode()).isNull();
});
}
@Test
void orderDrivenPageUsesOrderChannelCodeWithoutFirstlegOrNameFallback() {
UnifiedOrderQuery query = query(null);
OrderEntity order = order(OrderStatus.APPROVED);
order.setChannelCode("ORDER-SNAPSHOT");
var summary = summary("LOADING", null);
when(summary.inbound().channelCode()).thenReturn("FIRSTLEG-SNAPSHOT");
when(orders.unifiedPage(eq(10001L), eq(query), any()))
.thenReturn(new PageResult<>(List.of(order), 1, 20, 1, 1));
when(firstleg.summaries(eq("internal-token"), any()))
.thenReturn(ApiResponse.success(List.of(summary)));
assertThat(service.page(10001L, query).records()).singleElement()
.extracting(UnifiedOrderResponse.Row::channelCode).isEqualTo("ORDER-SNAPSHOT");
}
@Test
void platformPageAggregatesColoadStatusAndMemberInboundCodes() {
UnifiedOrderQuery query = query("PENDING_REVIEW");
@@ -425,6 +445,7 @@ class UnifiedOrderQueryServiceTest {
assertThat(row.loading().loadingVersion()).isEqualTo(3);
assertThat(row.loading().pickingVersion()).isEqualTo(3);
assertThat(row.inboundCode()).isEqualTo("RK-77");
assertThat(row.channelCode()).isEqualTo("MATSON");
assertThat(row.recommendedPalletType()).isNull();
assertThat(row.locationCodes()).isEqualTo("A0-01, B2-03");
assertThat(row.companyName()).isEqualTo("测试客户有限公司");
@@ -603,6 +624,7 @@ class UnifiedOrderQueryServiceTest {
OrderEntity order = new OrderEntity();
order.setId(77L); order.setTenantId(10001L); order.setOrderNo("FL-77");
order.setStatus(status); order.setCustomerId(30001L); order.setCustomerName("测试客户");
order.setChannelCode("MATSON"); order.setChannelName("美森");
order.setCreatedAt(LocalDateTime.of(2026, 8, 6, 10, 0));
return order;
}
@@ -625,6 +647,7 @@ class UnifiedOrderQueryServiceTest {
when(inbound.deliveryWarehouseId()).thenReturn(22L);
when(inbound.deliveryWarehouseName()).thenReturn("ONT8");
when(inbound.channelName()).thenReturn("美森");
when(inbound.channelCode()).thenReturn("MATSON");
when(inbound.totalPackageCount()).thenReturn(10);
when(inbound.locationCodes()).thenReturn("A0-01, B2-03");
when(inbound.companyName()).thenReturn("测试客户有限公司");