@bee-hole/server 1.49.3 → 1.50.0

package/storage/init/init.sql

@@ -59,7 +59,7 @@ INSERT INTO `admin_configs` (`name`, `value`) VALUES
 ('currency', '{\"pay\":[\"USD\",\"CNY\",\"EUR\"],\"view\":[\"USD\",\"CNY\"]}'),
 ('exchange', '{\"type\":\"none\",\"exchange_rate\":{\"api_key\":\"\"}}'),
 ('insure', '{\"enable\":false,\"insure_1\":{\"url\":\"\",\"soap_action\":\"\",\"user_id\":\"\",\"pwd\":\"\",\"trade\":\"\",\"certificate_no\":\"\",\"name\":\"\",\"contack_name\":\"\",\"phone\":\"\",\"proposer_linkman_email\":\"\",\"proposer_address\":\"\",\"proposer_postcode\":\"\"}}'),
-('lang', '{\"default\":\"zh-CN\",\"all\":[{\"code\":\"zh-CN\",\"name\":\"中文简体\",\"cname\":\"简体中文\"},{\"code\":\"zh-TW\",\"name\":\"中文繁體\",\"cname\":\"繁体中文\"},{\"code\":\"en-US\",\"name\":\"English\",\"cname\":\"美式英语\"},{\"code\":\"fr-FR\",\"name\":\"Français\",\"cname\":\"法语\"},{\"code\":\"es-ES\",\"name\":\"Español\",\"cname\":\"西班牙语\"},{\"code\":\"ar-EG\",\"name\":\"بالعربية\",\"cname\":\"阿拉伯语\"},{\"code\":\"hi-IN\",\"name\":\"हिंदी\",\"cname\":\"印地语\"},{\"code\":\"pt-PT\",\"name\":\"Português\",\"cname\":\"葡萄牙语\"},{\"code\":\"ru-RU\",\"name\":\"Русский язык\",\"cname\":\"俄语\"},{\"code\":\"it-IT\",\"name\":\"Italiano\",\"cname\":\"意大利语\"},{\"code\":\"de-DE\",\"name\":\"Deutsch\",\"cname\":\"德语\"},{\"code\":\"ja-JP\",\"name\":\"日本語\",\"cname\":\"日语\"},{\"code\":\"th-TH\",\"name\":\"ภาษาไทย\",\"cname\":\"泰语\"},{\"code\":\"ko-KR\",\"name\":\"한국어\",\"cname\":\"韩语\"},{\"code\":\"bn-BD\",\"name\":\"বাংলার ভাষা\",\"cname\":\"孟加拉语\"},{\"code\":\"id-ID\",\"name\":\"Bahasa Indonesia\",\"cname\":\"印尼语\"}]}'),
+('lang', '{\"default\":\"zh-CN\",\"all\":[{\"code\":\"zh-CN\",\"name\":\"中文简体\",\"cname\":\"简体中文\"},{\"code\":\"zh-TW\",\"name\":\"中文繁體\",\"cname\":\"繁体中文\"},{\"code\":\"en-US\",\"name\":\"English\",\"cname\":\"美式英语\"},{\"code\":\"fr-FR\",\"name\":\"Français\",\"cname\":\"法语\"},{\"code\":\"es-ES\",\"name\":\"Español\",\"cname\":\"西班牙语\"},{\"code\":\"ar-EG\",\"name\":\"بالعربية\",\"cname\":\"阿拉伯语\"},{\"code\":\"hi-IN\",\"name\":\"हिंदी\",\"cname\":\"印地语\"},{\"code\":\"pt-PT\",\"name\":\"Português\",\"cname\":\"葡萄牙语\"},{\"code\":\"ru-RU\",\"name\":\"Русский язык\",\"cname\":\"俄语\"},{\"code\":\"it-IT\",\"name\":\"Italiano\",\"cname\":\"意大利语\"},{\"code\":\"de-DE\",\"name\":\"Deutsch\",\"cname\":\"德语\"},{\"code\":\"ja-JP\",\"name\":\"日本語\",\"cname\":\"日语\"},{\"code\":\"th-TH\",\"name\":\"ภาษาไทย\",\"cname\":\"泰语\"},{\"code\":\"ko-KR\",\"name\":\"한국어\",\"cname\":\"韩语\"},{\"code\":\"bn-BD\",\"name\":\"বাংলার ভাষা\",\"cname\":\"孟加拉语\"},{\"code\":\"id-ID\",\"name\":\"Bahasa Indonesia\",\"cname\":\"印尼语\"},{\"code\":\"vi-VN\",\"name\":\"Vietnamese\",\"cname\":\"越南语\"}]}'),
 ('oauth', '{}'),
 ('oss', '{\"oss_type\":\"local\"}'),
 ('print', '{\"app_id\":\"33843334df8569b8\",\"app_key\":\"OUyyV06fW2zyLKKdoGn1lOaWO0WpKrpiWc7DwTHYHRw=\",\"printer_id\":\"CP202210100008\",\"print_url\":\"http://test.o2oprint.cn:9100/trmapi/\"}'),
@@ -413,6 +413,8 @@ CREATE TABLE `admin_goods_public` (
   `son_user_id` bigint(20) NOT NULL COMMENT '子店user_id',
   `son_shop_id` bigint(20) NOT NULL COMMENT '子店shop_id',
   `son_good_id` bigint(20) NOT NULL COMMENT '子店good_id',
+  `son_cat_id` bigint(20) NOT NULL,
+  `son_warehouse_id` bigint(20) NOT NULL,
   `syn_time` datetime NOT NULL COMMENT '同步时间',
   `update_time` datetime DEFAULT NULL COMMENT '更新时间',
   `create_time` datetime NOT NULL COMMENT '创建时间'
@@ -440,6 +442,35 @@ CREATE TABLE `admin_goods_supply` (
 
 -- --------------------------------------------------------
 
+--
+-- 表的结构 `admin_goods_supply_stock_log`
+--
+
+CREATE TABLE `admin_goods_supply_stock_log` (
+  `id` bigint(20) NOT NULL,
+  `supply_id` bigint(20) NOT NULL COMMENT '供应关系表id',
+  `son_shop_id` bigint(20) NOT NULL COMMENT '子店 店铺ID',
+  `main_shop_id` bigint(20) NOT NULL COMMENT '主店 店铺ID',
+  `main_good_id` bigint(20) NOT NULL COMMENT '主店商品ID',
+  `main_good_title` varchar(255) NOT NULL COMMENT '主店商品标题',
+  `main_good_image_url` varchar(255) NOT NULL COMMENT '主店商品图片',
+  `main_sku_id` bigint(20) NOT NULL COMMENT '主店sku_id',
+  `main_sku_image` varchar(255) NOT NULL COMMENT '主店sku图片',
+  `main_sku_out_id` varchar(64) NOT NULL COMMENT 'Sku外部编码',
+  `main_sku_barcode` varchar(50) NOT NULL COMMENT 'Sku条码',
+  `main_sku_stock_num` int(11) NOT NULL COMMENT '主店sku库存',
+  `main_sku_prop_ids` varchar(128) DEFAULT NULL,
+  `main_sku_props` varchar(255) DEFAULT NULL COMMENT '规格属性',
+  `supply_stock` int(11) NOT NULL COMMENT '供应库存',
+  `supply_status` int(1) DEFAULT '1' COMMENT '1=>待审，2=>审核通过，3=>驳回',
+  `main_warehouse_id` bigint(20) DEFAULT NULL COMMENT '主店仓库ID',
+  `content` varchar(255) DEFAULT NULL COMMENT '驳回原因',
+  `create_time` datetime NOT NULL COMMENT '创建时间',
+  `audit_time` datetime DEFAULT NULL COMMENT '审核时间'
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+-- --------------------------------------------------------
+
 --
 -- 表的结构 `admin_member`
 --
@@ -616,7 +647,9 @@ INSERT INTO `admin_menu` (`id`, `pid`, `name`, `code`, `icon`, `type`, `perms`,
 (2145, 2006, 'app.menus.left.setting.webhook', 'webhook', 'smile', 'C', '', '/webhook', 'system/webhook/list', '', '1', '2', '2', '', 2, '', 1010, '1', '2024-01-24 01:22:33', '2024-01-24 01:22:33'),
 (2150, 0, 'app.menus.left.ai.chat', 'aichat', 'message', 'M', '', '/aichat', '', '', '1', '2', '2', 'AiChat', 1, '', 1, '1', '2024-03-22 01:46:37', '2024-03-28 08:16:18'),
 (2151, 2150, 'app.menus.left.chat', 'chatList', 'bars', 'C', '', 'chatList', 'aichat/chatList', '', '1', '2', '2', '', 2, '', 11, '1', '2024-03-22 01:51:53', '2024-03-28 08:16:30'),
-(2152, 2067, 'app.menus.left.member.bulksend', 'bulksendList', 'smile', 'C', '', 'bulksendList', 'member/bulksend/list', '', '1', '2', '2', '', 2, '', 15, '1', '2024-03-18 08:15:07', '2024-03-18 08:15:07');
+(2152, 2067, 'app.menus.left.member.bulksend', 'bulksendList', 'smile', 'C', '', 'bulksendList', 'member/bulksend/list', '', '1', '2', '2', '', 2, '', 15, '1', '2024-03-18 08:15:07', '2024-03-18 08:15:07'),
+(2153, 2140, 'view.item.list.supply.supplyInventory.log', 'productSupplyLog', 'copy', 'C', '', '/productSupplyLog', 'supply/productSupplyLog', '', '1', '2', '2', '', 2, '', 20, '1', '2024-05-11 08:24:43', '2024-05-11 08:25:25'),
+(2154, 2051, 'app.menus.left.message', 'messages', 'mail', 'C', '', '/message', 'config/message/index', '', '1', '2', '2', '', 2, '', 13, '1', '2024-05-09 01:35:49', '2024-05-09 06:35:33');
 
 -- --------------------------------------------------------
 
@@ -1034,13 +1067,18 @@ CREATE TABLE `admin_syn_config` (
 CREATE TABLE `admin_tiktok_oauth` (
   `id` bigint(20) NOT NULL COMMENT 'tiktok主键',
   `shop_id` bigint(20) NOT NULL COMMENT '店铺ID',
-  `plat_from` char(80) NOT NULL COMMENT '来源平台',
   `access_token` varchar(255) NOT NULL COMMENT 'access_token',
   `access_token_expire_in` int(11) NOT NULL COMMENT 'token过期时间',
   `refresh_token` varchar(255) NOT NULL COMMENT '刷新token',
   `refresh_token_expire_in` int(11) NOT NULL COMMENT '刷新token过期时间',
   `open_id` char(80) NOT NULL COMMENT 'open_id',
   `seller_name` char(80) NOT NULL COMMENT '卖家名称',
+  `shop_cipher` varchar(128) NOT NULL,
+  `shop_code` varchar(64) NOT NULL,
+  `tiktok_shop_id` varchar(64) NOT NULL,
+  `shop_name` varchar(255) NOT NULL,
+  `shop_region` char(20) NOT NULL,
+  `shop_seller_type` char(80) NOT NULL,
   `create_time` datetime NOT NULL COMMENT '创建时间'
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
@@ -1108,11 +1146,11 @@ CREATE TABLE `admin_trans` (
 CREATE TABLE `mall_address` (
   `address_id` bigint(20) NOT NULL COMMENT '地址编号',
   `member_id` bigint(20) NOT NULL COMMENT '消费者编号',
-  `first_name` varchar(50) NOT NULL COMMENT '名',
+  `first_name` varchar(50) DEFAULT NULL COMMENT '名',
   `last_name` varchar(50) NOT NULL COMMENT '姓',
   `street` longtext NOT NULL COMMENT '街道',
-  `apartment` longtext NOT NULL COMMENT '详细地址',
-  `city` varchar(255) NOT NULL COMMENT '城市',
+  `apartment` longtext COMMENT '详细地址',
+  `city` varchar(255) DEFAULT NULL COMMENT '城市',
   `state` varchar(255) NOT NULL COMMENT '州/省',
   `zip_code` varchar(10) NOT NULL COMMENT '邮政编码',
   `country` varchar(50) NOT NULL COMMENT '国家',
@@ -1432,12 +1470,12 @@ CREATE TABLE `mall_billing_address` (
   `order_id` varchar(64) NOT NULL COMMENT '所属订单',
   `country` varchar(255) NOT NULL COMMENT '国家',
   `state` varchar(255) NOT NULL COMMENT '省/州',
-  `city` varchar(255) NOT NULL COMMENT '城市',
-  `street` text COMMENT '街道',
+  `city` varchar(255) DEFAULT NULL COMMENT '城市',
+  `street` text NOT NULL COMMENT '街道',
   `apartment` text COMMENT '详细地址',
   `zip_code` varchar(10) NOT NULL COMMENT '邮编',
   `phone` varchar(100) NOT NULL COMMENT '电话/手机号码',
-  `first_name` varchar(50) NOT NULL COMMENT '名',
+  `first_name` varchar(50) DEFAULT NULL COMMENT '名',
   `last_name` varchar(50) NOT NULL COMMENT '姓',
   `create_time` datetime DEFAULT NULL COMMENT '创建时间'
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='账单地址信息';
@@ -3456,6 +3494,37 @@ CREATE TABLE `mall_member_tag_associations` (
 
 -- --------------------------------------------------------
 
+--
+-- 表的结构 `mall_messages`
+--
+
+CREATE TABLE `mall_messages` (
+  `msg_id` bigint(20) NOT NULL,
+  `shop_id` bigint(20) NOT NULL COMMENT '店铺编号',
+  `sender_id` bigint(20) NOT NULL COMMENT '发送者编号',
+  `subject` varchar(256) NOT NULL COMMENT '消息主题',
+  `content` longtext NOT NULL COMMENT '消息内容',
+  `status` tinyint(1) NOT NULL DEFAULT '1' COMMENT '消息状态 1=展示 2=隐藏',
+  `create_time` datetime NOT NULL COMMENT '创建时间',
+  `update_time` datetime DEFAULT NULL COMMENT '更新时间'
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='商城站内信';
+
+-- --------------------------------------------------------
+
+--
+-- 表的结构 `mall_message_recipients`
+--
+
+CREATE TABLE `mall_message_recipients` (
+  `rec_id` bigint(20) NOT NULL,
+  `message_id` bigint(20) NOT NULL COMMENT '站内信编号',
+  `member_id` bigint(20) NOT NULL COMMENT '接收者用户ID',
+  `is_read` tinyint(1) NOT NULL DEFAULT '1' COMMENT '1=已读',
+  `create_time` datetime DEFAULT NULL COMMENT '时间'
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='站内信接收表';
+
+-- --------------------------------------------------------
+
 --
 -- 表的结构 `mall_notification_records`
 --
@@ -3578,6 +3647,7 @@ CREATE TABLE `mall_order` (
   `member_note` varchar(100) DEFAULT NULL COMMENT '消费者备注',
   `user_id` varchar(32) DEFAULT NULL COMMENT '前后台用户ID',
   `from_id` varchar(64) NOT NULL COMMENT '订单来源',
+  `from_shop_id` varchar(64) DEFAULT NULL COMMENT '订单来源店铺',
   `fx_id` bigint(20) DEFAULT NULL COMMENT '所属分销商',
   `pay_way_id` int(2) NOT NULL COMMENT '支付方式标记',
   `pickup_order` tinyint(4) NOT NULL DEFAULT '1' COMMENT '是否自提订单,默认1(不是),2(是)',
@@ -3585,12 +3655,12 @@ CREATE TABLE `mall_order` (
   `shop_id` bigint(20) NOT NULL COMMENT '订单所属店铺',
   `country` varchar(255) NOT NULL COMMENT '国家',
   `state` varchar(255) NOT NULL COMMENT '省/州',
-  `city` varchar(255) NOT NULL COMMENT '城市',
+  `city` varchar(255) DEFAULT NULL COMMENT '城市',
   `street` text NOT NULL COMMENT '街道',
-  `apartment` text NOT NULL COMMENT '详细地址',
+  `apartment` text COMMENT '详细地址',
   `zip_code` varchar(10) NOT NULL COMMENT '邮编',
   `phone` varchar(100) NOT NULL COMMENT '电话/手机号码',
-  `first_name` varchar(50) NOT NULL COMMENT '名',
+  `first_name` varchar(50) DEFAULT NULL COMMENT '名',
   `last_name` varchar(50) NOT NULL COMMENT '姓',
   `currency` varchar(3) NOT NULL COMMENT '交易货币类型',
   `transaction_id` varchar(64) DEFAULT NULL COMMENT '交易流水号',
@@ -3886,12 +3956,12 @@ CREATE TABLE `mall_purchase` (
   `sub_shop_id` bigint(20) NOT NULL COMMENT '采购店铺shop_id(采购方标记)',
   `country` varchar(255) NOT NULL COMMENT '收货地址中的国家信息',
   `state` varchar(255) NOT NULL COMMENT '收货地址中的省/州信息',
-  `city` varchar(255) NOT NULL COMMENT '收货地址中的城市信息',
+  `city` varchar(255) DEFAULT NULL COMMENT '收货地址中的城市信息',
   `street` text NOT NULL COMMENT '收货地址中的街道信息',
-  `apartment` text NOT NULL COMMENT '收货地址中的详细信息',
+  `apartment` text COMMENT '收货地址中的详细信息',
   `zip_code` varchar(10) NOT NULL COMMENT '收货地址中的邮编信息',
   `phone` varchar(100) NOT NULL COMMENT '收货人手机号/电话号',
-  `first_name` varchar(50) NOT NULL COMMENT '收货人名讳',
+  `first_name` varchar(50) DEFAULT NULL COMMENT '收货人名讳',
   `last_name` varchar(50) NOT NULL COMMENT '收货人姓氏',
   `currency` varchar(3) NOT NULL COMMENT '交易货币编码',
   `post_fee` decimal(10,2) NOT NULL COMMENT '邮费',
@@ -4389,7 +4459,13 @@ CREATE TABLE `mall_skus` (
   `sku_image` varchar(255) DEFAULT NULL COMMENT '规格图片',
   `is_for_sale` tinyint(4) NOT NULL COMMENT '是否非卖品,默认0(不是),1(是)',
   `from_sku_id` bigint(20) DEFAULT NULL COMMENT '来源平台商品ID',
-  `extra_fee` decimal(10,2) NOT NULL DEFAULT '0.00' COMMENT '额外的费用'
+  `extra_fee` decimal(10,2) NOT NULL DEFAULT '0.00' COMMENT '额外的费用',
+  `size_l` decimal(12,2) DEFAULT NULL COMMENT '商品长度(cm)',
+  `size_w` decimal(12,2) DEFAULT NULL COMMENT '商品宽度(cm)',
+  `size_h` decimal(12,2) DEFAULT NULL COMMENT '商品高度(cm)',
+  `gross_weight` decimal(12,5) DEFAULT NULL COMMENT '毛重(kg)',
+  `weight` decimal(12,5) DEFAULT NULL COMMENT '净重(kg)',
+  `unit` varchar(20) DEFAULT NULL COMMENT '单位对应的编码'
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
 -- --------------------------------------------------------
@@ -4499,12 +4575,17 @@ CREATE TABLE `mall_sku_values_sub` (
 
 CREATE TABLE `mall_stockchange_log` (
   `id` bigint(20) UNSIGNED NOT NULL COMMENT '表主键',
+  `shop_id` bigint(20) NOT NULL COMMENT '店铺ID',
   `order_id` varchar(64) NOT NULL COMMENT '订单号',
   `warehouse_id` bigint(20) UNSIGNED NOT NULL COMMENT '仓库唯一标记',
+  `out_id` varchar(64) NOT NULL COMMENT 'SKU外部编号',
   `sku_id` bigint(20) NOT NULL COMMENT '商品sku_id',
+  `before_change` int(11) NOT NULL COMMENT '变更前数量',
   `change_quantity` int(11) NOT NULL COMMENT '库存变更数量',
+  `after_change` int(11) NOT NULL COMMENT '变更后数量',
   `status` tinyint(4) NOT NULL COMMENT '默认0未支付,1已支付',
-  `create_time` datetime NOT NULL COMMENT '数据创建时间'
+  `create_time` datetime NOT NULL COMMENT '数据创建时间',
+  `scene` tinyint(4) NOT NULL COMMENT '扣减场景: 0(交易减少),1(管理员手动减少),2(外部仓同步减少)'
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='库存变更记录';
 
 -- --------------------------------------------------------
@@ -4672,11 +4753,11 @@ CREATE TABLE `mall_warehouse_priority_shipping` (
 CREATE TABLE `mall_warehouse_stock` (
   `id` bigint(20) UNSIGNED NOT NULL COMMENT '表主键',
   `warehouse_id` bigint(20) UNSIGNED NOT NULL COMMENT '仓库全局唯一标记',
-  `sku_id` bigint(20) NOT NULL COMMENT '商品sku_id',
   `stock_quantity` int(11) NOT NULL COMMENT '库存数量',
   `shop_id` bigint(20) NOT NULL COMMENT '所属店铺id',
-  `title` varchar(255) NOT NULL,
-  `create_time` datetime NOT NULL COMMENT '创建时间'
+  `title` text NOT NULL,
+  `create_time` datetime NOT NULL COMMENT '创建时间',
+  `out_id` varchar(64) NOT NULL COMMENT 'SKU外部编号'
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
 -- --------------------------------------------------------
@@ -4693,6 +4774,7 @@ CREATE TABLE `mall_webhook_config` (
   `req_url` varchar(255) DEFAULT NULL COMMENT '事件通知地址',
   `options` text COMMENT '其他参数;格式为{"warehouse_id":"11"}',
   `secret_key` varchar(64) NOT NULL COMMENT '秘钥',
+  `status` tinyint(4) NOT NULL COMMENT '状态: 默认0开,1关',
   `create_time` datetime NOT NULL COMMENT '创建时间'
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='webhook配置表';
 
@@ -4706,14 +4788,16 @@ CREATE TABLE `mall_webhook_logs` (
   `id` bigint(20) UNSIGNED NOT NULL COMMENT '表主键',
   `shop_id` bigint(20) NOT NULL COMMENT '店铺shop_id',
   `config_id` int(10) UNSIGNED NOT NULL COMMENT '配置ID',
+  `warehouse_id` bigint(20) UNSIGNED NOT NULL COMMENT 'bee-hole侧仓库ID',
   `order_id` varchar(64) NOT NULL COMMENT '商户订单号',
   `event_type` varchar(20) NOT NULL COMMENT '事件类型',
   `req_url` varchar(255) NOT NULL COMMENT '请求地址',
   `payload` text COMMENT '消息载体',
   `push_times` tinyint(4) NOT NULL COMMENT '推送次数',
-  `failure_reason` varchar(200) DEFAULT NULL COMMENT '失败原因',
+  `accepted` text COMMENT '接受信息',
   `success_time` datetime DEFAULT NULL COMMENT '推送成功时间',
-  `create_time` datetime NOT NULL COMMENT '数据创建时间'
+  `create_time` datetime NOT NULL COMMENT '数据创建时间',
+  `status` int(11) DEFAULT '1' COMMENT '推送状态:默认1(成功)2(失败)'
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='事件通知日志';
 
 -- --------------------------------------------------------
@@ -9561,6 +9645,13 @@ ALTER TABLE `admin_goods_supply`
   ADD UNIQUE KEY `unq` (`shop_id`,`good_id`,`main_shop_id`);
 ALTER TABLE `admin_goods_supply` ADD FULLTEXT KEY `search` (`good_data`);
 
+--
+-- 表的索引 `admin_goods_supply_stock_log`
+--
+ALTER TABLE `admin_goods_supply_stock_log`
+  ADD PRIMARY KEY (`id`),
+  ADD KEY `sid` (`supply_id`,`son_shop_id`,`main_shop_id`,`main_good_id`,`main_sku_id`);
+
 --
 -- 表的索引 `admin_member`
 --
@@ -9697,7 +9788,7 @@ ALTER TABLE `admin_syn_config`
 --
 ALTER TABLE `admin_tiktok_oauth`
   ADD PRIMARY KEY (`id`),
-  ADD UNIQUE KEY `shop_id` (`shop_id`,`plat_from`);
+  ADD UNIQUE KEY `shop_id` (`shop_id`,`open_id`,`seller_name`,`shop_code`,`shop_region`) USING BTREE;
 
 --
 -- 表的索引 `admin_tiktok_product`
@@ -10058,6 +10149,18 @@ ALTER TABLE `mall_member_tags`
 ALTER TABLE `mall_member_tag_associations`
   ADD PRIMARY KEY (`id`) USING BTREE;
 
+--
+-- 表的索引 `mall_messages`
+--
+ALTER TABLE `mall_messages`
+  ADD PRIMARY KEY (`msg_id`);
+
+--
+-- 表的索引 `mall_message_recipients`
+--
+ALTER TABLE `mall_message_recipients`
+  ADD PRIMARY KEY (`rec_id`);
+
 --
 -- 表的索引 `mall_notification_records`
 --
@@ -10244,7 +10347,8 @@ ALTER TABLE `mall_purchase_orders`
 --
 ALTER TABLE `mall_purchase_prepay`
   ADD PRIMARY KEY (`id`),
-  ADD UNIQUE KEY `mall_purchase_prepay_UN` (`prepay_id`);
+  ADD UNIQUE KEY `mall_purchase_prepay_UN` (`prepay_id`),
+  ADD KEY `status` (`status`);
 
 --
 -- 表的索引 `mall_purchase_prepay_details`
@@ -10544,7 +10648,7 @@ ALTER TABLE `mall_warehouse_priority_shipping`
 --
 ALTER TABLE `mall_warehouse_stock`
   ADD PRIMARY KEY (`id`),
-  ADD UNIQUE KEY `warehouse_id` (`warehouse_id`,`sku_id`,`shop_id`);
+  ADD UNIQUE KEY `idx_unique` (`shop_id`,`warehouse_id`,`out_id`);
 
 --
 -- 表的索引 `mall_webhook_config`
@@ -10559,7 +10663,8 @@ ALTER TABLE `mall_webhook_config`
 ALTER TABLE `mall_webhook_logs`
   ADD PRIMARY KEY (`id`),
   ADD KEY `mall_webhook_logs_push_times_IDX` (`push_times`,`success_time`) USING BTREE,
-  ADD KEY `shop_id` (`shop_id`);
+  ADD KEY `shop_id` (`shop_id`),
+  ADD KEY `shop_id_2` (`shop_id`,`status`);
 
 --
 -- 表的索引 `sys_config`
@@ -10711,6 +10816,12 @@ ALTER TABLE `admin_goods_public`
 ALTER TABLE `admin_goods_supply`
   MODIFY `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '供应ID 主键', AUTO_INCREMENT=19;
 
+--
+-- 使用表AUTO_INCREMENT `admin_goods_supply_stock_log`
+--
+ALTER TABLE `admin_goods_supply_stock_log`
+  MODIFY `id` bigint(20) NOT NULL AUTO_INCREMENT;
+
 --
 -- 使用表AUTO_INCREMENT `admin_member`
 --
@@ -10721,7 +10832,7 @@ ALTER TABLE `admin_member`
 -- 使用表AUTO_INCREMENT `admin_menu`
 --
 ALTER TABLE `admin_menu`
-  MODIFY `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '菜单ID', AUTO_INCREMENT=2153;
+  MODIFY `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '菜单ID', AUTO_INCREMENT=2155;
 
 --
 -- 使用表AUTO_INCREMENT `admin_notice`
@@ -11035,6 +11146,18 @@ ALTER TABLE `mall_member_tags`
 ALTER TABLE `mall_member_tag_associations`
   MODIFY `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '标签的id';
 
+--
+-- 使用表AUTO_INCREMENT `mall_messages`
+--
+ALTER TABLE `mall_messages`
+  MODIFY `msg_id` bigint(20) NOT NULL AUTO_INCREMENT;
+
+--
+-- 使用表AUTO_INCREMENT `mall_message_recipients`
+--
+ALTER TABLE `mall_message_recipients`
+  MODIFY `rec_id` bigint(20) NOT NULL AUTO_INCREMENT;
+
 --
 -- 使用表AUTO_INCREMENT `mall_notification_records`
 --

package/storage/patch/patch.sql

@@ -1,19 +1,206 @@
--- Step 1: 查询记录A
-SELECT res_group_id INTO @A_res_group_id
-FROM `sys_resource_groups`
-WHERE `title` LIKE 'order';
-
--- Step 2: 查询记录B
-SELECT resource_id INTO @B_resource_id
-FROM `sys_resources`
-WHERE `path` LIKE '/admin/order/handle_pay';
-
--- Step 3: 删除sys_resource_group_apis表中的记录
-DELETE FROM `sys_resource_group_apis`
-WHERE res_group_id = @A_res_group_id AND resource_id = @B_resource_id;
-
-ALTER TABLE `mall_trans_task` DROP INDEX `lang`, ADD UNIQUE `uindex` (`shop_id`, `md5`, `lang`, `xid`, `type_name`, `type_id`) USING BTREE;
-ALTER TABLE `mall_trans_task` ADD INDEX(`shop_id`, `md5`, `lang`, `status`);
-ALTER TABLE `mall_sku_props_sub` ADD INDEX(`good_id`, `language`);
-ALTER TABLE `mall_goods_relate` ADD INDEX(`hash_id`);
+ALTER TABLE `admin_tiktok_oauth` DROP COLUMN `plat_from`;
+
+ALTER TABLE `admin_tiktok_oauth`
+    ADD COLUMN `shop_cipher` varchar(128) NOT NULL AFTER `seller_name`,
+    ADD COLUMN `shop_code`  varchar(64) NOT NULL AFTER `shop_cipher`,
+    ADD COLUMN `tiktok_shop_id`  varchar(64) NOT NULL AFTER `shop_code`,
+    ADD COLUMN `shop_name`  varchar(255) NOT NULL AFTER `tiktok_shop_id`,
+    ADD COLUMN `shop_region`  char(20) NOT NULL AFTER `shop_name`,
+    ADD COLUMN `shop_seller_type`  char(80) NOT NULL AFTER `shop_region`;
+
+ALTER TABLE `admin_tiktok_oauth`
+DROP INDEX `shop_id` ,
+    ADD UNIQUE INDEX `shop_id` (`shop_id`, `open_id`, `seller_name`, `shop_code`, `shop_region`) USING BTREE;
+
+ALTER TABLE `mall_order`
+    ADD COLUMN `from_shop_id` varchar(64) NULL COMMENT '订单来源店铺' AFTER `from_id`;
+
+-- ly end
+alter table mall_skus
+    add size_l decimal(12, 2) null comment '商品长度(cm)';
+
+alter table mall_skus
+    add size_w decimal(12, 2) null comment '商品宽度(cm)';
+
+alter table mall_skus
+    add size_h decimal(12, 2) null comment '商品高度(cm)';
+
+alter table mall_skus
+    add gross_weight decimal(12, 5) null comment '毛重(kg)';
+
+alter table mall_skus
+    add weight decimal(12, 5) null comment '净重(kg)';
+
+alter table mall_skus
+    add unit varchar(20) null comment '单位对应的编码';
+
+UPDATE `admin_configs`
+SET `value`='{\"default\":\"zh-CN\",\"all\":[{\"code\":\"zh-CN\",\"name\":\"中文简体\",\"cname\":\"简体中文\"},{\"code\":\"zh-TW\",\"name\":\"中文繁體\",\"cname\":\"繁体中文\"},{\"code\":\"en-US\",\"name\":\"English\",\"cname\":\"美式英语\"},{\"code\":\"fr-FR\",\"name\":\"Français\",\"cname\":\"法语\"},{\"code\":\"es-ES\",\"name\":\"Español\",\"cname\":\"西班牙语\"},{\"code\":\"ar-EG\",\"name\":\"بالعربية\",\"cname\":\"阿拉伯语\"},{\"code\":\"hi-IN\",\"name\":\"हिंदी\",\"cname\":\"印地语\"},{\"code\":\"pt-PT\",\"name\":\"Português\",\"cname\":\"葡萄牙语\"},{\"code\":\"ru-RU\",\"name\":\"Русский язык\",\"cname\":\"俄语\"},{\"code\":\"it-IT\",\"name\":\"Italiano\",\"cname\":\"意大利语\"},{\"code\":\"de-DE\",\"name\":\"Deutsch\",\"cname\":\"德语\"},{\"code\":\"ja-JP\",\"name\":\"日本語\",\"cname\":\"日语\"},{\"code\":\"th-TH\",\"name\":\"ภาษาไทย\",\"cname\":\"泰语\"},{\"code\":\"ko-KR\",\"name\":\"한국어\",\"cname\":\"韩语\"},{\"code\":\"bn-BD\",\"name\":\"বাংলার ভাষা\",\"cname\":\"孟加拉语\"},{\"code\":\"id-ID\",\"name\":\"Bahasa Indonesia\",\"cname\":\"印尼语\"},{\"code\":\"vi-VN\",\"name\":\"Vietnamese\",\"cname\":\"越南语\"}]}'
+WHERE (`name` = 'lang');
+
+alter table mall_webhook_config
+    add status TINYINT not null comment '状态: 默认0开,1关' after secret_key;
+
+alter table mall_stockchange_log add scene TINYINT not null comment '扣减场景: 0(交易减少),1(管理员手动减少),2(外部仓同步减少)';
+alter table mall_stockchange_log add out_id varchar(64) not null comment 'SKU外部编号' after warehouse_id;
+alter table mall_stockchange_log add before_change int not null comment '变更前数量' after sku_id;
+alter table mall_stockchange_log add after_change int not null comment '变更后数量' after change_quantity;
+UPDATE `mall_stockchange_log` as a INNER JOIN `mall_skus` as b ON a.sku_id=b.sku_id SET a.out_id=b.out_id;
+alter table mall_stockchange_log add shop_id BIGINT not null comment '店铺ID' after id;
+UPDATE `mall_stockchange_log` as a INNER JOIN `mall_order` as b ON a.order_id=b.order_id SET a.shop_id=b.shop_id;
+
+-- 库存表升级
+alter table mall_warehouse_stock add out_id varchar(64) not null comment 'SKU外部编号';
+UPDATE `mall_warehouse_stock` as a INNER JOIN `mall_skus` as b ON a.sku_id=b.sku_id SET a.out_id=b.out_id;
+alter table mall_warehouse_stock modify title text not null;
+
+-- 保留最大out_id对应的库存，其他删除
+DELETE mws FROM mall_warehouse_stock mws
+LEFT JOIN (
+    SELECT out_id, shop_id, warehouse_id, MAX(stock_quantity) AS max_quantity
+    FROM mall_warehouse_stock
+    GROUP BY out_id, shop_id, warehouse_id
+) AS max_values ON mws.out_id = max_values.out_id
+    AND mws.shop_id = max_values.shop_id
+    AND mws.warehouse_id = max_values.warehouse_id
+    AND mws.stock_quantity = max_values.max_quantity
+WHERE max_values.max_quantity IS NULL;
+
+-- 去重
+DELETE FROM mall_warehouse_stock
+WHERE id NOT IN (
+    SELECT * FROM (
+      SELECT MIN(id) AS id
+      FROM mall_warehouse_stock
+      GROUP BY out_id, shop_id, warehouse_id
+  ) AS temp
+);
+
+DELETE FROM mall_warehouse_stock WHERE `mall_warehouse_stock`.`out_id` = '';
+
+-- 升级索引
+alter table mall_warehouse_stock drop INDEX warehouse_id;
+alter table mall_warehouse_stock drop column sku_id;
+ALTER TABLE mall_warehouse_stock ADD UNIQUE INDEX idx_unique (shop_id, warehouse_id, out_id);
+
+
+-- 多仓库库存求和更新到sku中
+UPDATE mall_skus a
+    INNER JOIN (
+    SELECT shop_id, out_id, SUM(stock_quantity) as total_stock_quantity
+    FROM mall_warehouse_stock
+    GROUP BY shop_id, out_id
+    ) b ON a.shop_id = b.shop_id AND a.out_id = b.out_id
+    SET a.stock_num = b.total_stock_quantity;
+
+-- 清理out_id中的前后空格
+UPDATE mall_warehouse_stock SET out_id = TRIM(out_id) WHERE out_id LIKE '% %';
+UPDATE mall_skus SET out_id = TRIM(out_id) WHERE out_id LIKE '% %';
+
+-- 消费者地址修复
+ALTER TABLE `mall_billing_address` CHANGE `city` `city` VARCHAR(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '城市', CHANGE `street` `street` TEXT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '街道', CHANGE `first_name` `first_name` VARCHAR(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '名';
+UPDATE mall_billing_address SET city = '' WHERE state = city;
+UPDATE mall_billing_address SET city = '' WHERE street = city;
+UPDATE mall_billing_address SET apartment = '' WHERE street = apartment;
+UPDATE mall_billing_address SET first_name = '' WHERE last_name = first_name;
+UPDATE mall_billing_address SET last_name = CONCAT(last_name, first_name) WHERE country = 'JP' AND first_name!='';
+UPDATE mall_billing_address SET first_name='' WHERE country = 'JP';
+
+-- 消费者地址修复
+ALTER TABLE `mall_address` CHANGE `first_name` `first_name` VARCHAR(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '名', CHANGE `apartment` `apartment` LONGTEXT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '详细地址', CHANGE `city` `city` VARCHAR(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '城市';
+UPDATE mall_address SET city = '' WHERE state = city;
+UPDATE mall_address SET city = '' WHERE street = city;
+UPDATE mall_address SET apartment = '' WHERE street = apartment;
+UPDATE mall_address SET first_name = '' WHERE last_name = first_name;
+UPDATE mall_address SET last_name = CONCAT(last_name, first_name) WHERE country = 'JP' AND first_name!='';
+UPDATE mall_address SET first_name='' WHERE country = 'JP';
+
+-- 订单中的消费者地址修复
+ALTER TABLE `mall_order` CHANGE `city` `city` VARCHAR(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '城市', CHANGE `apartment` `apartment` TEXT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '详细地址', CHANGE `first_name` `first_name` VARCHAR(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '名';
+UPDATE mall_order SET city = '' WHERE state = city;
+UPDATE mall_order SET city = '' WHERE street = city;
+UPDATE mall_order SET apartment = '' WHERE street = apartment;
+UPDATE mall_order SET first_name = '' WHERE last_name = first_name;
+UPDATE mall_order SET last_name = CONCAT(last_name, first_name) WHERE country = 'JP' AND first_name!='';
+UPDATE mall_order SET first_name='' WHERE country = 'JP';
+
+-- 采购单结构修复
+ALTER TABLE `mall_purchase` CHANGE `city` `city` VARCHAR(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '收货地址中的城市信息', CHANGE `apartment` `apartment` TEXT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '收货地址中的详细信息', CHANGE `first_name` `first_name` VARCHAR(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '收货人名讳';
+
+-- 供应商品库存记录表
+CREATE TABLE `admin_goods_supply_stock_log` (
+    `id` bigint(20) NOT NULL AUTO_INCREMENT,
+    `supply_id` bigint(20) NOT NULL COMMENT '供应关系表id',
+    `son_shop_id` bigint(20) NOT NULL COMMENT '子店 店铺ID',
+    `main_shop_id` bigint(20) NOT NULL COMMENT '主店 店铺ID',
+    `main_good_id` bigint(20) NOT NULL COMMENT '主店商品ID',
+    `main_good_title` varchar(255) NOT NULL COMMENT '主店商品标题',
+    `main_good_image_url` varchar(255) NOT NULL COMMENT '主店商品图片',
+    `main_sku_id` bigint(20) NOT NULL COMMENT '主店sku_id',
+    `main_sku_image` varchar(255) NOT NULL COMMENT '主店sku图片',
+    `main_sku_out_id` varchar(64) NOT NULL COMMENT 'Sku外部编码',
+    `main_sku_barcode` varchar(50) NOT NULL COMMENT 'Sku条码',
+    `main_sku_stock_num` int(11) NOT NULL COMMENT '主店sku库存',
+    `main_sku_prop_ids` varchar(128) DEFAULT NULL,
+    `main_sku_props` varchar(255) DEFAULT NULL COMMENT '规格属性',
+    `supply_stock` int(11) NOT NULL COMMENT '供应库存',
+    `supply_status` int(1) DEFAULT '1' COMMENT '1=>待审，2=>审核通过，3=>驳回',
+    `main_warehouse_id` bigint(20) DEFAULT NULL COMMENT '主店仓库ID',
+    `content` varchar(255) DEFAULT NULL COMMENT '驳回原因',
+    `create_time` datetime NOT NULL COMMENT '创建时间',
+    `audit_time` datetime DEFAULT NULL COMMENT '审核时间',
+    PRIMARY KEY (`id`),
+    KEY `sid` (`supply_id`,`son_shop_id`,`main_shop_id`,`main_good_id`,`main_sku_id`)
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4;
+
+-- 采购单关闭
+ALTER TABLE `mall_purchase_prepay` ADD INDEX(`status`);
+ALTER TABLE mall_webhook_logs ADD COLUMN status INT DEFAULT 1 comment '推送状态:默认1(成功)2(失败)';
+alter table mall_webhook_logs change failure_reason accepted text null comment '接受信息';
+ALTER TABLE `mall_webhook_logs` ADD INDEX(`shop_id`, `status`);
+alter table mall_webhook_logs add warehouse_id BIGINT UNSIGNED not null comment 'bee-hole侧仓库ID' after config_id;
+
+-- 采购记录菜单
+INSERT INTO admin_menu (`pid`, `name`, `code`, `icon`, `type`, `perms`, `path`, `component`, `query`, `is_frame`, `is_cache`, `is_visible`, `remark`, `level`, `tree`, `sort`, `status`, `created_at`, `updated_at`) VALUES ('2140', 'view.item.list.supply.supplyInventory.log', 'productSupplyLog', 'copy', 'C', '', '/productSupplyLog', 'supply/productSupplyLog', '', '1', '2', '2', '', '2', '', '20', '1', '2024-05-11 08:24:43', '2024-05-11 08:25:25');
+
+-- 刊登表结构
+ALTER TABLE `admin_goods_public`
+    ADD COLUMN `son_cat_id`  bigint(20) NOT NULL AFTER `son_good_id`,
+    ADD COLUMN `son_warehouse_id`  bigint(20) NOT NULL AFTER `son_cat_id`;
+
+-- 刊登记录修复
+UPDATE `admin_goods_public`
+SET `son_cat_id`=(SELECT `cat_id` FROM `mall_goods` WHERE `mall_goods`.`good_id`=`admin_goods_public`.`son_good_id`),
+    `son_warehouse_id`=(SELECT `warehouse_id` FROM `mall_warehouse` WHERE `mall_warehouse`.`shop_id`=`admin_goods_public`.`son_shop_id`);
+
+-- 站内信
+CREATE TABLE `mall_messages` (
+    `msg_id` bigint(20) NOT NULL,
+    `shop_id` bigint(20) NOT NULL COMMENT '店铺编号',
+    `sender_id` bigint(20) NOT NULL COMMENT '发送者编号',
+    `subject` varchar(256) NOT NULL COMMENT '消息主题',
+    `content` longtext NOT NULL COMMENT '消息内容',
+    `status` tinyint(1) NOT NULL DEFAULT '1' COMMENT '消息状态 1=展示 2=隐藏',
+    `create_time` datetime NOT NULL COMMENT '创建时间',
+    `update_time` datetime DEFAULT NULL COMMENT '更新时间'
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='商城站内信';
+ALTER TABLE `mall_messages`
+    ADD PRIMARY KEY (`msg_id`);
+ALTER TABLE `mall_messages`
+    MODIFY `msg_id` bigint(20) NOT NULL AUTO_INCREMENT;
+
+CREATE TABLE `mall_message_recipients` (
+    `rec_id` bigint(20) NOT NULL,
+    `message_id` bigint(20) NOT NULL COMMENT '站内信编号',
+    `member_id` bigint(20) NOT NULL COMMENT '接收者用户ID',
+    `is_read` tinyint(1) NOT NULL DEFAULT '1' COMMENT '1=已读',
+    `create_time` datetime DEFAULT NULL COMMENT '时间'
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='站内信接收表';
+ALTER TABLE `mall_message_recipients`
+    ADD PRIMARY KEY (`rec_id`);
+ALTER TABLE `mall_message_recipients`
+    MODIFY `rec_id` bigint(20) NOT NULL AUTO_INCREMENT;
+
+INSERT INTO `admin_menu` (`pid`, `name`, `code`, `icon`, `type`, `perms`, `path`, `component`, `query`, `is_frame`, `is_cache`, `is_visible`, `remark`, `level`, `tree`, `sort`, `status`, `created_at`, `updated_at`) VALUES
+    (2051, 'app.menus.left.message', 'messages', 'mail', 'C', '', '/message', 'config/message/index', '', '1', '2', '2', '', 2, '', 13, '1', '2024-05-09 01:35:49', '2024-05-09 06:35:33');
 

package/version

@@ -1 +1 @@
-v1.49.3
+v1.50.0