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

Merge test fixes into dev dropship flow

Browse Source
This commit is contained in:
ouyangxq
2026-09-10 18:18:41 +08:00
parent 630150a7c7 56d555668d
commit 2fc2fca9fd
131 changed files with 3062 additions and 651 deletions
Download Patch File Download Diff File Expand all files Collapse all files
order/src/main/resources/db/platform-order-declaration-edit.sql
+2 -15
View File
@@ -5,18 +5,5 @@ ALTER TABLE ord_order
ADD COLUMN expected_arrival_at DATETIME(3) NULL COMMENT '客户申报预计到货时间' AFTER expected_ship_date,
ADD COLUMN channel_changed TINYINT(1) NOT NULL DEFAULT 0 COMMENT '订单历史上是否由平台变更过渠道' AFTER channel_name;
USE baiyue_iam;
INSERT INTO iam_permission
(id, tenant_id, app_code, permission_type, parent_id, permission_code, permission_name,
route_path, http_method, sort_no, status, deleted)
VALUES
(5102027, 0, 'PLATFORM', 'BUTTON', 5102010, 'platform:order:declaration:edit',
'修改客户申报资料', NULL, NULL, 121, 'ACTIVE', 0)
ON DUPLICATE KEY UPDATE permission_name = VALUES(permission_name), parent_id = VALUES(parent_id),
sort_no = VALUES(sort_no), status = 'ACTIVE', deleted = 0;
INSERT INTO iam_role_permission (role_id, permission_id, tenant_id)
SELECT role_id, 5102027, 0
FROM (SELECT 4000001 AS role_id UNION ALL SELECT 4000003 AS role_id) roles
ON DUPLICATE KEY UPDATE tenant_id = VALUES(tenant_id);
-- IAM 权限不再与 Order 表结构混合；模块来源见
-- iam/src/main/resources/db/order-declaration-planning-permission.sql。
order/src/test/java/com/baiyue/order/controller/DomesticWarehouseOrderExportPermissionSqlContractTest.java
+2 -2
View File
@@ -28,9 +28,9 @@ class DomesticWarehouseOrderExportPermissionSqlContractTest {
.contains("platform:download:list")
.contains("4000003");
}
assertThat(iamSeed).contains("WHERE id IN (5102019, 5102024, 5102025, 5102026)");
assertThat(iamSeed).contains("WHERE id IN (5102019, 5102024, 5102025, 5102026, 5102027)");
assertThat(unified)
.contains("WHERE id IN (5102019, 5102024, 5102025, 5102026)")
.contains("WHERE id IN (5102019, 5102024, 5102025, 5102026, 5102027)")
.contains("管理员或订单运营角色缺少订单导出与下载中心权限");
}
order/src/test/java/com/baiyue/order/controller/OrderDeclarationUpdateContractTest.java
+9 -1
View File
@@ -95,12 +95,20 @@ class OrderDeclarationUpdateContractTest {
Path direct = Path.of("deploy", "sql", "头程数据库统一增量-MySQL8.sql");
Path unified = Files.exists(direct) ? direct : Path.of("..", "deploy", "sql", "头程数据库统一增量-MySQL8.sql");
String source = Files.readString(unified, StandardCharsets.UTF_8);
Path iamDirect = Path.of("iam", "src", "main", "resources", "db", "phase1-admin-rbac.sql");
Path iam = Files.exists(iamDirect) ? iamDirect : Path.of("..").resolve(iamDirect);
String iamSource = Files.readString(iam, StandardCharsets.UTF_8);
assertThat(source)
.contains("expected_arrival_at DATETIME(3) NULL COMMENT '客户申报预计到货时间'")
.contains("channel_changed TINYINT(1) NOT NULL DEFAULT 0 COMMENT '订单历史上是否由平台变更过渠道'")
.contains("CALL unified_assert_column('baiyue_order', 'ord_order', 'expected_arrival_at')")
.contains("CALL unified_assert_column('baiyue_order', 'ord_order', 'channel_changed')");
.contains("CALL unified_assert_column('baiyue_order', 'ord_order', 'channel_changed')")
.contains("platform:order:declaration:edit")
.contains("WHERE id IN (5102019, 5102024, 5102025, 5102026, 5102027)");
assertThat(iamSource)
.contains("platform:order:declaration:edit")
.contains("WHERE id IN (5102019, 5102024, 5102025, 5102026, 5102027)");
}
@SuppressWarnings("unchecked")