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

Merge remote-tracking branch 'origin/test' into dev

Browse Source 
# Conflicts:
#	order/AGENTS.md
This commit is contained in:
ouyangxq
2026-09-04 12:29:57 +08:00
parent da23683440 5c094fd0fd
commit 9bf0b4d331
87 changed files with 3134 additions and 720 deletions
Download Patch File Download Diff File Expand all files Collapse all files
order/src/test/java/com/baiyue/order/controller/InternalPendingReviewOrderControllerTest.java
+2 -1
View File
@@ -25,7 +25,8 @@ class InternalPendingReviewOrderControllerTest {
@Test
void acceptsOnlyTheConfiguredInternalServiceToken() {
var query = new PendingReviewOrderDtos.Query(List.of("SEA-US"), null, null, null, null, null, 1, 20);
var query = new PendingReviewOrderDtos.Query(List.of("SEA-US"), null, null, null, null, null,
List.of(101L), 1, 20);
var page = new PageResult<PendingReviewOrderDtos.Row>(List.of(), 1, 20, 0, 0);
when(service.page(query)).thenReturn(page);
order/src/test/java/com/baiyue/order/controller/PendingReviewOrderOpenApiContractTest.java
+1
View File
@@ -16,6 +16,7 @@ class PendingReviewOrderOpenApiContractTest {
.contains("channelCodes")
.contains("createdStart")
.contains("createdEnd")
.contains("excludedOrderIds")
.contains("PendingReviewOrderRow:")
.contains("mainStatus: {type: string, enum: [PENDING_REVIEW]}")
.contains("orderId: {type: string, pattern: '^[1-9][0-9]*$'}")
order/src/test/java/com/baiyue/order/repository/PendingReviewOrderRepositoryTest.java
+3 -1
View File
@@ -38,7 +38,8 @@ class PendingReviewOrderRepositoryTest {
void buildsSubmittedOnlyStablePageWithEverySupportedFilter() throws Exception {
when(orderMapper.selectPage(any(Page.class), any(Wrapper.class))).thenReturn(new Page<>());
repository.pendingReviewPage(List.of("SEA-US", "AIR-US"), 11L, 22L, "RK-1",
LocalDateTime.of(2026, 9, 1, 0, 0), LocalDateTime.of(2026, 9, 4, 0, 0), 3, 40);
LocalDateTime.of(2026, 9, 1, 0, 0), LocalDateTime.of(2026, 9, 4, 0, 0),
List.of(101L, 102L), 3, 40);
ArgumentCaptor<Page<OrderEntity>> page = ArgumentCaptor.forClass(Page.class);
ArgumentCaptor<Wrapper<OrderEntity>> wrapper = ArgumentCaptor.forClass(Wrapper.class);
@@ -53,6 +54,7 @@ class PendingReviewOrderRepositoryTest {
.contains(".eq(OrderEntity::getStatus, OrderStatus.SUBMITTED)")
.contains(".in(channelCodes != null && !channelCodes.isEmpty(), OrderEntity::getChannelCode, channelCodes)")
.contains(".lt(createdBefore != null, OrderEntity::getCreatedAt, createdBefore)")
.contains(".notIn(excludedOrderIds != null && !excludedOrderIds.isEmpty(), OrderEntity::getId,")
.contains(".orderByDesc(OrderEntity::getCreatedAt)")
.contains(".orderByDesc(OrderEntity::getId)");
}
order/src/test/java/com/baiyue/order/service/PendingReviewOrderQueryServiceTest.java
+8 -7
View File
@@ -36,16 +36,16 @@ class PendingReviewOrderQueryServiceTest {
@Test
void convertsShanghaiNaturalDatesToClosedDayRangeAndNormalizesFilters() {
when(repository.pendingReviewPage(any(), any(), any(), any(), any(), any(), anyLong(), anyLong()))
when(repository.pendingReviewPage(any(), any(), any(), any(), any(), any(), any(), anyLong(), anyLong()))
.thenReturn(new PageResult<>(List.of(), 2, 20, 0, 0));
service.page(new PendingReviewOrderDtos.Query(List.of(" SEA-US ", "SEA-US"), 11L, 22L,
" RK-1 ", LocalDate.of(2026, 9, 1), LocalDate.of(2026, 9, 3), 2, 20));
" RK-1 ", LocalDate.of(2026, 9, 1), LocalDate.of(2026, 9, 3), List.of(101L), 2, 20));
@SuppressWarnings("unchecked") ArgumentCaptor<List<String>> channels = ArgumentCaptor.forClass(List.class);
verify(repository).pendingReviewPage(channels.capture(), eq(11L), eq(22L), eq("RK-1"),
eq(LocalDateTime.of(2026, 9, 1, 0, 0)),
eq(LocalDateTime.of(2026, 9, 4, 0, 0)), eq(2L), eq(20L));
eq(LocalDateTime.of(2026, 9, 4, 0, 0)), eq(List.of(101L)), eq(2L), eq(20L));
assertThat(channels.getValue()).containsExactly("SEA-US");
}
@@ -58,11 +58,12 @@ class PendingReviewOrderQueryServiceTest {
order.setCreatedAt(LocalDateTime.of(2026, 9, 3, 10, 30));
OrderCargoEntity first = cargo(101L, 2);
OrderCargoEntity second = cargo(101L, 3);
when(repository.pendingReviewPage(any(), any(), any(), any(), any(), any(), anyLong(), anyLong()))
when(repository.pendingReviewPage(any(), any(), any(), any(), any(), any(), any(), anyLong(), anyLong()))
.thenReturn(new PageResult<>(List.of(order), 1, 20, 1, 1));
when(repository.findCargoByOrderIds(null, List.of(101L))).thenReturn(List.of(first, second));
var result = service.page(new PendingReviewOrderDtos.Query(null, null, null, " ", null, null, 1, 20));
var result = service.page(new PendingReviewOrderDtos.Query(null, null, null, " ", null, null,
List.of(), 1, 20));
assertThat(result.records()).singleElement().satisfies(row -> {
assertThat(row.orderId()).isEqualTo(101L);
@@ -75,9 +76,9 @@ class PendingReviewOrderQueryServiceTest {
@Test
void rejectsReversedDatesAndBlankChannelValues() {
assertThatThrownBy(() -> service.page(new PendingReviewOrderDtos.Query(null, null, null, null,
LocalDate.of(2026, 9, 4), LocalDate.of(2026, 9, 3), 1, 20))).isInstanceOf(BizException.class);
LocalDate.of(2026, 9, 4), LocalDate.of(2026, 9, 3), List.of(), 1, 20))).isInstanceOf(BizException.class);
assertThatThrownBy(() -> service.page(new PendingReviewOrderDtos.Query(List.of(" "), null, null,
null, null, null, 1, 20))).isInstanceOf(BizException.class);
null, null, null, List.of(), 1, 20))).isInstanceOf(BizException.class);
}
private static OrderCargoEntity cargo(long orderId, int packageCount) {