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

merge: integrate TEST updates and verify appointment release

Browse Source
This commit is contained in:
ouyangxq
2026-10-15 17:08:30 +08:00
parent a1d5ebdab2 628b1a5732
commit 4f9a63fb01
72 changed files with 2804 additions and 164 deletions
Download Patch File Download Diff File Expand all files Collapse all files
iam/src/main/resources/db/lastleg-permissions.sql
+6 -2
View File
@@ -142,6 +142,7 @@ VALUES
(5306180,0,'MERCHANT','MENU',0,'merchant:overseas-warehouse:discard:list','货物废弃','/overseas-warehouse/cargo-disposal','GET',130,'ACTIVE',1,0),
(5306181,0,'MERCHANT','BUTTON',5306180,'merchant:overseas-warehouse:discard:create','创建货物废弃申请',NULL,'POST',10,'ACTIVE',1,0),
(5306182,0,'MERCHANT','BUTTON',5306180,'merchant:overseas-warehouse:discard:cancel','取消货物废弃申请',NULL,'POST',20,'ACTIVE',1,0),
(5306183,0,'MERCHANT','BUTTON',5306180,'merchant:overseas-warehouse:discard:confirm','确认废弃完成',NULL,'POST',30,'ACTIVE',1,0),
(5306190,0,'MERCHANT','MENU',0,'merchant:overseas-warehouse:return-order:list','退货换标','/overseas-warehouse/return-relabel','GET',140,'ACTIVE',1,0),
(5306191,0,'MERCHANT','BUTTON',5306190,'merchant:overseas-warehouse:return-order:create','创建退货预报',NULL,'POST',10,'ACTIVE',1,0),
(5306192,0,'MERCHANT','BUTTON',5306190,'merchant:overseas-warehouse:return-order:relabel','退货转换标申请',NULL,'POST',20,'ACTIVE',1,0)
@@ -336,6 +337,7 @@ JOIN iam_permission permission ON permission.tenant_id=0 AND permission.app_code
'merchant:overseas-warehouse:discard:list',
'merchant:overseas-warehouse:discard:create',
'merchant:overseas-warehouse:discard:cancel',
'merchant:overseas-warehouse:discard:confirm',
'merchant:overseas-warehouse:return-order:list',
'merchant:overseas-warehouse:return-order:create',
'merchant:overseas-warehouse:return-order:relabel'
@@ -371,9 +373,10 @@ BEGIN
'merchant:overseas-warehouse:discard:list',
'merchant:overseas-warehouse:discard:create',
'merchant:overseas-warehouse:discard:cancel',
'merchant:overseas-warehouse:discard:confirm',
'merchant:overseas-warehouse:return-order:list',
'merchant:overseas-warehouse:return-order:create',
'merchant:overseas-warehouse:return-order:relabel')) <> 24 THEN
'merchant:overseas-warehouse:return-order:relabel')) <> 25 THEN
SIGNAL SQLSTATE '45000' SET MESSAGE_TEXT='海外客户权限初始化失败：权限资源不完整';
END IF;
IF (SELECT COUNT(*) FROM iam_role_permission grant_row
@@ -405,9 +408,10 @@ BEGIN
'merchant:overseas-warehouse:discard:list',
'merchant:overseas-warehouse:discard:create',
'merchant:overseas-warehouse:discard:cancel',
'merchant:overseas-warehouse:discard:confirm',
'merchant:overseas-warehouse:return-order:list',
'merchant:overseas-warehouse:return-order:create',
'merchant:overseas-warehouse:return-order:relabel')) <> 24 THEN
'merchant:overseas-warehouse:return-order:relabel')) <> 25 THEN
SIGNAL SQLSTATE '45000' SET MESSAGE_TEXT='海外客户权限初始化失败：客户默认管理员授权不完整';
END IF;
END$$
iam/src/test/java/com/baiyue/iam/repository/MerchantReturnInventoryPermissionSqlContractTest.java
+1 -1
View File
@@ -20,7 +20,7 @@ class MerchantReturnInventoryPermissionSqlContractTest {
assertThat(sql).contains(
"(5306140,0,'MERCHANT','MENU',0,'" + PERMISSION + "','退货库存'",
"role.role_code='MERCHANT_OWNER'",
")) <> 24 THEN",
")) <> 25 THEN",
"客户默认管理员授权不完整");
int grantStart = sql.indexOf("-- 客户默认管理员获得当前客户海外业务入口");
iam/src/test/java/com/baiyue/iam/repository/OverseasCustomerPermissionSqlContractTest.java
+2 -1
View File
@@ -36,6 +36,7 @@ class OverseasCustomerPermissionSqlContractTest {
"merchant:overseas-warehouse:discard:list",
"merchant:overseas-warehouse:discard:create",
"merchant:overseas-warehouse:discard:cancel",
"merchant:overseas-warehouse:discard:confirm",
"merchant:overseas-warehouse:return-order:list",
"merchant:overseas-warehouse:return-order:create",
"merchant:overseas-warehouse:return-order:relabel");
@@ -85,7 +86,7 @@ class OverseasCustomerPermissionSqlContractTest {
"海外客户权限初始化失败：客户默认管理员授权不完整",
"permission.app_code='MERCHANT'",
"role.role_code='MERCHANT_OWNER'",
")) <> 24 THEN");
")) <> 25 THEN");
}
@Test