From eb7a808aaf7dd0a6dd2ff70f9ef3f8ce0b1e31d1 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期五, 22 五月 2026 18:27:32 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/gtzxinglijicun
---
server/services/db/db_change.sql | 122 ++++++++++++++++++++++++++++++++++++++++
1 files changed, 120 insertions(+), 2 deletions(-)
diff --git a/server/services/db/db_change.sql b/server/services/db/db_change.sql
index 17ff86d..a1ac752 100644
--- a/server/services/db/db_change.sql
+++ b/server/services/db/db_change.sql
@@ -2,7 +2,125 @@
-- 鏁版嵁搴撳彉鏇磋剼鏈紙鍏ㄩ儴鍙樻洿缁熶竴璁板綍鍦ㄦ鏂囦欢锛�
-- 鎸夋棩鏈熷�掑簭鎺掑垪锛屾瘡娆″彉鏇寸敤鏃ユ湡娉ㄩ噴鍧楀垎闅�
-- ============================================================
+-- 2026/05/18 杩愯惀閰嶇疆澧炲姞鍙戠エ寮�鍏锋湀浠介檺鍒�
+-- ============================================================
+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` = 'OPERATION_CONFIG'), '12', 'INVOICE_MONTH_LIMIT', '鍙戠エ寮�鍏锋湀浠介檺鍒讹紙鏈堬級', 0, 0, 1, NOW(), 0);
+-- ============================================================
+-- 2026/05/18 杩愯惀閰嶇疆澧炲姞娉ㄥ唽瀹屾垚璁㈠崟濂栧姳銆佸钩鍙板畬鎴愯鍗曞鍔�
+-- ============================================================
+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` = 'OPERATION_CONFIG'), '0', 'REGISTER_REWARD_ORDER_COUNT', '娉ㄥ唽瀹屾垚璁㈠崟濂栧姳鍗曟暟', 0, 0, 1, NOW(), 0);
+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` = 'OPERATION_CONFIG'), '0', 'REGISTER_REWARD_AMOUNT', '娉ㄥ唽瀹屾垚璁㈠崟濂栧姳閲戦锛堝垎锛�', 0, 0, 1, NOW(), 0);
+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` = 'OPERATION_CONFIG'), '0', 'PLATFORM_REWARD_ORDER_COUNT', '骞冲彴瀹屾垚璁㈠崟濂栧姳鍗曟暟', 0, 0, 1, NOW(), 0);
+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` = 'OPERATION_CONFIG'), '0', 'PLATFORM_REWARD_AMOUNT', '骞冲彴瀹屾垚璁㈠崟濂栧姳閲戦锛堝垎锛�', 0, 0, 1, NOW(), 0);
+
+-- ============================================================
+-- 2026/05/18 璁㈠崟琛ㄥ鍔犻棬搴楀紓甯歌ˉ鍋块噾棰濆瓧娈�
+-- ============================================================
+ALTER TABLE `orders` ADD COLUMN `SHOP_COMPENSATION_AMOUNT` bigint DEFAULT NULL COMMENT '闂ㄥ簵寮傚父琛ュ伩閲戦锛堝垎锛�' AFTER `INVOICE_STATUS`;
+
+-- ============================================================
+-- 2026/05/18 鍙戠エ璁板綍琛ㄥ鍔犲彂绁ㄥ彿鐮併�佽鍗曠紪鍙枫�佸紑绁ㄩ偖绠便�佸彂绁≒DF key瀛楁
+-- ============================================================
+ALTER TABLE `invoice_record` ADD COLUMN `ORDER_NO` varchar(50) DEFAULT NULL COMMENT '璁㈠崟缂栧彿' AFTER `MEMBER_ID`;
+ALTER TABLE `invoice_record` ADD COLUMN `INVOICE_NO` varchar(50) DEFAULT NULL COMMENT '鍙戠エ鍙风爜' AFTER `ORDER_NO`;
+ALTER TABLE `invoice_record` ADD COLUMN `EMAIL` varchar(100) DEFAULT NULL COMMENT '寮�绁ㄩ偖绠�' AFTER `FILE_ADDR`;
+ALTER TABLE `invoice_record` ADD COLUMN `INVOICE_PDF_KEY` varchar(200) DEFAULT NULL COMMENT '鍙戠エPDF鏂囦欢KEY' AFTER `EMAIL`;
+
+-- ============================================================
+-- 2026/05/18 璁㈠崟澧炲姞鍙戠エ鐘舵�佸瓧娈� & 鍙戠エ鐢宠璁板綍琛�
+-- ============================================================
+ALTER TABLE `orders` ADD COLUMN `INVOICE_STATUS` int DEFAULT NULL COMMENT '鍙戠エ鐘舵�侊細0=涓嶅彲鐢宠锛�1=鍙敵璇凤紱2=鐢宠涓紱3=寮�鍏锋垚鍔燂紱99=寮�鍏峰け璐�' AFTER `MANUAL_REFUND`;
+
+CREATE TABLE `invoice_record` (
+ `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) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '澶囨敞',
+ `ORDER_ID` int DEFAULT NULL COMMENT '璁㈠崟涓婚敭锛堝叧鑱攐rders锛�',
+ `MEMBER_ID` int DEFAULT NULL COMMENT '浼氬憳涓婚敭',
+ `ORDER_NO` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '璁㈠崟缂栧彿',
+ `INVOICE_NO` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '鍙戠エ鍙风爜',
+ `ORG_TYPE` int DEFAULT NULL COMMENT '缁勭粐绫诲瀷锛�0=涓汉/浜嬩笟鍗曚綅锛�1=浼佷笟',
+ `INVOICE_TYPE` int DEFAULT NULL COMMENT '鍙戠エ绫诲瀷锛�0=鐢靛瓙鏅�氬彂绁紱1=鐢靛瓙涓撶敤鍙戠エ',
+ `NAME` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '鍙戠エ鎶ご',
+ `TAX_ID` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '绋庡彿',
+ `BANK_NAME` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '寮�鎴烽摱琛�',
+ `BANK_ACCOUNT` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '閾惰璐﹀彿',
+ `COMPANY_ADDR` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '浼佷笟鍦板潃(ORG_TYPE=1)',
+ `COMPANY_PHONE` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '浼佷笟鐢佃瘽(ORG_TYPE=1)',
+ `INVOICE_AMOUNT` bigint DEFAULT NULL COMMENT '鍙戠エ閲戦',
+ `STATUS` int DEFAULT NULL COMMENT '鐢宠鐘舵�侊細0=鐢宠涓紱1=寮�鍏锋垚鍔燂紱99=寮�鍏峰け璐�',
+ `FILE_ADDR` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '鍙戠エ鏂囦欢鍦板潃',
+ PRIMARY KEY (`ID`) USING BTREE
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC COMMENT='鍙戠エ鐢宠璁板綍';
+
+-- ============================================================
+-- 2026/05/15 鍙告満濂栧姳瑙勫垯閰嶇疆
+-- ============================================================
+INSERT INTO `SYSTEM_DICT_DATA` (`DICT_ID`, `CODE`, `LABEL`, `REMARK`, `SORT`, `DISABLED`, `CREATE_USER`, `CREATE_TIME`, `DELETED`) VALUES (105, '', 'REGISTER_REWARD_ORDER_COUNT', '娉ㄥ唽瀹屾垚璁㈠崟濂栧姳鍗曟暟', 0, 0, 1, NOW(), 0);
+INSERT INTO `SYSTEM_DICT_DATA` (`DICT_ID`, `CODE`, `LABEL`, `REMARK`, `SORT`, `DISABLED`, `CREATE_USER`, `CREATE_TIME`, `DELETED`) VALUES (105, '', 'REGISTER_REWARD_AMOUNT', '娉ㄥ唽瀹屾垚璁㈠崟濂栧姳閲戦锛堝垎锛�', 0, 0, 1, NOW(), 0);
+INSERT INTO `SYSTEM_DICT_DATA` (`DICT_ID`, `CODE`, `LABEL`, `REMARK`, `SORT`, `DISABLED`, `CREATE_USER`, `CREATE_TIME`, `DELETED`) VALUES (105, '', 'PLATFORM_REWARD_ORDER_COUNT', '骞冲彴瀹屾垚璁㈠崟濂栧姳鍗曟暟', 0, 0, 1, NOW(), 0);
+INSERT INTO `SYSTEM_DICT_DATA` (`DICT_ID`, `CODE`, `LABEL`, `REMARK`, `SORT`, `DISABLED`, `CREATE_USER`, `CREATE_TIME`, `DELETED`) VALUES (105, '', 'PLATFORM_REWARD_AMOUNT', '骞冲彴瀹屾垚璁㈠崟濂栧姳閲戦锛堝垎锛�', 0, 0, 1, NOW(), 0);
+
+-- ============================================================
+-- 2026/05/15 闂ㄥ簵琛ㄥ鍔犱綅缃爣绛惧瓧娈�
+-- ============================================================
+ALTER TABLE `shop_info` ADD COLUMN `LOCATION_TAG_IDS` VARCHAR(500) NULL DEFAULT NULL COMMENT '浣嶇疆鏍囩涓婚敭锛堝叧鑱攃ategory type=5锛屽涓互閫楀彿鍒嗗壊锛�' AFTER `DEPOSIT_TYPES`;
+
+-- ============================================================
+-- 2026/05/15 閫�娆捐〃澧炲姞鎵ｈ垂淇℃伅瀛楁
+-- ============================================================
+ALTER TABLE `orders_refund` ADD COLUMN `DEDUCT_INFO` VARCHAR(512) NULL DEFAULT NULL COMMENT '鎵ｈ垂淇℃伅(JSON)锛氬瓨浠剁偣/鍙栦欢鐐�/鍙告満鎵ｈ垂鏄庣粏' AFTER `BEFORE_STATUS`;
+
+-- ============================================================
+-- 2026/05/15 璁㈠崟琛ㄥ鍔犳槸鍚︽墜鍔ㄩ��娆惧瓧娈�
+-- ============================================================
+ALTER TABLE `orders` ADD COLUMN `MANUAL_REFUND` INT DEFAULT 0 COMMENT '鏄惁鎵嬪姩閫�娆撅細0=鍚︼紱1=鏄�' AFTER `DEDUCTION_AMOUNT`;
+
+
+-- ============================================================
+-- 2026/05/14 璁㈠崟琛ㄥ鍔犱紭鎯犲埜瀛楁
+-- ============================================================
+ALTER TABLE `orders` ADD COLUMN `COUPON_ID` INT DEFAULT NULL COMMENT '浼樻儬鍒镐富閿�' AFTER `OUT_TRADE_NO`;
+ALTER TABLE `orders` ADD COLUMN `DEDUCTION_AMOUNT` BIGINT DEFAULT NULL COMMENT '鎶垫墸閲戦锛堝垎锛�' AFTER `COUPON_ID`;
+
+-- ============================================================
+-- 2026/05/14 浼氬憳琛ㄥ鍔犻偖绠卞瓧娈�
+-- ============================================================
+ALTER TABLE `member` ADD COLUMN `EMAIL` VARCHAR(128) DEFAULT NULL COMMENT '閭' AFTER `NAME`;
+
+-- ============================================================
+-- 2026/05/13 娉ㄥ唽婊″勾璧犻�佷紭鎯犲埜瀹氭椂浠诲姟
+-- ============================================================
+INSERT INTO `system_job` (`JOB_NAME`, `HANDLER`, `CRON`, `WITH_LOG`, `WITH_ASYNC`, `STATUS`, `REMARK`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`)
+VALUES ('娉ㄥ唽婊″勾璧犻�佷紭鎯犲埜', 'registerCouponGiftJob', '0 0 3 * * ?', 1, 0, 1, '鏍规嵁杩愯惀閰嶇疆锛屾煡璇㈡敞鍐屾弧X骞寸殑浼氬憳璧犻�佷紭鎯犲埜', 1, NOW(), 1, NOW(), 0);
+
+-- ============================================================
+-- 2026/05/13 杩愯惀閰嶇疆澧炲姞浼樻儬鍒歌禒閫佽鍒�
+-- ============================================================
+INSERT INTO `SYSTEM_DICT_DATA` (`DICT_ID`, `CODE`, `LABEL`, `REMARK`, `SORT`, `DISABLED`, `CREATE_USER`, `CREATE_TIME`, `DELETED`) VALUES (105, '', 'ORDER_COUPON_ORDER_COUNT', '涓嬪崟璧犻��-璁㈠崟娆℃暟', 0, 0, 1, NOW(), 0);
+INSERT INTO `SYSTEM_DICT_DATA` (`DICT_ID`, `CODE`, `LABEL`, `REMARK`, `SORT`, `DISABLED`, `CREATE_USER`, `CREATE_TIME`, `DELETED`) VALUES (105, '', 'ORDER_COUPON_GIFT_COUNT', '涓嬪崟璧犻��-鑷冲璧犻�佹鏁�', 1, 0, 1, NOW(), 0);
+INSERT INTO `SYSTEM_DICT_DATA` (`DICT_ID`, `CODE`, `LABEL`, `REMARK`, `SORT`, `DISABLED`, `CREATE_USER`, `CREATE_TIME`, `DELETED`) VALUES (105, '', 'ORDER_COUPON_ID', '涓嬪崟璧犻��-浼樻儬鍒窱D', 2, 0, 1, NOW(), 0);
+INSERT INTO `SYSTEM_DICT_DATA` (`DICT_ID`, `CODE`, `LABEL`, `REMARK`, `SORT`, `DISABLED`, `CREATE_USER`, `CREATE_TIME`, `DELETED`) VALUES (105, '', 'REGISTER_COUPON_YEARS', '娉ㄥ唽璧犻��-娉ㄥ唽骞存暟', 3, 0, 1, NOW(), 0);
+INSERT INTO `SYSTEM_DICT_DATA` (`DICT_ID`, `CODE`, `LABEL`, `REMARK`, `SORT`, `DISABLED`, `CREATE_USER`, `CREATE_TIME`, `DELETED`) VALUES (105, '', 'REGISTER_COUPON_GIFT_COUNT', '娉ㄥ唽璧犻��-鑷冲璧犻�佹鏁�', 4, 0, 1, NOW(), 0);
+INSERT INTO `SYSTEM_DICT_DATA` (`DICT_ID`, `CODE`, `LABEL`, `REMARK`, `SORT`, `DISABLED`, `CREATE_USER`, `CREATE_TIME`, `DELETED`) VALUES (105, '', 'REGISTER_COUPON_ID', '娉ㄥ唽璧犻��-浼樻儬鍒窱D', 5, 0, 1, NOW(), 0);
+INSERT INTO `SYSTEM_DICT_DATA` (`DICT_ID`, `CODE`, `LABEL`, `REMARK`, `SORT`, `DISABLED`, `CREATE_USER`, `CREATE_TIME`, `DELETED`) VALUES (105, '', 'REGISTER_GIFT_COUPON_IDS', '鏂版敞鍐岃禒閫�-浼樻儬鍒窱Ds(澶氶��,鍒嗗壊)', 6, 0, 1, NOW(), 0);
+
+
+-- ============================================================
+-- 2026/05/13 浼氬憳澧炲姞浼樻儬鍒歌禒閫佹鏁板瓧娈�
+-- ============================================================
+ALTER TABLE `member` ADD COLUMN `ORDER_COUPON_GIFT_COUNT` INT DEFAULT 0 COMMENT '涓嬪崟璧犻�佷紭鎯犲埜宸茶禒閫佹鏁�' AFTER `TYPE`;
+ALTER TABLE `member` ADD COLUMN `REGISTER_COUPON_GIFT_COUNT` INT DEFAULT 0 COMMENT '娉ㄥ唽婊″勾璧犻�佷紭鎯犲埜宸茶禒閫佹鏁�' AFTER `ORDER_COUPON_GIFT_COUNT`;
-- ============================================================
-- 2026/05/13 浼樻儬鍒镐俊鎭〃
@@ -300,10 +418,10 @@
-- ============================================================
--- 2026/04/15 璁㈠崟鐗╁搧鏄庣粏琛ㄦ坊鍔犲氨鍦板瓨鍙栧崟浠峰瓧娈�
+-- 2026/04/15 璁㈠崟鐗╁搧鏄庣粏琛ㄦ坊鍔犲氨鍦板瘎瀛樺崟浠峰瓧娈�
-- ============================================================
-ALTER TABLE `orders_detail` ADD COLUMN `LOCALLY_PRICE` BIGINT DEFAULT NULL COMMENT '灏卞湴瀛樺彇鍗曚环(鍒�/澶�)' AFTER `EXTRA_PRICE`;
+ALTER TABLE `orders_detail` ADD COLUMN `LOCALLY_PRICE` BIGINT DEFAULT NULL COMMENT '灏卞湴瀵勫瓨鍗曚环(鍒�/澶�)' AFTER `EXTRA_PRICE`;
-- ============================================================
--
Gitblit v1.9.3