From 59b1f0e9967902aa10f5e017d5a0bdfd1b60c9ea Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期三, 29 四月 2026 09:42:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/services/db/db_change.sql | 111 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 111 insertions(+), 0 deletions(-)
diff --git a/server/services/db/db_change.sql b/server/services/db/db_change.sql
index eab5b91..2d5ddb2 100644
--- a/server/services/db/db_change.sql
+++ b/server/services/db/db_change.sql
@@ -5,6 +5,116 @@
-- ============================================================
+-- 2026/04/28 APP鐗堟湰鏂囦欢璺緞瀛楀吀
+-- ============================================================
+INSERT INTO `system_dict_data` (`DICT_ID`, `CODE`, `LABEL`, `REMARK`, `SORT`, `DISABLED`, `CREATE_USER`, `CREATE_TIME`, `DELETED`) VALUES ((SELECT `id` FROM `system_dict` WHERE `code` = 'OSS'), '', 'APP_FILES', 'APP鐗堟湰鏂囦欢璺緞', 0, 0, 1, NOW(), 0);
+
+
+-- ============================================================
+-- 2026/04/28 鎵撳嵃鏈轰俊鎭〃 + 鏉冮檺
+-- ============================================================
+
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `MODULE`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:printerInfo: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:printerInfo: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:printerInfo: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:printerInfo:query', '鏌ヨ鎵撳嵃鏈�', '鎵撳嵃鏈轰俊鎭�', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+
+
+
+-- ============================================================
+-- 2026/04/28 鑺儴浜戞墦鍗版満闆嗘垚锛氶棬搴楄〃澧炲姞鎵撳嵃鏈篠N瀛楁
+-- ============================================================
+ALTER TABLE `shop_info` ADD COLUMN `PRINTER_SN` VARCHAR(64) DEFAULT NULL COMMENT '鑺儴浜戞墦鍗版満SN缂栧彿' AFTER `BUSINESS_TYPE`;
+
+
+-- ============================================================
+-- 2026/04/28 鑺儴浜戞墦鍗版満閰嶇疆瀛楀吀锛堣处鍙蜂俊鎭悗缁墜鍔ㄧ淮鎶ODE鍊硷級
+-- ============================================================
+INSERT INTO `system_dict` (`id`, `code`, `name`, `disabled`, `deleted`) VALUES (106, 'XPYUN_CONFIG', '鑺儴浜戦厤缃�', 0, 0);
+INSERT INTO `system_dict_data` (`DICT_ID`, `CODE`, `LABEL`, `REMARK`, `SORT`, `DISABLED`, `CREATE_USER`, `CREATE_TIME`, `DELETED`) VALUES (106, '', 'XPYUN_USER', '鑺儴浜戝紑鍙戣�匢D', 0, 0, 1, NOW(), 0);
+INSERT INTO `system_dict_data` (`DICT_ID`, `CODE`, `LABEL`, `REMARK`, `SORT`, `DISABLED`, `CREATE_USER`, `CREATE_TIME`, `DELETED`) VALUES (106, '', 'XPYUN_USER_KEY', '鑺儴浜戝紑鍙戣�呭瘑閽�', 1, 0, 1, NOW(), 0);
+
+
+-- ============================================================
+-- 2026/04/22 璁㈠崟閫�娆捐〃鏂板閫�娆惧墠璁㈠崟鐘舵�佸瓧娈�
+-- ============================================================
+ALTER TABLE `orders_refund` ADD COLUMN `BEFORE_STATUS` INT NULL DEFAULT NULL COMMENT '閫�娆惧墠璁㈠崟鐘舵��' AFTER `STATUS`;
+
+
+-- ============================================================
+-- 2026/04/22 璁㈠崟閫�娆捐〃鏂板閫�娆鹃噾棰濆瓧娈�
+-- ============================================================
+ALTER TABLE `orders_refund` ADD COLUMN `REFUND_AMOUNT` BIGINT NULL DEFAULT NULL COMMENT '閫�娆鹃噾棰濓紙鍒嗭級' AFTER `REFUND_REMARK`;
+
+
+-- ============================================================
+-- 2026/04/22 鏂板璁㈠崟鑷姩缁撶畻瀹氭椂浠诲姟
+-- ============================================================
+INSERT INTO `SYSTEM_JOB` VALUES (4, '璁㈠崟鑷姩缁撶畻', '鏍规嵁杩愯惀閰嶇疆SETTLEMENT_DATE锛屽皢宸插畬鎴愮殑寰呯粨绠楄鍗曡繘琛岀粨绠�', 'settleOrdersJob', NULL, NULL, 1, 0, 1, 1, '0 0 2 * * ?', '', 0, NULL, 0, 1, NOW(), NULL, NULL, 0);
+
+
+-- ============================================================
+-- 2026/04/22 杩愯惀閰嶇疆鏂板鏃犱汉鎶㈠崟閫氱煡鏃堕棿鍜岄�氱煡浜哄憳
+-- ============================================================
+INSERT INTO `SYSTEM_DICT_DATA` (`DICT_ID`, `CODE`, `LABEL`, `SORT`, `DISABLED`, `CREATE_USER`, `CREATE_TIME`, `DELETED`) VALUES (105, '30', 'NO_GRAB_NOTIFY_TIME', 0, 0, 1, NOW(), 0);
+INSERT INTO `SYSTEM_DICT_DATA` (`DICT_ID`, `CODE`, `LABEL`, `SORT`, `DISABLED`, `CREATE_USER`, `CREATE_TIME`, `DELETED`) VALUES (105, '', 'NO_GRAB_NOTIFY_USERS', 0, 0, 1, NOW(), 0);
+
+
+-- ============================================================
+-- 2026/04/22 璁㈠崟琛ㄥ鍔犳棤浜烘帴鍗曟槸鍚﹀凡鐭俊閫氱煡骞冲彴瀛楁
+-- ============================================================
+ALTER TABLE `orders` ADD COLUMN `PLATFORM_SMS_NOTIFIED` INT DEFAULT 0 COMMENT '鏃犱汉鎺ュ崟鏄惁宸茬煭淇￠�氱煡骞冲彴锛�0=鍚︼紱1=鏄�' AFTER `OUT_TRADE_NO`;
+ALTER TABLE `orders` ADD COLUMN `PLATFORM_SMS_NOTIFIED_TIME` DATETIME DEFAULT NULL COMMENT '鏃犱汉鎺ュ崟宸茬煭淇￠�氱煡骞冲彴鏃堕棿' AFTER `PLATFORM_SMS_NOTIFIED`;
+
+
+-- ============================================================
+-- 2026/04/22 鏂板璁㈠崟鐩稿叧瀹氭椂浠诲姟锛堜笁涓嫭绔嬩换鍔★級
+-- ============================================================
+INSERT INTO `SYSTEM_JOB` VALUES (3, '瓒呮椂鍙栨秷璁㈠崟', '鏍规嵁杩愯惀閰嶇疆AUTO_CANCEL_TIME锛堝垎閽燂級锛屽彇娑堣秴鏃舵湭鏀粯璁㈠崟', 'cancelTimeoutOrderJob', NULL, NULL, 1, 0, 1, 1, '0 */1 * * * ?', '', 0, NULL, 0, 1, NOW(), NULL, NULL, 0);
+INSERT INTO `SYSTEM_JOB` VALUES (5, '鏃犱汉鎶㈠崟閫氱煡', '鏍规嵁杩愯惀閰嶇疆NO_GRAB_NOTIFY_TIME锛堝垎閽燂級锛屽宸插瘎瀛樹笖鏃犱汉鎶㈠崟鐨勮鍗曞彂閫佺煭淇￠�氱煡骞冲彴浜哄憳', 'noGrabNotifyJob', NULL, NULL, 1, 0, 1, 1, '0 */1 * * * ?', '', 0, NULL, 0, 1, NOW(), NULL, NULL, 0);
+INSERT INTO `SYSTEM_JOB` VALUES (6, '鑷姩瀹屾垚璁㈠崟', '鏍规嵁杩愯惀閰嶇疆AUTO_CONFIRM_RECEIPT锛堝ぉ锛夛紝鑷姩瀹屾垚瓒呮椂鏈‘璁ょ殑宸查�佽揪璁㈠崟', 'autoCompleteOrderJob', NULL, NULL, 1, 0, 1, 1, '0 0 */1 * * ?', '', 0, NULL, 0, 1, NOW(), NULL, NULL, 0);
+
+
+-- ============================================================
+-- 2026/04/22 鎻愮幇璁板綍琛ㄥ鍔犳敮浠樺疂瀹炲悕濮撳悕瀛楁
+-- ============================================================
+ALTER TABLE `withdrawal_orders` ADD COLUMN `ALI_NAME` VARCHAR(50) DEFAULT NULL COMMENT '鏀粯瀹濆疄鍚嶅鍚�' AFTER `ALI_ACCOUNT`;
+
+
+-- ============================================================
+-- 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`;
@@ -14,6 +124,7 @@
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`;
-- ============================================================
--
Gitblit v1.9.3