From e50954f0708ecbbc672352102ae3b24279d40cc1 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期四, 16 四月 2026 20:12:50 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/gtzxinglijicun
---
server/services/db/db_change.sql | 149 ++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 145 insertions(+), 4 deletions(-)
diff --git a/server/services/db/db_change.sql b/server/services/db/db_change.sql
index 7b8c6c1..eab5b91 100644
--- a/server/services/db/db_change.sql
+++ b/server/services/db/db_change.sql
@@ -5,10 +5,151 @@
-- ============================================================
+-- 2026/04/16 璁㈠崟缁撶畻鍔熻兘锛氱粨绠楁椂闂村瓧娈� + 闂ㄥ簵/鍙告満浣欓瀛楁
+-- ============================================================
+ALTER TABLE `orders` ADD COLUMN `SETTLEMENT_TIME` DATETIME DEFAULT NULL COMMENT '缁撶畻鏃堕棿' AFTER `SETTLEMENT_STATUS`;
+
+ALTER TABLE `shop_info` ADD COLUMN `BALANCE` BIGINT DEFAULT 0 COMMENT '褰撳墠浣欓(鍒�)' AFTER `DELIVERY_AREA`;
+ALTER TABLE `shop_info` ADD COLUMN `TOTAL_BALANCE` BIGINT DEFAULT 0 COMMENT '鍘嗗彶鎬婚噾棰�(鍒�)' AFTER `BALANCE`;
+
+ALTER TABLE `driver_info` ADD COLUMN `BALANCE` BIGINT DEFAULT 0 COMMENT '褰撳墠浣欓(鍒�)' AFTER `SCORE`;
+ALTER TABLE `driver_info` ADD COLUMN `TOTAL_BALANCE` BIGINT DEFAULT 0 COMMENT '鍘嗗彶鎬婚噾棰�(鍒�)' AFTER `BALANCE`;
+
+
+-- ============================================================
+-- 2026/04/16 鍙告満璇勫垎瀛楁 + 璁㈠崟璇勪环璁板綍琛�
+-- ============================================================
+ALTER TABLE `driver_info` ADD COLUMN `SCORE` DECIMAL(2,1) DEFAULT NULL COMMENT '鍙告満璇勫垎' AFTER `DRIVER_LEVEL`;
+
+CREATE TABLE `order_comment` (
+ `ID` INT NOT NULL AUTO_INCREMENT COMMENT '涓婚敭',
+ `DELETED` INT DEFAULT 0 COMMENT '鏄惁宸插垹闄� 0鏈垹闄� 1宸插垹闄�',
+ `CREATE_USER` INT DEFAULT NULL COMMENT '鍒涘缓浜虹紪鐮�',
+ `CREATE_TIME` DATETIME DEFAULT NULL COMMENT '鍒涘缓鏃堕棿',
+ `UPDATE_USER` INT DEFAULT NULL COMMENT '鏇存柊浜虹紪鐮�',
+ `UPDATE_TIME` DATETIME DEFAULT NULL COMMENT '鏇存柊鏃堕棿',
+ `REMARK` VARCHAR(500) DEFAULT NULL COMMENT '澶囨敞',
+ `ORDER_ID` INT NOT NULL COMMENT '鍏宠仈璁㈠崟涓婚敭',
+ `ORDER_CODE` VARCHAR(50) DEFAULT NULL COMMENT '璁㈠崟缂栧彿',
+ `MEMBER_ID` INT NOT NULL COMMENT '璇勪环浜�(浼氬憳)涓婚敭',
+ `TARGET_TYPE` INT NOT NULL COMMENT '璇勪环瀵硅薄绫诲瀷锛�1=瀛樹欢闂ㄥ簵锛�2=鍙栦欢闂ㄥ簵锛�3=鍙告満',
+ `TARGET_ID` INT NOT NULL COMMENT '璇勪环瀵硅薄涓婚敭(shop_info.id鎴杁river_info.id)',
+ `SCORE` INT NOT NULL COMMENT '璇勫垎1-5',
+ `CONTENT` VARCHAR(500) DEFAULT NULL COMMENT '璇勪环鍐呭',
+ PRIMARY KEY (`ID`)
+) COMMENT='璁㈠崟璇勪环璁板綍';
+
+
+-- ============================================================
+-- 2026/04/16 鏂板鍏朵粬璁㈠崟璁板綍琛�
+-- ============================================================
+CREATE TABLE `other_orders` (
+ `ID` int NOT NULL AUTO_INCREMENT COMMENT '涓婚敭',
+ `DELETED` tinyint DEFAULT NULL COMMENT '鏄惁宸插垹闄� 0鏈垹闄� 1宸插垹闄�',
+ `CREATE_USER` int DEFAULT NULL COMMENT '鍒涘缓浜虹紪鐮�',
+ `CREATE_TIME` datetime DEFAULT NULL COMMENT '鍒涘缓鏃堕棿',
+ `UPDATE_USER` int DEFAULT NULL COMMENT '鏇存柊浜虹紪鐮�',
+ `UPDATE_TIME` datetime DEFAULT NULL COMMENT '鏇存柊鏃堕棿',
+ `REMARK` varchar(2000) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '澶囨敞',
+ `TYPE` int DEFAULT NULL COMMENT '璁㈠崟绫诲瀷锛�0=搴楅摵鎶奸噾璁㈠崟;1=鍙告満鎶奸噾璁㈠崟;2=閫炬湡璐圭敤璁㈠崟;',
+ `OBJ_ID` int DEFAULT NULL COMMENT '鍏宠仈浼氬憳涓婚敭 搴楅摵銆佷細鍛�',
+ `PAY_ACCOUNT` bigint DEFAULT NULL COMMENT '瀹為檯鏀粯璐圭敤',
+ `PAY_STATUS` int DEFAULT NULL COMMENT '鏀粯鐘舵�侊細0=鏈敮浠�;1=宸叉敮浠�;',
+ `PAY_TIME` datetime DEFAULT NULL COMMENT '鏀粯鏃堕棿',
+ `CODE` varchar(20) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '璁㈠崟缂栧彿',
+ `WX_EXTERNAL_NO` varchar(100) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '寰俊骞冲彴浜ゆ槗璁㈠崟鍙�',
+ `ORDER_ID` int DEFAULT NULL COMMENT '鍏宠仈瀵勫瓨璁㈠崟涓婚敭',
+ `OUT_TRADE_NO` varchar(100) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '涓夋柟璁㈠崟鍙�',
+ PRIMARY KEY (`ID`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='鍏朵粬璁㈠崟璁板綍';
+
+
+-- ============================================================
+-- 2026/04/15 璁㈠崟琛ㄦ坊鍔犳牳閿�鐮佸瓧娈�
+-- ============================================================
+
+ALTER TABLE `orders` ADD COLUMN `MEMBER_VERIFY_CODE` VARCHAR(32) DEFAULT NULL COMMENT '浼氬憳璁㈠崟鏍搁攢鐮�' AFTER `OVERDUE_STATUS`;
+ALTER TABLE `orders` ADD COLUMN `DRIVER_VERIFY_CODE` VARCHAR(32) DEFAULT NULL COMMENT '鍙告満璁㈠崟鏍搁攢鐮�' AFTER `MEMBER_VERIFY_CODE`;
+
+
+-- ============================================================
+-- 2026/04/15 璁㈠崟琛ㄦ坊鍔犳槸鍚﹂�炬湡瀛楁
+-- ============================================================
+
+ALTER TABLE `orders` ADD COLUMN `OVERDUE_STATUS` TINYINT DEFAULT 0 COMMENT '鏄惁閫炬湡: 0=鍚� 1=鏄� 2=宸叉敮浠�' AFTER `OVERDUE_DAYS`;
+
+
+-- ============================================================
+-- 2026/04/15 璁㈠崟鐗╁搧鏄庣粏琛ㄦ坊鍔犲氨鍦板瓨鍙栧崟浠峰瓧娈�
+-- ============================================================
+
+ALTER TABLE `orders_detail` ADD COLUMN `LOCALLY_PRICE` BIGINT DEFAULT NULL COMMENT '灏卞湴瀛樺彇鍗曚环(鍒�/澶�)' AFTER `EXTRA_PRICE`;
+
+
+-- ============================================================
+-- 2026/04/14 闂ㄥ簵钀ヤ笟绫诲瀷瀛楁
+-- ============================================================
+
+ALTER TABLE `shop_info` ADD COLUMN `BUSINESS_TYPE` INT DEFAULT 0 COMMENT '闂ㄥ簵钀ヤ笟绫诲瀷锛�0=闈炲叏澶╋紱1=鍏ㄥぉ' AFTER `SHOP_HOURS`;
+
+
+-- ============================================================
+-- 2026/04/14 闂ㄥ簵淇℃伅缁存姢瀛楁
+-- ============================================================
+
+ALTER TABLE `shop_info` ADD COLUMN `COVER_IMG` VARCHAR(500) DEFAULT NULL COMMENT '闂ㄥ簵澶村儚' AFTER `PAY_MEMBER_OPEN_ID`;
+ALTER TABLE `shop_info` ADD COLUMN `CONTENT` TEXT DEFAULT NULL COMMENT '闂ㄥ簵浠嬬粛' AFTER `COVER_IMG`;
+ALTER TABLE `shop_info` ADD COLUMN `DEPOSIT_TYPES` VARCHAR(500) DEFAULT NULL COMMENT '瀵勫瓨绫诲瀷锛堥�楀彿鍒嗛殧鐨刢ategory涓婚敭锛�' AFTER `CONTENT`;
+ALTER TABLE `shop_info` ADD COLUMN `FEE_STANDARD` VARCHAR(500) DEFAULT NULL COMMENT '鏀惰垂鏍囧噯' AFTER `DEPOSIT_TYPES`;
+ALTER TABLE `shop_info` ADD COLUMN `DELIVERY_AREA` DECIMAL(10,2) DEFAULT NULL COMMENT '閰嶉�佽寖鍥�(km)' AFTER `FEE_STANDARD`;
+ALTER TABLE `shop_info` ADD COLUMN `SHOP_HOURS` VARCHAR(100) DEFAULT NULL COMMENT '钀ヤ笟鏃堕棿' AFTER `DELIVERY_AREA`;
+
+
+-- ============================================================
+-- 2026/04/13 鎻愮幇鐢宠鐢ㄦ埛绫诲瀷瀛楁
+-- ============================================================
+
+ALTER TABLE `withdrawal_orders` ADD COLUMN `MEMBER_TYPE` INT DEFAULT NULL COMMENT '鐢ㄦ埛绫诲瀷锛�1=鍙告満锛�2=搴楅摵' AFTER `MEMBER_ID`;
+
+
+-- ============================================================
+-- 2026/04/13 鎻愮幇鐢宠瀹℃壒瀛楁 + 瀹℃壒鏉冮檺
+-- ============================================================
+
+ALTER TABLE `withdrawal_orders` ADD COLUMN `USER_ID` INT DEFAULT NULL COMMENT '瀹℃壒鎿嶄綔浜猴紙鍏宠仈system_user锛�' AFTER `ALI_ACCOUNT`;
+ALTER TABLE `withdrawal_orders` ADD COLUMN `APPROVE_TIME` DATETIME DEFAULT NULL COMMENT '瀹℃壒鏃堕棿' AFTER `USER_ID`;
+ALTER TABLE `withdrawal_orders` ADD COLUMN `APPROVE_REMARK` VARCHAR(500) DEFAULT NULL COMMENT '瀹℃壒澶囨敞' AFTER `APPROVE_TIME`;
+
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `MODULE`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:withdrawalOrders:create', '鏂板缓鎻愮幇鐢宠', '鎻愮幇鐢宠', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `MODULE`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:withdrawalOrders:delete', '鍒犻櫎鎻愮幇鐢宠', '鎻愮幇鐢宠', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `MODULE`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:withdrawalOrders:update', '淇敼鎻愮幇鐢宠', '鎻愮幇鐢宠', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `MODULE`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:withdrawalOrders:query', '鏌ヨ鎻愮幇鐢宠', '鎻愮幇鐢宠', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `MODULE`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:withdrawalOrders:exportExcel', '瀵煎嚭鎻愮幇鐢宠(Excel)', '鎻愮幇鐢宠', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+
+
+-- ============================================================
+-- 2026/04/13 璁㈠崟閫�娆捐褰曟潈闄�
+-- ============================================================
+
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `MODULE`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:ordersRefund:create', '鏂板缓璁㈠崟閫�娆捐褰�', '璁㈠崟閫�娆捐褰�', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `MODULE`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:ordersRefund:delete', '鍒犻櫎璁㈠崟閫�娆捐褰�', '璁㈠崟閫�娆捐褰�', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `MODULE`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:ordersRefund:update', '淇敼璁㈠崟閫�娆捐褰�', '璁㈠崟閫�娆捐褰�', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `MODULE`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:ordersRefund:query', '鏌ヨ璁㈠崟閫�娆捐褰�', '璁㈠崟閫�娆捐褰�', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+
+
+-- ============================================================
+-- 2026/04/13 浼氬憳鍒楄〃涓庤鎯呮潈闄�
+-- ============================================================
+
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `MODULE`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:member:list', '鏌ヨ浼氬憳鍒楄〃', '浼氬憳绠＄悊', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `MODULE`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:member:listExport', '瀵煎嚭浼氬憳鍒楄〃(Excel)', '浼氬憳绠＄悊', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+
+
+-- ============================================================
-- 2026/04/13 璁㈠崟鏂板鍙栨秷澶囨敞瀛楁 + 璁㈠崟鏂囦欢璺緞瀛楀吀
-- ============================================================
-ALTER TABLE `orders` ADD COLUMN `cancel_remark` VARCHAR(500) DEFAULT NULL COMMENT '鍙栨秷澶囨敞' AFTER `cancel_time`;
+ALTER TABLE `orders` ADD COLUMN `CANCEL_REMARK` VARCHAR(500) DEFAULT NULL COMMENT '鍙栨秷澶囨敞' AFTER `CANCEL_TIME`;
INSERT INTO `system_dict_data`(`DICT_ID`, `CODE`, `LABEL`, `REMARK`, `SORT`, `DISABLED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`)
SELECT 100, '/orders/', 'ORDERS_FILES', '璁㈠崟鏂囦欢璺緞', 22, 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0
@@ -69,15 +210,15 @@
-- 2026/04/13 鏀粯瀹濇彁鐜拌处鎴峰瓧娈�
-- ============================================================
-ALTER TABLE `withdrawal_orders` ADD COLUMN `ali_account` VARCHAR(64) DEFAULT NULL COMMENT '鏀粯瀹濇彁鐜拌处鎴�' AFTER `out_bill_no`;
-ALTER TABLE `shop_info` ADD COLUMN `ali_account` VARCHAR(64) DEFAULT NULL COMMENT '鏀粯瀹濇彁鐜拌处鎴�' AFTER `delivery_area`;
+ALTER TABLE `withdrawal_orders` ADD COLUMN `ALI_ACCOUNT` VARCHAR(64) DEFAULT NULL COMMENT '鏀粯瀹濇彁鐜拌处鎴�' AFTER `OUT_BILL_NO`;
+ALTER TABLE `shop_info` ADD COLUMN `ALI_ACCOUNT` VARCHAR(64) DEFAULT NULL COMMENT '鏀粯瀹濇彁鐜拌处鎴�' AFTER `DELIVERY_AREA`;
-- ============================================================
-- 2026/04/13 杞挱鍥句笟鍔¤皟鏁�
-- ============================================================
-ALTER TABLE `banner` MODIFY COLUMN `title` VARCHAR(255) DEFAULT NULL COMMENT '鏍囬';
+ALTER TABLE `banner` MODIFY COLUMN `TITLE` VARCHAR(255) DEFAULT NULL COMMENT '鏍囬';
INSERT INTO `SYSTEM_DICT_DATA`(`TYPE`, `CODE`, `NAME`, `VALUE`, `REMARK`, `CREATE_TIME`, `DELETED`)
VALUES ('SYSTEM', 'BANNER_FILES', '杞挱鍥炬枃浠惰矾寰�', '/banner/', '杞挱鍥惧浘鐗囧瓨鍌ㄥ瓙璺緞', CURRENT_TIMESTAMP, 0);
--
Gitblit v1.9.3