@bee-hole/server 1.78.4 → 1.80.0

package/storage/init/init.sql

@@ -12697,7 +12697,7 @@ INSERT INTO `admin_configs` (`name`, `value`) VALUES
 ('router.admin.exceptAuth', '[\"/member/info\",\"/role/dynamic\"]'),
 ('router.admin.exceptLogin', '[\"/login/captcha\",\"/login/sign\",\"/login/logout\",\"/login/sub/sign\",\"/login/sub/auth\",\"/login/sub/syn/auth\",\"/member/register\",\"/member/email/verify\",\"/google/oauth/callback\",\"/member/external/register\",\"/login/auth\",\"/copyright\",\"/role/get_service_fee_list\",\"/role/get_valid_service_fee\",\"/role/buy_service\"]'),
 ('router.mall.exceptAuth', '[\"/guest/login\"]'),
-('router.mall.exceptLogin', '[\"/member/captcha\",\"/member/login\",\"/member/register\",\"/member/logout\",\"/good/list\",\"/good/info\",\"/shop/view\",\"/cat/list\",\"/standard/cat\",\"/config/list\",\"/config/all\",\"/article/list\",\"/article/get\",\"/article/cat/list\",\"/article/new-list\",\"/good/same/cat\",\"/review/list\",\"/order/query\",\"/order/payment\",\"/shop/view\",\"/shop-config/get\",\"/shop-config/all\",\"/sitemap.xml\",\"/member/phone/verify\",\"/member/email/verify\",\"/guest/login\",\"/guest/make/key\",\"/guest/get/token\",\"/product/search\"]');
+('router.mall.exceptLogin', '[\"/member/captcha\",\"/member/login\",\"/member/register\",\"/member/logout\",\"/good/list\",\"/good/info\",\"/shop/view\",\"/cat/list\",\"/standard/cat\",\"/config/list\",\"/config/all\",\"/article/list\",\"/article/get\",\"/article/cat/list\",\"/article/new-list\",\"/good/same/cat\",\"/review/list\",\"/order/query\",\"/order/payment\",\"/shop/view\",\"/shop-config/get\",\"/shop-config/all\",\"/sitemap.xml\",\"/member/phone/verify\",\"/member/email/verify\",\"/guest/login\",\"/guest/make/key\",\"/guest/get/token\",\"/mall/product/search\",\"/good/wholesale/get\"]');
 
 -- --------------------------------------------------------
 
@@ -13350,9 +13350,15 @@ INSERT INTO `admin_menu` (`id`, `pid`, `name`, `code`, `icon`, `type`, `perms`,
 (2160, 2158, 'app.menus.member.distribution.distributor.grade', 'mgrade', 'star', 'C', '', '/mgrade', 'mallfenxiao/mgrade', '', '1', '2', '2', '', 2, '', 21, '1', '2024-06-24 03:11:20', '2024-06-26 05:57:32'),
 (2161, 2158, 'app.menus.member.distribution.distributor.order', 'mdetail', 'bars', 'C', '', '/mdetail', 'mallfenxiao/mdetail', '', '1', '2', '2', '', 2, '', 22, '1', '2024-06-25 00:37:08', '2024-06-26 05:57:42'),
 (2162, 2158, 'app.menus.left.member.distribution.clearing.order', 'mclearing', 'bars', 'C', '', '/mclearing', 'mallfenxiao/mclearing', '', '1', '2', '2', '', 2, '', 23, '1', '2024-06-25 07:26:32', '2024-06-26 05:53:52'),
-(2163, 2043, 'app.menus.left.item.alibaba', 'search-alibaba', 'shop', 'C', '', 'searchalibaba', 'item/alibaba/index', '', '1', '2', '2', '', 2, '', 12, '1', '2024-06-20 06:44:02', '2024-06-20 06:44:02'),
 (2164, 2038, 'app.menus.left.quanxian.buyrecord', 'soft-buy-record', 'bars', 'C', '', 'buyrecord', 'system/role/BuyRecord', '', '1', '2', '2', '', 2, '', 1020, '1', '2024-08-13 05:25:15', '2024-08-13 05:30:59'),
-(2165, 2043, 'app.menus.left.item.gigab2b', 'gigab2b', 'shop', 'C', '', 'gigab2b', 'item/gigab2b/index', '', '1', '2', '2', '', 2, '', 12, '1', '2024-08-28 00:21:30', '2024-08-28 00:22:54');
+(2166, 0, 'app.menus.left.goodsSource', 'goodsSource', 'bank', 'M', '', '/goodsSource', '', '', '1', '2', '2', '', 1, '', 10, '1', '2024-09-02 02:56:29', '2024-09-02 02:56:49'),
+(2167, 2164, 'app.menus.left.goodsSource.gigab2b', 'gigab2b', 'shop', 'C', '', 'gigab2b', 'goodsSource/gigab2b/index', '', '1', '2', '2', '', 2, '', 12, '1', '2024-08-28 00:21:30', '2024-09-02 03:02:02'),
+(2168, 2164, 'app.menus.left.goodsSource.alibaba', 'search-alibaba', 'shop', 'C', '', 'searchalibaba', 'goodsSource/alibaba/index', '', '1', '2', '2', '', 2, '', 12, '1', '2024-06-20 06:44:02', '2024-09-02 03:01:56'),
+(2169, 2164, 'app.menus.left.goodsSource.beehole', 'beehole-goods', 'shop', 'C', '', 'beehole', 'goodsSource/beehole/index', '', '1', '2', '2', '', 2, '', 20, '1', '2024-09-02 03:54:14', '2024-09-02 03:54:14'),
+(2170, 0, 'app.menus.left.goodsSource', 'goodsSource', 'bank', 'M', '', '/goodsSource', '', '', '1', '2', '2', '', 1, '', 10, '1', '2024-09-02 02:56:29', '2024-09-02 02:56:49'),
+(2171, 2166, 'app.menus.left.goodsSource.gigab2b', 'gigab2b', 'shop', 'C', '', 'gigab2b', 'goodsSource/gigab2b/index', '', '1', '2', '2', '', 2, '', 12, '1', '2024-08-28 00:21:30', '2024-09-02 03:02:02'),
+(2172, 2166, 'app.menus.left.goodsSource.alibaba', 'search-alibaba', 'shop', 'C', '', 'searchalibaba', 'goodsSource/alibaba/index', '', '1', '2', '2', '', 2, '', 12, '1', '2024-06-20 06:44:02', '2024-09-02 03:01:56'),
+(2173, 2166, 'app.menus.left.goodsSource.beehole', 'beehole-goods', 'shop', 'C', '', 'beehole', 'goodsSource/beehole/index', '', '1', '2', '2', '', 2, '', 20, '1', '2024-09-02 03:54:14', '2024-09-02 03:54:14');
 
 -- --------------------------------------------------------
 
@@ -33359,6 +33365,22 @@ CREATE TABLE `mall_goods_sub` (
 
 -- --------------------------------------------------------
 
+--
+-- 表的结构 `mall_goods_wholesale`
+--
+
+CREATE TABLE `mall_goods_wholesale` (
+  `id` bigint(20) NOT NULL,
+  `shop_id` bigint(20) NOT NULL COMMENT '店铺编号',
+  `good_id` bigint(20) NOT NULL COMMENT '商品编号',
+  `type` tinyint(1) NOT NULL COMMENT '类型 1=折扣2=一口价',
+  `price` decimal(10,2) NOT NULL,
+  `start_num` bigint(20) NOT NULL COMMENT '开始数量',
+  `end_num` bigint(20) NOT NULL COMMENT '结束数量'
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='商品批发价';
+
+-- --------------------------------------------------------
+
 --
 -- 表的结构 `mall_good_infos`
 --
@@ -33387,7 +33409,7 @@ INSERT INTO `mall_good_infos` (`info_id`, `cid`, `name`, `sort`, `pid`) VALUES
 CREATE TABLE `mall_good_info_values` (
   `info_id` bigint(20) NOT NULL COMMENT '标准类目参数ID',
   `good_id` bigint(20) NOT NULL COMMENT '商品ID',
-  `value` varchar(255) DEFAULT NULL COMMENT '产品参数值'
+  `value` longtext COMMENT '产品参数值'
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
 -- --------------------------------------------------------
@@ -34181,6 +34203,7 @@ CREATE TABLE `mall_scats` (
   `cid` bigint(20) NOT NULL COMMENT '标准类目ID',
   `name` varchar(255) NOT NULL COMMENT '标准类目名称',
   `deduction_ratio` decimal(10,2) DEFAULT NULL COMMENT '扣点比例',
+  `is_rich_text` int(1) NOT NULL DEFAULT '0' COMMENT '是否富文本 0=>否  1=>是',
   `parent_id` bigint(20) NOT NULL DEFAULT '0' COMMENT '父级类目ID'
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
@@ -34188,18 +34211,18 @@ CREATE TABLE `mall_scats` (
 -- 转存表中的数据 `mall_scats`
 --
 
-INSERT INTO `mall_scats` (`cid`, `name`, `deduction_ratio`, `parent_id`) VALUES
-(0, 'default classification', 0.00, 0),
-(16, '女装/女士精品', NULL, 0),
-(21, '居家日用', NULL, 0),
-(30, '男装', NULL, 0),
-(50002766, '零食/坚果/特产', NULL, 0),
-(50006843, '女鞋', NULL, 0),
-(50008141, '酒类', NULL, 0),
-(50008165, '童装/婴儿装/亲子装', NULL, 0),
-(50010788, '彩妆/香水/美妆工具', NULL, 0),
-(50011740, '流行男鞋', NULL, 0),
-(122650005, '童鞋/婴儿鞋/亲子鞋', NULL, 0);
+INSERT INTO `mall_scats` (`cid`, `name`, `deduction_ratio`, `is_rich_text`, `parent_id`) VALUES
+(0, 'default classification', 0.00, 0, 0),
+(16, '女装/女士精品', NULL, 0, 0),
+(21, '居家日用', NULL, 0, 0),
+(30, '男装', NULL, 0, 0),
+(50002766, '零食/坚果/特产', NULL, 0, 0),
+(50006843, '女鞋', NULL, 0, 0),
+(50008141, '酒类', NULL, 0, 0),
+(50008165, '童装/婴儿装/亲子装', NULL, 0, 0),
+(50010788, '彩妆/香水/美妆工具', NULL, 0, 0),
+(50011740, '流行男鞋', NULL, 0, 0),
+(122650005, '童鞋/婴儿鞋/亲子鞋', NULL, 0, 0);
 
 -- --------------------------------------------------------
 
@@ -40357,6 +40380,12 @@ ALTER TABLE `mall_goods_sub`
   ADD KEY `good_id_2` (`good_id`,`shop_id`,`view_id`,`ai`),
   ADD KEY `good_id_3` (`good_id`,`shop_id`,`ai`,`language`) USING BTREE;
 
+--
+-- 表的索引 `mall_goods_wholesale`
+--
+ALTER TABLE `mall_goods_wholesale`
+  ADD PRIMARY KEY (`id`);
+
 --
 -- 表的索引 `mall_good_infos`
 --
@@ -41219,7 +41248,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=2166;
+  MODIFY `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '菜单ID', AUTO_INCREMENT=2174;
 
 --
 -- 使用表AUTO_INCREMENT `admin_netsea_product`
@@ -41545,6 +41574,12 @@ ALTER TABLE `mall_goods_relate`
 ALTER TABLE `mall_goods_specs`
   MODIFY `id` bigint(20) UNSIGNED NOT NULL AUTO_INCREMENT COMMENT '表主键';
 
+--
+-- 使用表AUTO_INCREMENT `mall_goods_wholesale`
+--
+ALTER TABLE `mall_goods_wholesale`
+  MODIFY `id` bigint(20) NOT NULL AUTO_INCREMENT;
+
 --
 -- 使用表AUTO_INCREMENT `mall_good_infos`
 --

package/storage/patch/patch.sql

@@ -1,18 +1,24 @@
-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\":\"越南语\"},{\"code\":\"ms-MY\",\"name\":\"Melayu\",\"cname\":\"马来西亚语\"}]}' WHERE (`name`='lang');
+DELETE FROM `admin_menu` WHERE `name`='app.menus.left.item.alibaba';
+DELETE FROM `admin_menu` WHERE `name`='app.menus.left.item.gigab2b';
 
-DROP TABLE IF EXISTS `admin_ozon_product`;
-create table if not exists `admin_ozon_product`
-(
-    id              BIGINT UNSIGNED auto_increment comment '表主键',
-    shop_id         BIGINT       not null comment '归属店铺',
-    goods_id        BIGINT       not null comment 'bee-hole侧商品ID',
-    offer_id        varchar(32)  not null comment '商户侧商品ID',
-    product_id      BIGINT null comment 'ozon侧商品ID',
-    title           varchar(255) not null comment '商品标题',
-    product_task_id BIGINT null comment '添加/更新商品任务ID',
-    sku_task_id     BIGINT null comment '添加/更新SKU任务ID',
-    create_time     datetime     not null comment '创建时间',
-    constraint admin_ozon_product_pk primary key (id)
-) comment 'ozon平台商品信息表';
+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 ('0', 'app.menus.left.goodsSource', 'goodsSource', 'bank', 'M', '', '/goodsSource', '', '', '1', '2', '2', '', '1', '', '10', '1', '2024-09-02 02:56:29', '2024-09-02 02:56:49');
+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 ('2166', 'app.menus.left.goodsSource.gigab2b', 'gigab2b', 'shop', 'C', '', 'gigab2b', 'goodsSource/gigab2b/index', '', '1', '2', '2', '', '2', '', '12', '1', '2024-08-28 00:21:30', '2024-09-02 03:02:02');
+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 ('2166', 'app.menus.left.goodsSource.alibaba', 'search-alibaba', 'shop', 'C', '', 'searchalibaba', 'goodsSource/alibaba/index', '', '1', '2', '2', '', '2', '', '12', '1', '2024-06-20 06:44:02', '2024-09-02 03:01:56');
+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 ('2166', 'app.menus.left.goodsSource.beehole', 'beehole-goods', 'shop', 'C', '', 'beehole', 'goodsSource/beehole/index', '', '1', '2', '2', '', '2', '', '20', '1', '2024-09-02 03:54:14', '2024-09-02 03:54:14');
 
-create unique index admin_ozon_product_shop_id_goods_id_uindex on `admin_ozon_product` (shop_id, goods_id);
+ALTER TABLE `mall_scats` ADD COLUMN `is_rich_text` int(1) NOT NULL DEFAULT 0 COMMENT '是否富文本 0=>否  1=>是' AFTER `deduction_ratio`;
+ALTER TABLE `mall_good_info_values` MODIFY COLUMN `value`  longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '产品参数值' AFTER `good_id`;
+
+UPDATE `admin_configs` SET `value` = '[\"/member/captcha\",\"/member/login\",\"/member/register\",\"/member/logout\",\"/good/list\",\"/good/info\",\"/shop/view\",\"/cat/list\",\"/standard/cat\",\"/config/list\",\"/config/all\",\"/article/list\",\"/article/get\",\"/article/cat/list\",\"/article/new-list\",\"/good/same/cat\",\"/review/list\",\"/order/query\",\"/order/payment\",\"/shop/view\",\"/shop-config/get\",\"/shop-config/all\",\"/sitemap.xml\",\"/member/phone/verify\",\"/member/email/verify\",\"/guest/login\",\"/guest/make/key\",\"/guest/get/token\",\"/mall/product/search\",\"/good/wholesale/get\"]' WHERE `admin_configs`.`name` = 'router.mall.exceptLogin';
+
+DROP TABLE IF EXISTS `mall_goods_wholesale`;
+CREATE TABLE IF NOT EXISTS `mall_goods_wholesale` (
+    `id` bigint(20) NOT NULL AUTO_INCREMENT,
+    `shop_id` bigint(20) NOT NULL COMMENT '店铺编号',
+    `good_id` bigint(20) NOT NULL COMMENT '商品编号',
+    `type` tinyint(1) NOT NULL COMMENT '类型 1=折扣2=一口价',
+    `price` decimal(10,2) NOT NULL,
+    `start_num` bigint(20) NOT NULL COMMENT '开始数量',
+    `end_num` bigint(20) NOT NULL COMMENT '结束数量',
+    PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='商品批发价';

package/version

@@ -1 +1 @@
-v1.78.4
+v1.80.0