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

优化

Browse Source
This commit is contained in:
ouyangxq
2026-08-20 18:02:38 +08:00
parent b55b049e77
commit 1cd8b6a473
210 changed files with 6974 additions and 825 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lastleg-service/src/test/java/com/baiyue/lastleg/service/LastlegOrderServiceTest.java
+6 -35
View File
@@ -7,12 +7,6 @@ import com.baiyue.lastleg.entity.LastlegOrderStatusHistory;
import com.baiyue.lastleg.mapper.LastlegOrderDetailMapper;
import com.baiyue.lastleg.mapper.LastlegOrderMapper;
import com.baiyue.lastleg.mapper.LastlegOrderStatusHistoryMapper;
import com.baiyue.lastleg.dropship.entity.DropshipCarton;
import com.baiyue.lastleg.dropship.entity.DropshipOrderProfile;
import com.baiyue.lastleg.dropship.entity.DropshipSkuInventory;
import com.baiyue.lastleg.dropship.mapper.DropshipCartonMapper;
import com.baiyue.lastleg.dropship.mapper.DropshipOrderProfileMapper;
import com.baiyue.lastleg.dropship.mapper.DropshipSkuInventoryMapper;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
@@ -37,9 +31,6 @@ class LastlegOrderServiceTest {
@Mock LastlegOrderMapper orders;
@Mock LastlegOrderDetailMapper details;
@Mock LastlegOrderStatusHistoryMapper histories;
@Mock DropshipOrderProfileMapper dropshipProfiles;
@Mock DropshipSkuInventoryMapper dropshipSkuInventory;
@Mock DropshipCartonMapper dropshipCartons;
LastlegOrderService service;
@BeforeEach
@@ -48,35 +39,23 @@ class LastlegOrderServiceTest {
ReflectionTestUtils.setField(service, "orderMapper", orders);
ReflectionTestUtils.setField(service, "detailMapper", details);
ReflectionTestUtils.setField(service, "historyMapper", histories);
ReflectionTestUtils.setField(service, "dropshipProfiles", dropshipProfiles);
ReflectionTestUtils.setField(service, "dropshipSkuInventory", dropshipSkuInventory);
ReflectionTestUtils.setField(service, "dropshipCartons", dropshipCartons);
}
@Test
void detailGroupsDropshipSkuAndCartonsByPallet() {
void detailDoesNotExposeDropshipCartonsOrInternalEventIds() {
LastlegOrder order = order(11L, "100", "PENDING_ASSIGNMENT", null);
order.setOrderType("ONE_CLICK_DROPSHIP");
when(orders.selectOne(any())).thenReturn(order);
when(details.selectList(any())).thenReturn(List.of());
when(histories.selectList(any())).thenReturn(List.of());
DropshipOrderProfile first = profile(1L, "SOURCE-P-1", 101L, "WH-P-1");
DropshipOrderProfile second = profile(2L, "SOURCE-P-2", 102L, "WH-P-2");
when(dropshipProfiles.listOrder("100", 11L)).thenReturn(List.of(first, second));
DropshipSkuInventory sku = new DropshipSkuInventory();
sku.setProfileId(1L); sku.setSkuCode("SKU-A"); sku.setPackageCount(1L); sku.setProductQuantity(10L);
when(dropshipSkuInventory.listOrder("100", 11L)).thenReturn(List.of(sku));
DropshipCarton carton = new DropshipCarton();
carton.setProfileId(1L); carton.setSkuCode("SKU-A"); carton.setCartonMark("MARK-1");
when(dropshipCartons.listOrder("100", 11L)).thenReturn(List.of(carton));
var response = service.detail("100", 11L);
assertEquals(2, response.dropshipPallets().size());
assertEquals("SOURCE-P-1", response.dropshipPallets().get(0).sourcePalletNo());
assertEquals(1, response.dropshipPallets().get(0).skuInventory().size());
assertEquals("MARK-1", response.dropshipPallets().get(0).cartons().get(0).getCartonMark());
assertTrue(response.dropshipPallets().get(1).skuInventory().isEmpty());
assertEquals(11L, response.order().id());
assertTrue(java.util.Arrays.stream(response.getClass().getRecordComponents())
.noneMatch(component -> "dropshipPallets".equals(component.getName())));
assertTrue(java.util.Arrays.stream(com.baiyue.lastleg.dto.LastlegOrderDetailResponse.History.class.getRecordComponents())
.noneMatch(component -> "eventId".equals(component.getName())));
}
@Test
@@ -133,12 +112,4 @@ class LastlegOrderServiceTest {
return order;
}
private static DropshipOrderProfile profile(long id, String sourcePalletNo,
long warehousePalletId, String palletNo) {
DropshipOrderProfile profile = new DropshipOrderProfile();
profile.setId(id); profile.setSourcePalletNo(sourcePalletNo);
profile.setWarehousePalletId(warehousePalletId); profile.setPalletNo(palletNo);
profile.setStatus("RECEIVED");
return profile;
}
}