优化

iam/src/main/resources/db/admin-prototype-menu-permissions.sql

@@ -22,11 +22,14 @@ VALUES
   (5105042,0,'PLATFORM','MENU',5105000,'platform:finance:customer-statement:list','客户对账单','/finance/customer-statements','GET',30,'ACTIVE',1,0),
   (5105043,0,'PLATFORM','MENU',5105000,'platform:finance:settlement-ar:list','结算单应收','/finance/settlement-receivables','GET',40,'ACTIVE',1,0),
   (5105044,0,'PLATFORM','MENU',5105000,'platform:finance:settlement-ap:list','结算单应付','/finance/settlement-payables','GET',50,'ACTIVE',1,0),
+  (5105045,0,'PLATFORM','MENU',5105000,'platform:finance:receivable-statistics:list','应收款统计表','/finance/receivable-statistics','GET',25,'ACTIVE',1,0),
   (5105050,0,'PLATFORM','BUTTON',5105040,'platform:finance:customer-account:export','导出客户账户',NULL,'POST',90,'ACTIVE',1,0),
   (5105051,0,'PLATFORM','BUTTON',5105041,'platform:finance:customer-arap:export','导出客户应收应付',NULL,'POST',90,'ACTIVE',1,0),
   (5105052,0,'PLATFORM','BUTTON',5105042,'platform:finance:customer-statement:export','导出客户对账单',NULL,'POST',90,'ACTIVE',1,0),
   (5105053,0,'PLATFORM','BUTTON',5105043,'platform:finance:settlement-ar:export','导出应收结算单',NULL,'POST',90,'ACTIVE',1,0),
-  (5105054,0,'PLATFORM','BUTTON',5105044,'platform:finance:settlement-ap:export','导出应付结算单',NULL,'POST',90,'ACTIVE',1,0)
+  (5105054,0,'PLATFORM','BUTTON',5105044,'platform:finance:settlement-ap:export','导出应付结算单',NULL,'POST',90,'ACTIVE',1,0),
+  (5105055,0,'PLATFORM','BUTTON',5105045,'platform:finance:receivable-statistics:export','导出应收款统计表',NULL,'POST',90,'ACTIVE',1,0),
+  (5205012,10001,'MERCHANT','BUTTON',5205000,'merchant:finance:statement:confirm','确认客户对账单',NULL,'POST',30,'ACTIVE',1,0)
 ON DUPLICATE KEY UPDATE
   permission_type=VALUES(permission_type), parent_id=VALUES(parent_id),
   permission_name=VALUES(permission_name), route_path=VALUES(route_path),
@@ -62,6 +65,7 @@ SELECT 0, r.id, p.id, CURRENT_TIMESTAMP(3)
      'platform:finance:settlement-ap:list','platform:finance:customer-account:export',
      'platform:finance:customer-arap:export','platform:finance:customer-statement:export',
      'platform:finance:settlement-ar:export','platform:finance:settlement-ap:export',
+     'platform:finance:receivable-statistics:list','platform:finance:receivable-statistics:export',
      'platform:download:list',
      'platform:firstleg:inbound:measure:view',
      'firstleg:inbound:measurement-review','platform:supplier:list',
@@ -83,7 +87,7 @@ UPDATE iam_permission p
 
 UPDATE iam_permission p
    JOIN (SELECT 'platform:finance:fee-source:review' code, 5105041 parent_id UNION ALL
-         SELECT 'platform:finance:fee-source:settlement', 5105041 UNION ALL
+         SELECT 'platform:finance:fee-source:edit', 5105041 UNION ALL
          SELECT 'platform:finance:reconciliation:create', 5105042 UNION ALL
          SELECT 'platform:finance:reconciliation:review', 5105042 UNION ALL
          SELECT 'platform:finance:reconciliation:issue', 5105042 UNION ALL
@@ -95,3 +99,10 @@ UPDATE iam_permission p
      ON mapping.code=p.permission_code
    SET p.parent_id=mapping.parent_id
  WHERE p.tenant_id=0 AND p.app_code='PLATFORM' AND p.permission_type='BUTTON';
+
+INSERT IGNORE INTO iam_role_permission (tenant_id, role_id, permission_id, created_at)
+SELECT 10001, r.id, p.id, CURRENT_TIMESTAMP(3)
+  FROM iam_role r
+  JOIN iam_permission p ON p.tenant_id=10001 AND p.app_code='MERCHANT'
+ WHERE r.tenant_id=10001 AND r.app_code='MERCHANT' AND r.role_code IN ('MERCHANT_OWNER','MERCHANT_ADMIN')
+   AND p.permission_code='merchant:finance:statement:confirm';

iam/src/main/resources/db/finance-g1-g2-permissions.sql

@@ -3,6 +3,14 @@
 USE baiyue_iam;
 SET NAMES utf8mb4;
 
+DELETE rp FROM iam_role_permission rp
+JOIN iam_permission p ON p.id=rp.permission_id AND p.tenant_id=rp.tenant_id
+WHERE p.tenant_id=0 AND p.app_code='PLATFORM'
+  AND p.permission_code IN ('platform:finance:fee-source:settlement','platform:finance:bill:create','platform:finance:bill:issue');
+DELETE FROM iam_permission
+WHERE tenant_id=0 AND app_code='PLATFORM'
+  AND permission_code IN ('platform:finance:fee-source:settlement','platform:finance:bill:create','platform:finance:bill:issue');
+
 DROP PROCEDURE IF EXISTS migrate_finance_g1_g2_permissions;
 DELIMITER $$
 CREATE PROCEDURE migrate_finance_g1_g2_permissions()
@@ -12,10 +20,10 @@ BEGIN
     FROM iam_permission
     WHERE (id = 5105000 AND permission_code <> 'platform:finance')
        OR (id = 5105024 AND permission_code <> 'platform:finance:fee-source:review')
-       OR (id = 5105025 AND permission_code <> 'platform:finance:fee-source:settlement')
+       OR (id = 5105025 AND permission_code <> 'platform:finance:fee-source:edit')
        OR (permission_code = 'platform:finance' AND id <> 5105000)
        OR (permission_code = 'platform:finance:fee-source:review' AND id <> 5105024)
-       OR (permission_code = 'platform:finance:fee-source:settlement' AND id <> 5105025)
+       OR (permission_code = 'platform:finance:fee-source:edit' AND id <> 5105025)
        OR (id IN (5105000, 5105024, 5105025)
            AND (tenant_id <> 0 OR app_code <> 'PLATFORM'))
   ) THEN
@@ -31,8 +39,8 @@ BEGIN
      '财务管理', '/finance', NULL, 60, 'ACTIVE', 1, 0),
     (5105024, 0, 'PLATFORM', 'BUTTON', 5105000, 'platform:finance:fee-source:review',
      '审核财务费用来源', NULL, 'POST', 150, 'ACTIVE', 1, 0),
-    (5105025, 0, 'PLATFORM', 'BUTTON', 5105000, 'platform:finance:fee-source:settlement',
-     '设置费用来源参与结算', NULL, 'PUT', 160, 'ACTIVE', 1, 0)
+    (5105025, 0, 'PLATFORM', 'BUTTON', 5105000, 'platform:finance:fee-source:edit',
+     '编辑财务费用来源', NULL, 'PUT', 160, 'ACTIVE', 1, 0)
   ON DUPLICATE KEY UPDATE
     permission_type = VALUES(permission_type), parent_id = VALUES(parent_id),
     permission_name = VALUES(permission_name), route_path = VALUES(route_path),
@@ -55,7 +63,7 @@ BEGIN
         AND deleted = 0
         AND permission_code IN (
           'platform:finance:fee-source:review',
-          'platform:finance:fee-source:settlement')) <> 2 THEN
+          'platform:finance:fee-source:edit')) <> 2 THEN
     SIGNAL SQLSTATE '45000'
       SET MESSAGE_TEXT = 'finance G1/G2 permission catalog is incomplete';
   END IF;

iam/src/test/java/com/baiyue/iam/repository/AdminPrototypeMenuPermissionSqlContractTest.java

@@ -13,12 +13,12 @@ class AdminPrototypeMenuPermissionSqlContractTest {
     private static final String[] FINANCE_MENUS = {
         "platform:finance:customer-account:list", "platform:finance:customer-arap:list",
         "platform:finance:customer-statement:list", "platform:finance:settlement-ar:list",
-        "platform:finance:settlement-ap:list"
+        "platform:finance:settlement-ap:list", "platform:finance:receivable-statistics:list"
     };
     private static final String[] FINANCE_EXPORTS = {
         "platform:finance:customer-account:export", "platform:finance:customer-arap:export",
         "platform:finance:customer-statement:export", "platform:finance:settlement-ar:export",
-        "platform:finance:settlement-ap:export"
+        "platform:finance:settlement-ap:export", "platform:finance:receivable-statistics:export"
     };
 
     @Test
@@ -32,6 +32,7 @@ class AdminPrototypeMenuPermissionSqlContractTest {
         }
         assertThat(sql)
             .contains("'platform:finance:fee-source:review' code, 5105041 parent_id")
+            .contains("'platform:finance:fee-source:edit', 5105041")
             .contains("'platform:finance:reconciliation:create', 5105042")
             .contains("'platform:finance:settlement-ar:create', 5105043")
             .contains("'platform:finance:settlement-ap:create', 5105044")
@@ -53,10 +54,11 @@ class AdminPrototypeMenuPermissionSqlContractTest {
             assertThat(unified).contains("(" + (5105050 + index) + ",0,'PLATFORM','BUTTON'," + (5105040 + index) + ",'" + FINANCE_EXPORTS[index] + "'");
         }
         assertThat(unified)
-            .contains("'platform:finance:settlement-ar:export','platform:finance:settlement-ap:export','platform:download:list'")
+            .contains("platform:finance:receivable-statistics:export")
             .contains("permission_code LIKE 'platform:finance:%' AND status='ACTIVE' AND deleted=0) <> 32")
             .contains("(p.permission_code='platform:finance' OR p.permission_code LIKE 'platform:finance:%')) <> 33")
             .contains("Finance 导出和下载中心授权不完整")
+            .contains("merchant:finance:statement:confirm")
             .satisfies(content -> assertThat(content.indexOf("(5105050,0,'PLATFORM','BUTTON'"))
                 .isLessThan(content.indexOf("CREATE PROCEDURE assert_finance_permissions()")));
     }

iam/src/test/java/com/baiyue/iam/repository/FinanceG1G2PermissionSqlContractTest.java

@@ -17,7 +17,7 @@ class FinanceG1G2PermissionSqlContractTest {
 
         assertThat(sql)
                 .contains("(5105024, 0, 'PLATFORM', 'BUTTON', 5105000, 'platform:finance:fee-source:review'")
-                .contains("(5105025, 0, 'PLATFORM', 'BUTTON', 5105000, 'platform:finance:fee-source:settlement'")
+                .contains("(5105025, 0, 'PLATFORM', 'BUTTON', 5105000, 'platform:finance:fee-source:edit'")
                 .contains("NULL, 'POST', 150, 'ACTIVE', 1, 0")
                 .contains("NULL, 'PUT', 160, 'ACTIVE', 1, 0")
                 .contains("ON DUPLICATE KEY UPDATE")
@@ -35,7 +35,7 @@ class FinanceG1G2PermissionSqlContractTest {
 
         assertThat(sql)
                 .contains("SIGNAL SQLSTATE '45000'")
-                .contains("permission_code = 'platform:finance:fee-source:settlement' AND id <> 5105025")
+                .contains("permission_code = 'platform:finance:fee-source:edit' AND id <> 5105025")
                 .contains("tenant_id <> 0 OR app_code <> 'PLATFORM'")
                 .contains("parent_id = 5105000")
                 .contains("permission_type = 'MENU'")
@@ -52,7 +52,7 @@ class FinanceG1G2PermissionSqlContractTest {
 
         assertThat(financeSection)
                 .contains("(5105024, 0, 'PLATFORM', 'BUTTON', 5105000, 'platform:finance:fee-source:review'")
-                .contains("(5105025, 0, 'PLATFORM', 'BUTTON', 5105000, 'platform:finance:fee-source:settlement'")
+                .contains("(5105025, 0, 'PLATFORM', 'BUTTON', 5105000, 'platform:finance:fee-source:edit'")
                 .contains("NULL, 'POST', 150, 'ACTIVE', 1, 0")
                 .contains("NULL, 'PUT', 160, 'ACTIVE', 1, 0")
                 .contains("permission_code IN (\n   'platform:finance',")
@@ -63,9 +63,9 @@ class FinanceG1G2PermissionSqlContractTest {
         assertThat(sql)
                 .contains("platform:finance:settlement-ar:list")
                 .contains("platform:finance:settlement-ap:list")
-                .contains("permission_code LIKE 'platform:finance:%' AND status='ACTIVE' AND deleted=0) <> 27")
+                .contains("permission_code LIKE 'platform:finance:%' AND status='ACTIVE' AND deleted=0) <> 32")
                 .contains("rp.role_id=4000001")
-                .contains("LIKE 'platform:finance:%')) <> 28")
+                .contains("LIKE 'platform:finance:%')) <> 33")
                 .contains("平台管理员 Finance 授权不完整");
     }