Merge remote-tracking branch 'origin/master' into feature/payment-apply-bfi-sync

# Conflicts: # blade-common/src/main/java/org/springblade/common/config/BladeCommonConfiguration.java # blade-service-api/blade-system-api/src/main/java/org/springblade/system/feign/ISysClient.java # blade-service-api/blade-system-api/src/main/java/org/springblade/system/feign/ISysClientFallback.java # blade-service/blade-system/src/main/java/org/springblade/system/feign/SysClient.java # blade-service/blade-transport/pom.xml # blade-service/blade-transport/src/main/java/org/springblade/transport/mapper/CustomerArchiveMapper.xml # blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/PaymentApplicationServiceImpl.java # blade-service/blade-transport/src/main/java/org/springblade/transport/wrapper/PaymentApplicationWrapper.java # blade-service/blade-transport/src/main/resources/application-dev.yml # blade-third-party-api/pom.xml # doc/nacos/blade-dev.yaml # doc/nacos/blade-prod.yaml # doc/nacos/third-party-api.yaml # pom.xml
2026-09-24 03:15:30 +08:00
parent 0d1c6cee64 f0732765cf
commit cae284483e
235 changed files with 15516 additions and 2569 deletions
@@ -308,12 +308,15 @@ CREATE TABLE `blade_dept`  (
  `mnemonic_code` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '助记码',
  `carrier_customer_id` bigint NULL DEFAULT NULL COMMENT '承运商客商档案主键',
  `is_platform_company` tinyint NOT NULL DEFAULT 0 COMMENT '是否平台公司：0否，1是',
+  `oa_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT 'OA主键',
+  `oa_sup_sub_com_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT 'OA上级主键',
  `sort` int NULL DEFAULT NULL COMMENT '排序',
  `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注',
  `status` int NULL DEFAULT 1 COMMENT '状态',
  `is_deleted` int NULL DEFAULT 0 COMMENT '是否已删除',
  PRIMARY KEY (`id`) USING BTREE,
-  UNIQUE KEY `uk_blade_dept_dept_code` (`dept_code`)
+  UNIQUE KEY `uk_blade_dept_dept_code` (`dept_code`),
+  INDEX `idx_blade_dept_oa_id` (`oa_id`) USING BTREE
 ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '机构表';

 -- ----------------------------
@@ -1757,6 +1760,7 @@ INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `s
 DROP TABLE IF EXISTS `blade_measurement_unit`;
 CREATE TABLE `blade_measurement_unit`  (
  `id` bigint NOT NULL COMMENT '主键',
+  `unit_code` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '计量单位编码',
  `unit_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '计量单位',
  `dimension` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '计量维度',
  `remark` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注',
@@ -1768,6 +1772,7 @@ CREATE TABLE `blade_measurement_unit`  (
  `status` int NULL DEFAULT 1 COMMENT '状态',
  `is_deleted` int NULL DEFAULT 0 COMMENT '是否已删除',
  PRIMARY KEY (`id`) USING BTREE,
+  UNIQUE INDEX `uk_measurement_unit_code`(`unit_code`) USING BTREE,
  UNIQUE INDEX `uk_measurement_unit_name`(`unit_name`) USING BTREE,
  INDEX `idx_measurement_unit_dimension`(`dimension`) USING BTREE,
  INDEX `idx_measurement_unit_status`(`status`) USING BTREE
@@ -8,6 +8,7 @@ CREATE TABLE `blade_customer_archive` (
  `customer_code` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '客商编号',
  `short_name` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '客商简称',
  `full_name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '客商全称',
+  `customer_kind` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT 'external' COMMENT '客商类型：external外部客商，internal内部组织',
  `customer_nature` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '客商性质',
  `guangxi_top100` tinyint NULL DEFAULT NULL COMMENT '是否广西百强：0否，1是',
  `unified_credit_code` varchar(18) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '统一社会信用代码',
@@ -93,6 +94,7 @@ CREATE TABLE `blade_customer_receipt_account` (
  `account_name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '收款方名称',
  `account_holder_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '开户人姓名',
  `bank_name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '开户行名称',
+  `cnaps_code` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '联行号',
  `bank_account` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '银行账号',
  `registered_phone` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '注册电话',
  `registered_address` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '注册地址',
@@ -0,0 +1,19 @@
+-- 客商档案：新增「客商类型」字段（external外部客商，internal内部组织）
+-- 历史数据默认外部客商；重复执行不会报重复列错误。
+
+SET @customer_archive_schema = DATABASE();
+
+SET @customer_archive_sql = (
+  SELECT IF(
+    COUNT(*) = 0,
+    'ALTER TABLE `blade_customer_archive` ADD COLUMN `customer_kind` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT ''external'' COMMENT ''客商类型：external外部客商，internal内部组织'' AFTER `full_name`',
+    'SELECT 1'
+  )
+  FROM information_schema.columns
+  WHERE table_schema = @customer_archive_schema
+    AND table_name = 'blade_customer_archive'
+    AND column_name = 'customer_kind'
+);
+PREPARE customer_archive_stmt FROM @customer_archive_sql;
+EXECUTE customer_archive_stmt;
+DEALLOCATE PREPARE customer_archive_stmt;
@@ -0,0 +1,4 @@
+-- 客商收款信息：新增联行号
+
+ALTER TABLE `blade_customer_receipt_account`
+  ADD COLUMN `cnaps_code` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '联行号' AFTER `bank_name`;
@@ -0,0 +1,6 @@
+-- 机构表：记录 OA 主键与上级 OA 主键，仅用于同步后重建组织层级，不用于前端展示
+
+ALTER TABLE `blade_dept`
+  ADD COLUMN `oa_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT 'OA主键' AFTER `is_platform_company`,
+  ADD COLUMN `oa_sup_sub_com_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT 'OA上级主键' AFTER `oa_id`,
+  ADD INDEX `idx_blade_dept_oa_id` (`oa_id`);
@@ -4,6 +4,7 @@
 DROP TABLE IF EXISTS `blade_measurement_unit`;
 CREATE TABLE `blade_measurement_unit` (
  `id` bigint NOT NULL COMMENT '主键',
+  `unit_code` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '计量单位编码',
  `unit_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '计量单位',
  `dimension` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '计量维度',
  `remark` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注',
@@ -15,6 +16,7 @@ CREATE TABLE `blade_measurement_unit` (
  `status` int NULL DEFAULT 1 COMMENT '状态',
  `is_deleted` int NULL DEFAULT 0 COMMENT '是否已删除',
  PRIMARY KEY (`id`) USING BTREE,
+  UNIQUE INDEX `uk_measurement_unit_code`(`unit_code`) USING BTREE,
  UNIQUE INDEX `uk_measurement_unit_name`(`unit_name`) USING BTREE,
  INDEX `idx_measurement_unit_dimension`(`dimension`) USING BTREE,
  INDEX `idx_measurement_unit_status`(`status`) USING BTREE
@@ -0,0 +1,11 @@
+-- 计量单位新增计量单位编码
+ALTER TABLE `blade_measurement_unit`
+  ADD COLUMN `unit_code` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '计量单位编码' AFTER `id`;
+
+UPDATE `blade_measurement_unit`
+SET `unit_code` = CONCAT('MU', `id`)
+WHERE `unit_code` IS NULL OR `unit_code` = '';
+
+ALTER TABLE `blade_measurement_unit`
+  MODIFY COLUMN `unit_code` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '计量单位编码',
+  ADD UNIQUE INDEX `uk_measurement_unit_code`(`unit_code`) USING BTREE;
@@ -57,7 +57,7 @@ CREATE TABLE `blade_transport_vehicle` (
  KEY `idx_transport_vehicle_road_end` (`road_transport_cert_end_date`) USING BTREE,
  KEY `idx_transport_vehicle_annual_end` (`annual_review_end_date`) USING BTREE,
  KEY `idx_transport_vehicle_status` (`status`) USING BTREE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='车辆管理';
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='车辆管理';

 -- ----------------------------
 -- Records of blade_menu for transport capacity vehicle
@@ -0,0 +1,4 @@
+-- 对齐车辆表字符串列排序规则，避免与 utf8mb4_general_ci 表 JOIN 报 Illegal mix of collations
+-- 背景：blade_transport_vehicle 建表未显式指定 COLLATE，MySQL 8 默认 utf8mb4_0900_ai_ci
+ALTER TABLE `blade_transport_vehicle`
+  CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;
@@ -0,0 +1,21 @@
+-- 小程序调度端入口权限码 mp_auth
+-- user-info 的 permission 来自按钮叶子 code；需把本菜单授权给调度/管理员角色
+-- 执行后：后台「角色管理 → 权限配置」勾选「小程序调度端」，或按需 INSERT blade_role_menu
+
+-- 父级菜单（小程序）
+INSERT IGNORE INTO `blade_menu`
+(`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`)
+VALUES
+(2091800000000000001, 0, 'miniprogram', '小程序', 'menu', '/miniprogram', 'iconfont iconicon_work', 98, 1, 0, 1, '', '小程序相关权限', 0);
+
+-- 按钮权限：mp_auth（叶子节点，会被 permissionCodes 收集）
+INSERT IGNORE INTO `blade_menu`
+(`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`)
+VALUES
+(2091800000000000002, 2091800000000000001, 'mp_auth', '小程序调度端', 'mp_auth', '', '', 1, 2, 0, 1, NULL, '登录后进入调度端首页', 0);
+
+-- 示例：给管理员角色（role_id 按环境实际调整，默认管理员 1123598816738675201）
+-- INSERT IGNORE INTO `blade_role_menu` (`id`, `menu_id`, `role_id`)
+-- VALUES
+-- (2091800000000000101, 2091800000000000001, 1123598816738675201),
+-- (2091800000000000102, 2091800000000000002, 1123598816738675201);
@@ -0,0 +1,8 @@
+-- 为小程序客户端授权类型补充微信小程序登录（wechat_applet）
+-- 执行后建议清客户端缓存 / 重启 blade-auth
+
+UPDATE blade_client
+SET authorized_grant_types = CONCAT(authorized_grant_types, ',wechat_applet')
+WHERE client_id IN ('saber3', 'saber', 'sword', 'rider')
+  AND FIND_IN_SET('wechat_applet', REPLACE(authorized_grant_types, ' ', '')) = 0
+  AND is_deleted = 0;