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 test

Browse Source 
# Conflicts:
#	lastleg-service/src/main/resources/openapi/overseas-business-v1.yaml
This commit is contained in:
ouyangxq
2026-10-09 16:13:28 +08:00
parent 3b5454fb99 bac7e0b214
commit c1aaaf207a
39 changed files with 990 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lastleg-service/src/test/java/com/baiyue/lastleg/service/LastlegOrderServiceTest.java
+20
View File
@@ -75,6 +75,7 @@ class LastlegOrderServiceTest {
@Mock WarehouseResourceGateway warehouseResourceGateway;
@Mock ContainerShippingGateMapper containerShippingGates;
@Mock ReturnOrderReferenceResolver returnOrderReferences;
@Mock com.baiyue.lastleg.returnreceipt.service.ReturnReceiptService returnReceipts;
LastlegOrderService service;
@Test
@@ -87,6 +88,13 @@ class LastlegOrderServiceTest {
assertEquals("WT-WH-20260911-020225", LastlegOrderService.displayOrderNo(order));
}
@Test
void returnTailOrderUsesSourceReturnNumber() {
LastlegOrder order = new LastlegOrder(); order.setOrderType("RETURN_RELABEL");
order.setOrderNo("RETU-OLD"); order.setSourceOrderNo("RT-1");
assertEquals("RT-1", LastlegOrderService.displayOrderNo(order));
}
@Test
void exposesStableContainerBookingIdInOrderSummary() {
LastlegOrder order = new LastlegOrder();
@@ -236,6 +244,18 @@ class LastlegOrderServiceTest {
.noneMatch(component -> "eventId".equals(component.getName())));
}
@Test
void returnTailDetailReadsReceiptFactsWithOwnedCustomerAndSourceReturnNumber() {
ReflectionTestUtils.setField(service, "returnReceipts", returnReceipts);
LastlegOrder order = order(11L, "100", "INBOUND_COMPLETED", null);
order.setOrderType("RETURN_RELABEL"); order.setSourceOrderNo("RT-SOURCE");
when(orders.selectOne(any())).thenReturn(order);
var receiptDetail = new com.baiyue.lastleg.returnreceipt.dto.ReturnOrderResponses.Detail(null, null, List.of(), List.of(), List.of(), List.of());
when(returnReceipts.detail("100", "RT-SOURCE")).thenReturn(receiptDetail);
assertSame(receiptDetail, service.detail("100", 11L).returnReceipt());
verify(returnReceipts).detail("100", "RT-SOURCE");
}
@Test
void detailReadsContainerNodeFromTheContainerShippingGate() {
LastlegOrder order = order(11L, "100", "PENDING_ASSIGNMENT", null);