From 1c930a8b1ab9abdb851a486b2da55bcda34cd082 Mon Sep 17 00:00:00 2001 From: MrShi <1878285526@qq.com> Date: 星期二, 21 四月 2026 09:20:42 +0800 Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/gtzxinglijicun --- server/services/db/db_change.sql | 94 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 94 insertions(+), 0 deletions(-) diff --git a/server/services/db/db_change.sql b/server/services/db/db_change.sql index dacb433..b240fc2 100644 --- a/server/services/db/db_change.sql +++ b/server/services/db/db_change.sql @@ -5,6 +5,100 @@ -- ============================================================ +-- 2026/04/20 鍟嗘埛涓庡徃鏈哄鍔犳敮浠樺疂瀹炲悕濮撳悕瀛楁 +-- ============================================================ +ALTER TABLE `shop_info` ADD COLUMN `ALI_NAME` VARCHAR(50) DEFAULT NULL COMMENT '鏀粯瀹濆疄鍚嶅鍚�' AFTER `ALI_ACCOUNT`; +ALTER TABLE `driver_info` ADD COLUMN `ALI_ACCOUNT` VARCHAR(100) DEFAULT NULL COMMENT '鏀粯瀹濇彁鐜拌处鎴�' AFTER `LATITUDE`; +ALTER TABLE `driver_info` ADD COLUMN `ALI_NAME` VARCHAR(50) DEFAULT NULL COMMENT '鏀粯瀹濆疄鍚嶅鍚�' AFTER `ALI_ACCOUNT`; + + +-- ============================================================ +-- 2026/04/20 璁㈠崟閫�娆捐褰曡〃澧炲姞閫�娆剧姸鎬佸瓧娈� +-- ============================================================ +ALTER TABLE `orders_refund` ADD COLUMN `STATUS` INT DEFAULT 0 COMMENT '閫�娆剧姸鎬侊細0=閫�娆句腑锛�1=閫�娆炬垚鍔燂紱2=閫�娆惧け璐�' AFTER `REFUND_REMARK`; + + +-- ============================================================ +-- 2026/04/20 璁㈠崟琛ㄥ鍔犵墿鍝佺骇鍒瓧娈� +-- ============================================================ +ALTER TABLE `orders` ADD COLUMN `GOOD_LEVEL` INT DEFAULT NULL COMMENT '鐗╁搧绾у埆锛坈ategory涓婚敭锛宼ype=3锛�' AFTER `GOOD_TYPE`; + + +-- ============================================================ +-- 2026/04/17 璁㈠崟棰勮閫佽揪鏃堕棿瀛楁 +-- ============================================================ +ALTER TABLE `orders` ADD COLUMN `ESTIMATED_DELIVERY_TIME` DATETIME DEFAULT NULL COMMENT '棰勮閫佽揪鏃堕棿' AFTER `CODE`; + + +-- ============================================================ +-- 2026/04/17 鍙告満瀹炴椂瀹氫綅瀛楁 +-- ============================================================ +ALTER TABLE `driver_info` ADD COLUMN `LONGITUDE` DOUBLE DEFAULT NULL COMMENT '瀹氫綅缁忓害' AFTER `ACCEPTING_STATUS`; +ALTER TABLE `driver_info` ADD COLUMN `LATITUDE` DOUBLE DEFAULT NULL COMMENT '瀹氫綅绾害' AFTER `LONGITUDE`; + + +-- ============================================================ +-- 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`; +ALTER TABLE `driver_info` ADD COLUMN `ACCEPTING_STATUS` INT DEFAULT 0 COMMENT '鏄惁鎺ュ崟涓細0=鏈帴鍗曪紱1=鎺ュ崟涓�' AFTER `TOTAL_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 璁㈠崟琛ㄦ坊鍔犳牳閿�鐮佸瓧娈� -- ============================================================ -- Gitblit v1.9.3