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

feat: close overseas wallet and pallet cost flow

Browse Source
This commit is contained in:
ouyangxq
2026-09-05 22:26:25 +08:00
parent f62283fb7f
commit 5fbd2bbd04
69 changed files with 1598 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lastleg-service/src/test/java/com/baiyue/lastleg/relabel/controller/RelabelApplicationControllerTest.java
+1 -1
View File
@@ -36,7 +36,7 @@ class RelabelApplicationControllerTest {
private RelabelRequests.Create request() {
return new RelabelRequests.Create("CUSTOMER-1", "WH-1",
LocalDateTime.of(2026, 8, 20, 10, 0), "Li", "13800000000", null, "key-1",
LocalDateTime.of(2026, 8, 20, 10, 0), "Li", "13800000000", null, null, "key-1",
List.of(new RelabelRequests.Item("SKU-A", null, null, null, "Product", 1, 1,
"SHIP-1", null, "SKU-B", "Replace", null, null, null)));
}
lastleg-service/src/test/java/com/baiyue/lastleg/relabel/service/RelabelApplicationServiceTest.java
+33 -26
View File
@@ -1,5 +1,7 @@
package com.baiyue.lastleg.relabel.service;
import java.math.BigDecimal;
import com.baiyue.lastleg.entity.LastlegOrder;
import com.baiyue.lastleg.entity.LastlegOrderStatusHistory;
import com.baiyue.lastleg.mapper.LastlegOrderMapper;
@@ -13,6 +15,7 @@ import com.baiyue.lastleg.relabel.mapper.RelabelApplicationMapper;
import com.baiyue.lastleg.relabel.mapper.RelabelItemMapper;
import com.baiyue.lastleg.relabel.mapper.RelabelStatusHistoryMapper;
import com.baiyue.lastleg.service.LastlegOrderNoGenerator;
import com.baiyue.lastleg.wallet.WalletCommandOutboxService;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -45,6 +48,7 @@ class RelabelApplicationServiceTest {
@Mock RelabelStatusHistoryMapper histories;
@Mock LastlegOrderMapper orders;
@Mock LastlegOrderStatusHistoryMapper orderHistories;
@Mock WalletCommandOutboxService walletCommands;
@Spy LastlegOrderNoGenerator orderNoGenerator = new LastlegOrderNoGenerator();
private RelabelApplicationService service;
@@ -58,23 +62,25 @@ class RelabelApplicationServiceTest {
ReflectionTestUtils.setField(service, "orders", orders);
ReflectionTestUtils.setField(service, "orderHistories", orderHistories);
ReflectionTestUtils.setField(service, "orderNoGenerator", orderNoGenerator);
ReflectionTestUtils.setField(service, "walletCommands", walletCommands);
ReflectionTestUtils.setField(service, "objectMapper", mapper());
lenient().when(walletCommands.publish(any(), any(Long.class), any(), any(), any(), any(), any(Long.class))).thenReturn("wallet-event-1");
}
@Test
void createBuildsPendingRelabelTailOrderItemsAndBothHistories() {
RelabelRequests.Create request = request("key-1", 10, 6);
RelabelApplication persisted = application(11L, "FBR-1", "TENANT-A", "key-1", null,
RelabelApplication persisted = application(11L, "FBR-1", "10001", "key-1", null,
RelabelApplicationService.PENDING_PROCESSING);
persisted.setLastlegOrderId(21L);
persisted.setItemCount(1); persisted.setTotalPackageCount(10); persisted.setNotifiedPackageCount(6);
when(applications.findNo(eq("TENANT-A"), any())).thenReturn(persisted);
when(applications.findNo(eq("10001"), any())).thenReturn(persisted);
when(items.selectList(any())).thenReturn(List.of(item(31L, 11L, "SKU-A", 10, 6)));
when(histories.selectList(any())).thenReturn(List.of());
when(orders.selectById(21L)).thenReturn(order(21L, "TENANT-A", "LMO-RELABEL-1",
when(orders.selectById(21L)).thenReturn(order(21L, "10001", "LMO-RELABEL-1",
RelabelApplicationService.PENDING_PROCESSING));
RelabelResponses.Detail result = service.create("TENANT-A", "operator-1", request);
RelabelResponses.Detail result = service.create("10001", "operator-1", request);
ArgumentCaptor<LastlegOrder> tailOrder = ArgumentCaptor.forClass(LastlegOrder.class);
ArgumentCaptor<RelabelApplication> application = ArgumentCaptor.forClass(RelabelApplication.class);
@@ -106,7 +112,7 @@ class RelabelApplicationServiceTest {
@Test
void createRejectsNotifiedBoxesAboveTotalBeforeAnyWrite() {
ResponseStatusException exception = assertThrows(ResponseStatusException.class, () ->
service.create("TENANT-A", "operator-1", request("key-1", 5, 6)));
service.create("10001", "operator-1", request("key-1", 5, 6)));
assertEquals(400, exception.getStatusCode().value());
verify(orders, never()).insert(any(LastlegOrder.class));
@@ -117,14 +123,14 @@ class RelabelApplicationServiceTest {
@Test
void sameIdempotencyKeyAndPayloadReturnsExistingApplicationWithoutWrites() {
RelabelRequests.Create request = request("key-1", 10, 6);
RelabelApplication existing = application(11L, "FBR-1", "TENANT-A", "key-1", hash(request),
RelabelApplication existing = application(11L, "FBR-1", "10001", "key-1", hash(request),
RelabelApplicationService.PENDING_PROCESSING);
existing.setLastlegOrderId(21L); existing.setItemCount(1); existing.setTotalPackageCount(10);
existing.setNotifiedPackageCount(6);
when(applications.findKey("TENANT-A", "key-1")).thenReturn(existing);
when(applications.findKey("10001", "key-1")).thenReturn(existing);
stubDetail(existing);
RelabelResponses.Detail result = service.create("TENANT-A", "operator-1", request);
RelabelResponses.Detail result = service.create("10001", "operator-1", request);
assertEquals("FBR-1", result.application().relabelNo());
verify(orders, never()).insert(any(LastlegOrder.class));
@@ -135,12 +141,12 @@ class RelabelApplicationServiceTest {
@Test
void idempotencyKeyCannotBeReusedWithDifferentRelabelPayload() {
RelabelRequests.Create request = request("key-1", 10, 6);
RelabelApplication existing = application(11L, "FBR-1", "TENANT-A", "key-1", "different-hash",
RelabelApplication existing = application(11L, "FBR-1", "10001", "key-1", "different-hash",
RelabelApplicationService.PENDING_PROCESSING);
when(applications.findKey("TENANT-A", "key-1")).thenReturn(existing);
when(applications.findKey("10001", "key-1")).thenReturn(existing);
ResponseStatusException exception = assertThrows(ResponseStatusException.class, () ->
service.create("TENANT-A", "operator-1", request));
service.create("10001", "operator-1", request));
assertEquals(409, exception.getStatusCode().value());
verify(orders, never()).insert(any(LastlegOrder.class));
@@ -148,13 +154,13 @@ class RelabelApplicationServiceTest {
@Test
void statusChangeIsTenantScopedAndWritesApplicationAndTailOrderHistory() {
RelabelApplication application = application(11L, "FBR-1", "TENANT-A", "key-1", "hash",
RelabelApplication application = application(11L, "FBR-1", "10001", "key-1", "hash",
RelabelApplicationService.PENDING_PROCESSING);
application.setLastlegOrderId(21L);
when(applications.lockNo("TENANT-A", "FBR-1")).thenReturn(application);
when(applications.lockNo("10001", "FBR-1")).thenReturn(application);
stubDetail(application);
RelabelResponses.Detail result = service.changeStatus("TENANT-A", "FBR-1", "operator-2",
RelabelResponses.Detail result = service.changeStatus("10001", "FBR-1", "operator-2",
new RelabelRequests.ChangeStatus("processing", "started"));
assertEquals("PROCESSING", application.getStatus());
@@ -170,32 +176,32 @@ class RelabelApplicationServiceTest {
@Test
void completedApplicationCannotReturnToProcessingAndOtherTenantCannotReadIt() {
RelabelApplication completed = application(11L, "FBR-1", "TENANT-A", "key-1", "hash", "COMPLETED");
RelabelApplication completed = application(11L, "FBR-1", "10001", "key-1", "hash", "COMPLETED");
completed.setLastlegOrderId(21L);
when(applications.lockNo("TENANT-A", "FBR-1")).thenReturn(completed);
when(applications.lockNo("10001", "FBR-1")).thenReturn(completed);
ResponseStatusException transition = assertThrows(ResponseStatusException.class, () ->
service.changeStatus("TENANT-A", "FBR-1", "operator-2", new RelabelRequests.ChangeStatus("PROCESSING", null)));
service.changeStatus("10001", "FBR-1", "operator-2", new RelabelRequests.ChangeStatus("PROCESSING", null)));
assertEquals(409, transition.getStatusCode().value());
when(applications.findNo("TENANT-B", "FBR-1")).thenReturn(null);
when(applications.findNo("10002", "FBR-1")).thenReturn(null);
ResponseStatusException boundary = assertThrows(ResponseStatusException.class, () ->
service.detail("TENANT-B", "FBR-1"));
service.detail("10002", "FBR-1"));
assertEquals(404, boundary.getStatusCode().value());
verify(applications).findNo("TENANT-B", "FBR-1");
verify(applications).findNo("10002", "FBR-1");
}
@Test
void completedReturnRelabelOrderEntersPendingAssignment() {
RelabelApplication application = application(11L, "FBR-1", "TENANT-A", "key-1", "hash", "PROCESSING");
RelabelApplication application = application(11L, "FBR-1", "10001", "key-1", "hash", "PROCESSING");
application.setLastlegOrderId(21L);
LastlegOrder order = order(21L, "TENANT-A", "LMO-RELABEL-1", "PROCESSING");
LastlegOrder order = order(21L, "10001", "LMO-RELABEL-1", "PROCESSING");
order.setOrderType("RETURN_RELABEL");
when(applications.lockNo("TENANT-A", "FBR-1")).thenReturn(application);
when(applications.lockNo("10001", "FBR-1")).thenReturn(application);
stubDetail(application);
when(orders.selectById(21L)).thenReturn(order);
service.changeStatus("TENANT-A", "FBR-1", "operator-2",
service.changeStatus("10001", "FBR-1", "operator-2",
new RelabelRequests.ChangeStatus("COMPLETED", "finished"));
assertEquals("COMPLETED", application.getStatus());
@@ -213,7 +219,7 @@ class RelabelApplicationServiceTest {
private static RelabelRequests.Create request(String key, int total, int notified) {
return new RelabelRequests.Create("CUSTOMER-1", "WH-1", LocalDateTime.of(2026, 8, 20, 10, 0),
"Li", "13800000000", "remark", key, List.of(new RelabelRequests.Item("SKU-A", "img-1",
"Li", "13800000000", new BigDecimal("20.00"), "remark", key, List.of(new RelabelRequests.Item("SKU-A", "img-1",
"image.png", "https://files/image.png", "Chinese name", total, notified, "SHP-1", "TRACK-1",
"SKU-NEW", "Label on carton", "file-1", "relabel.pdf", "https://files/relabel.pdf")));
}
@@ -226,12 +232,13 @@ class RelabelApplicationServiceTest {
value.setContactName("Li"); value.setContactPhone("13800000000"); value.setCustomerOrderNo("CUSTOMER-1");
value.setOverseasWarehouseId("WH-1"); value.setLabelDeadline(LocalDateTime.now().plusDays(1));
value.setItemCount(1); value.setTotalPackageCount(10); value.setNotifiedPackageCount(6);
value.setChargeAmount(new BigDecimal("20.00")); value.setChargeCurrency("CNY"); value.setWalletStatus("FROZEN");
return value;
}
private static RelabelItem item(long id, long applicationId, String sku, int total, int notified) {
RelabelItem value = new RelabelItem();
value.setId(id); value.setApplicationId(applicationId); value.setCustomerId("TENANT-A"); value.setSkuCode(sku);
value.setId(id); value.setApplicationId(applicationId); value.setCustomerId("10001"); value.setSkuCode(sku);
value.setProductNameZh("Chinese name"); value.setTotalPackageCount(total); value.setNotifiedPackageCount(notified);
value.setShipmentNo("SHP-1"); value.setNewSkuCode("SKU-NEW");
return value;