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

fix(warehouse): align partner import carrier columns

Browse Source
This commit is contained in:
ouyangxq
2026-08-26 14:55:43 +08:00
parent 1f98c5ab9c
commit 36534fe9ce
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
warehouse/src/main/java/com/baiyue/warehouse/service/PartnerImportService.java
+1 -1
View File
@@ -111,7 +111,7 @@ public class PartnerImportService {
value(row, 3, formatter), value(row, 4, formatter), value(row, 5, formatter), value(row, 3, formatter), value(row, 4, formatter), value(row, 5, formatter),
value(row, 6, formatter).toUpperCase(Locale.ROOT), value(row, 7, formatter).toUpperCase(Locale.ROOT), value(row, 6, formatter).toUpperCase(Locale.ROOT), value(row, 7, formatter).toUpperCase(Locale.ROOT),
value(row, 8, formatter), value(row, 9, formatter), value(row, 10, formatter), value(row, 11, formatter), value(row, 8, formatter), value(row, 9, formatter), value(row, 10, formatter), value(row, 11, formatter),
value(row, 12, formatter), value(row, 13, formatter), value(row, 14, formatter).toUpperCase(Locale.ROOT), value(row, 15, formatter)); value(row, 12, formatter), value(row, 13, formatter).toUpperCase(Locale.ROOT), value(row, 14, formatter));
validate(tenantId, item, rows, errors); validate(tenantId, item, rows, errors);
rows.add(item); rows.add(item);
} }
warehouse/src/test/java/com/baiyue/warehouse/service/PartnerImportServiceTest.java
+4 -3
View File
@@ -40,7 +40,7 @@ class PartnerImportServiceTest {
void shouldImportValidMultiTypeRow() throws Exception { void shouldImportValidMultiTypeRow() throws Exception {
byte[] file = withRows(service.template(), new String[][] { byte[] file = withRows(service.template(), new String[][] {
{"CAR-100", "测试船公司", "CARRIER，SHIPPER", "张三", "13800138000", "test@example.com", {"CAR-100", "测试船公司", "CARRIER，SHIPPER", "张三", "13800138000", "test@example.com",
"CN", "广东省", "深圳市", "南山区", "测试路 1 号", "518000", "ACTIVE", "测试备注"} "MATSON", "CN", "广东省", "深圳市", "南山区", "测试路 1 号", "518000", "ACTIVE", "测试备注"}
}); });
PartnerImportResult result = service.importFile(0L, "partners.xlsx", file); PartnerImportResult result = service.importFile(0L, "partners.xlsx", file);
@@ -52,6 +52,7 @@ class PartnerImportServiceTest {
assertThat(captor.getValue().getTenantId()).isZero(); assertThat(captor.getValue().getTenantId()).isZero();
assertThat(captor.getValue().getDataScopeId()).isZero(); assertThat(captor.getValue().getDataScopeId()).isZero();
assertThat(captor.getValue().getTypes()).containsExactly("CARRIER", "SHIPPER"); assertThat(captor.getValue().getTypes()).containsExactly("CARRIER", "SHIPPER");
assertThat(captor.getValue().getCarrierCode()).isEqualTo("MATSON");
assertThat(captor.getValue().getRemark()).isEqualTo("测试备注"); assertThat(captor.getValue().getRemark()).isEqualTo("测试备注");
} }
@@ -59,8 +60,8 @@ class PartnerImportServiceTest {
@DisplayName("文件内任一错误时整批零写入并返回行号") @DisplayName("文件内任一错误时整批零写入并返回行号")
void shouldRejectWholeBatchWhenAnyRowIsInvalid() throws Exception { void shouldRejectWholeBatchWhenAnyRowIsInvalid() throws Exception {
byte[] file = withRows(service.template(), new String[][] { byte[] file = withRows(service.template(), new String[][] {
{"CAR-100", "测试船公司一", "CARRIER", "张三", "13800138000", "", "CN", "", "深圳市", "", "测试路 1 号", "", "ACTIVE", ""}, {"CAR-100", "测试船公司一", "CARRIER", "张三", "13800138000", "", "MATSON", "CN", "", "深圳市", "", "测试路 1 号", "", "ACTIVE", ""},
{"CAR-100", "测试单位二", "UNKNOWN", "李四", "13900139000", "bad-email", "C", "", "", "", "", "", "ENABLED", ""} {"CAR-100", "测试单位二", "UNKNOWN", "李四", "13900139000", "bad-email", "", "C", "", "", "", "", "", "ENABLED", ""}
}); });
PartnerImportResult result = service.importFile(0L, "partners.xlsx", file); PartnerImportResult result = service.importFile(0L, "partners.xlsx", file);