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

1

Browse Source
This commit is contained in:
wujinliang
2026-09-18 11:41:04 +08:00
parent 263068ac85
commit 1fc3e04723
38 changed files with 378 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
file/src/main/java/com/baiyue/file/service/ExportSchemaContracts.java
+2 -2
View File
@@ -28,7 +28,7 @@ final class ExportSchemaContracts {
column("mainStatus", "订单主状态", ExportColumnType.STRING),
column("customerName", "客户", ExportColumnType.STRING),
column("channelName", "渠道", ExportColumnType.STRING),
column("channelChanged", "曾变更渠道", ExportColumnType.BOOLEAN),
column("channelChanged", "曾变更渠道", ExportColumnType.STRING),
column("receivingWarehouseName", "定位仓库", ExportColumnType.STRING),
column("destinationWarehouseName", "交货仓", ExportColumnType.STRING),
column("expectedShipDate", "预计出运日期", ExportColumnType.DATE),
@@ -44,7 +44,7 @@ final class ExportSchemaContracts {
column("skuNos", "SKU", ExportColumnType.STRING),
column("taxMode", "报关方式", ExportColumnType.STRING),
column("containerMode", "装柜方式", ExportColumnType.STRING),
column("customsInspection", "是否商检", ExportColumnType.BOOLEAN),
column("customsInspection", "是否商检", ExportColumnType.STRING),
column("containerNo", "集装箱号", ExportColumnType.STRING),
column("cabinetNo", "柜次号", ExportColumnType.STRING),
column("vesselName", "船名", ExportColumnType.STRING),
file/src/main/resources/openapi/domestic-order-export-v1.yaml
+2 -2
View File
@@ -114,7 +114,7 @@ components:
mainStatus: {type: string, title: 订单主状态}
customerName: {type: string, title: 客户}
channelName: {type: string, title: 渠道}
channelChanged: {type: boolean, title: 曾变更渠道}
channelChanged: {type: string, title: 曾变更渠道, description: 是或否}
receivingWarehouseName: {type: string, title: 定位仓库}
destinationWarehouseName: {type: string, title: 交货仓}
expectedShipDate: {type: string, format: date, title: 预计出运日期}
@@ -130,7 +130,7 @@ components:
skuNos: {type: string, title: SKU}
taxMode: {type: string, title: 报关方式}
containerMode: {type: string, title: 装柜方式}
customsInspection: {type: boolean, title: 是否商检}
customsInspection: {type: string, title: 是否商检, description: 是或否}
containerNo: {type: string, title: 集装箱号}
cabinetNo: {type: string, title: 柜次号}
vesselName: {type: string, title: 船名}
file/src/test/java/com/baiyue/file/config/DomesticWarehouseOrderExportContractTest.java
+2
View File
@@ -57,6 +57,8 @@ class DomesticWarehouseOrderExportContractTest {
assertThat(columns).containsKeys("expectedVolumeCbm", "expectedArrivalAt")
.doesNotContainKeys("orderId", "tenantId", "customerId", "inboundId", "receivingWarehouseId",
"destinationWarehouseId");
assertThat(map(columns.get("channelChanged")).get("type")).isEqualTo("string");
assertThat(map(columns.get("customsInspection")).get("type")).isEqualTo("string");
assertThat(source).contains("platform:order:export", "selectedOrderNos 非空时优先", "no-store");
assertThat(paths).containsKey("/api/platform/v1/files/export-tasks/{taskId}/retry");
assertThat(map(map(schemas.get("ExportTaskRetryState")).get("properties")))
file/src/test/java/com/baiyue/file/service/GenericXlsxExportRunnerTest.java
+9
View File
@@ -157,6 +157,9 @@ class GenericXlsxExportRunnerTest {
Map<String, Object> row = new java.util.LinkedHashMap<>();
row.put("inboundCode", "IN-1"); row.put("orderNo", "ORD-1");
row.put("expectedVolumeCbm", "1.25"); row.put("expectedArrivalAt", "2026-09-03T12:30:00");
row.put("mainStatus", "待审核"); row.put("channelChanged", "否");
row.put("feeReviewStatus", "未提交"); row.put("taxMode", "买单报关");
row.put("containerMode", "拼箱"); row.put("customsInspection", "否");
var batch = new ExportBatchResponse(1, "sha256:domestic-orders", "snapshot-orders",
columns, List.of(row), null, false, 1L);
when(provider.batch(anyString(), eq(ExportSchemaContracts.DOMESTIC_WAREHOUSE_ORDER_LIST), any(), any()))
@@ -173,6 +176,12 @@ class GenericXlsxExportRunnerTest {
assertEquals("预计到货时间", sheet.getRow(0).getCell(9).getStringCellValue());
assertEquals("预计体积(m³)", sheet.getRow(0).getCell(10).getStringCellValue());
assertEquals(1.25d, sheet.getRow(1).getCell(10).getNumericCellValue());
assertEquals("待审核", sheet.getRow(1).getCell(2).getStringCellValue());
assertEquals("否", sheet.getRow(1).getCell(5).getStringCellValue());
assertEquals("未提交", sheet.getRow(1).getCell(17).getStringCellValue());
assertEquals("买单报关", sheet.getRow(1).getCell(19).getStringCellValue());
assertEquals("拼箱", sheet.getRow(1).getCell(20).getStringCellValue());
assertEquals("否", sheet.getRow(1).getCell(21).getStringCellValue());
}
ArgumentCaptor<ExportBatchRequest> request = ArgumentCaptor.forClass(ExportBatchRequest.class);
verify(provider).batch(anyString(), eq(ExportSchemaContracts.DOMESTIC_WAREHOUSE_ORDER_LIST),