@bee-hole/server 1.50.3 → 1.51.1

package/storage/init/init.sql

@@ -3375,7 +3375,8 @@ CREATE TABLE `mall_members` (
   `create_time` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '注册时间',
   `last_ip` varchar(128) DEFAULT NULL COMMENT '注册IP',
   `is_banned` tinyint(4) NOT NULL DEFAULT '0' COMMENT '全局ban，0没ban，1ban了',
-  `email_verify_status` tinyint(4) NOT NULL DEFAULT '0' COMMENT '邮箱验证状态0(未验证)1(已验证)'
+  `email_verify_status` tinyint(4) NOT NULL DEFAULT '0' COMMENT '邮箱验证状态0(未验证)1(已验证)',
+  `last_lang` varchar(10) DEFAULT NULL COMMENT '最后登录语言'
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
 -- --------------------------------------------------------
@@ -3505,6 +3506,7 @@ CREATE TABLE `mall_messages` (
   `subject` varchar(256) NOT NULL COMMENT '消息主题',
   `content` longtext NOT NULL COMMENT '消息内容',
   `status` tinyint(1) NOT NULL DEFAULT '1' COMMENT '消息状态 1=展示 2=隐藏',
+  `is_batch` 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='商城站内信';
@@ -3520,7 +3522,8 @@ CREATE TABLE `mall_message_recipients` (
   `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 '时间'
+  `create_time` datetime DEFAULT NULL COMMENT '时间',
+  `update_time` datetime DEFAULT NULL COMMENT '更新时间'
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='站内信接收表';
 
 -- --------------------------------------------------------

package/storage/patch/patch.sql

@@ -1,232 +1,7 @@
-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');
-
-
-
-
-
--- 升级地址
-UPDATE mall_address SET street = CONCAT(street,'  ', apartment) WHERE country = 'JP';
-UPDATE mall_address SET apartment = '';
-
-UPDATE mall_address SET street = CONCAT(city,' ', street) WHERE country = 'JP' AND city !='';
-UPDATE mall_address SET city = '';
-
-UPDATE mall_address SET last_name = CONCAT(last_name,' ', first_name) WHERE country = 'JP' AND first_name !='';
-UPDATE mall_address SET first_name = '';
-
---
-UPDATE mall_billing_address SET street = CONCAT(street,'  ', apartment) WHERE country = 'JP';
-UPDATE mall_billing_address SET apartment = '';
-
-UPDATE mall_billing_address SET street = CONCAT(city,' ', street) WHERE country = 'JP' AND city !='';
-UPDATE mall_billing_address SET city = '';
-
+ALTER TABLE `mall_messages` ADD `is_batch` TINYINT(1) NOT NULL DEFAULT '1' COMMENT '1=群发 2=私发' AFTER `status`;
+ALTER TABLE `mall_message_recipients` ADD `update_time` DATETIME NULL DEFAULT NULL COMMENT '更新时间' AFTER `create_time`;
 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 = '';
 
-
-
+-- 用户最后登录语言
+ALTER TABLE `mall_members` ADD `last_lang` VARCHAR(10) NULL DEFAULT NULL COMMENT '最后登录语言' AFTER `email_verify_status`;

package/version

@@ -1 +1 @@
-v1.50.3
+v1.51.1

package/resource/public/cp/css/lang-id-ID-service~8773d05b.78f40eae.css

@@ -1 +0,0 @@
-.page-header-content{display:-webkit-box;display:-ms-flexbox;display:flex}.page-header-content .avatar{-webkit-box-flex:0;-ms-flex:0 1 72px;flex:0 1 72px}.page-header-content .avatar>span{display:block;width:72px;height:72px;border-radius:72px}.page-header-content .content{position:relative;top:4px;-webkit-box-flex:1;-ms-flex:1 1 auto;flex:1 1 auto;margin-left:24px;color:#8c8c8c;line-height:22px}.page-header-content .content .content-title{margin-bottom:12px;color:#222;font-weight:500;font-size:20px;line-height:28px}.extra-content{zoom:1;float:right;white-space:nowrap}.extra-content:after,.extra-content:before{display:table;content:" "}.extra-content:after{clear:both;height:0;font-size:0;visibility:hidden}.extra-content .stat-item{position:relative;display:inline-block;padding:0 32px}.extra-content .stat-item>p:first-child{margin-bottom:4px;color:#8c8c8c;font-size:13px;line-height:22px}.extra-content .stat-item>p{margin:0;color:#222;font-size:30px;line-height:38px}.extra-content .stat-item>p>span{color:#8c8c8c;font-size:20px}.extra-content .stat-item:after{position:absolute;top:8px;right:0;width:1px;height:40px;background-color:#e8e8e8;content:""}.extra-content .stat-item:last-child{padding-right:0}.extra-content .stat-item:last-child:after{display:none}