@bee-hole/server 1.97.0 → 1.98.0

package/storage/init/init.sql

@@ -12807,6 +12807,7 @@ CREATE TABLE `admin_division_rule` (
   `target_country` longtext COMMENT '目标国家',
   `province` longtext COMMENT '州/省',
   `other_conditions` longtext COMMENT '其他条件比如邮编、邮编长度等',
+  `fencang_mode` tinyint(1) NOT NULL DEFAULT '1' COMMENT '1=基础 2=比价 默认1',
   `price_compare_method` tinyint(1) NOT NULL DEFAULT '1' COMMENT '比价方式 1=取价格低2=取时效快3=取优先级高默认1',
   `compare_ext_method` tinyint(1) NOT NULL DEFAULT '1' COMMENT '比价扩展方式1=价格2=时效',
   `ext_method_balance` decimal(10,2) NOT NULL DEFAULT '0.10' COMMENT '扩展方式差额 比如邮费相差0.1',
@@ -13556,14 +13557,14 @@ INSERT INTO `admin_menu` (`id`, `pid`, `name`, `code`, `icon`, `type`, `perms`,
 (2077, 2051, 'app.menus.left.shop.currency', 'currency', 'property-safety', 'C', '', 'currency', 'config/currency/index', '', '1', '2', '2', '', 2, '', 13, '1', '2023-04-12 10:56:48', '2023-07-18 05:43:42'),
 (2080, 2006, 'app.menus.left.setting.shoplanguage', 'shopview', 'copy', 'C', '', 'shopview', 'shopview/ShoViewList', '', '1', '2', '2', '', 2, '', 20, '1', '2023-04-14 07:52:52', '2023-08-31 06:37:48'),
 (2081, 2051, 'app.menus.left.shop.shenbao', 'pushconfig', 'fork', 'C', '', 'pushConfig', 'config/pushConfig/index', '', '1', '2', '2', '', 2, '', 14, '1', '2023-04-17 07:55:53', '2023-07-18 05:45:24'),
-(2082, 2043, 'app.menus.left.item.warehouselist', 'warehouse', 'layout', 'C', '', 'wareHouse', 'wareHouse/list', '', '1', '2', '1', '', 2, '', 40, '1', '2023-04-18 01:12:33', '2023-06-07 02:36:58'),
+(2082, 2176, 'app.menus.left.item.warehouselist', 'warehouse', 'layout', 'C', '', 'wareHouse', 'wareHouse/list', '', '1', '2', '1', '', 2, '', 40, '1', '2023-04-18 01:12:33', '2023-06-07 02:36:58'),
 (2084, 2043, '商品备案', 'filings', 'file-sync', 'C', '', 'filings', 'item/filings/index', '', '1', '2', '1', '', 2, '', 12, '1', '2023-04-20 08:02:14', '2023-05-06 08:43:58'),
 (2085, 2056, 'app.menus.left.order.afterorder', 'orderAfter', 'bars', 'C', '', 'orderAfter', 'order/orderAfter', '', '1', '2', '2', '', 2, '', 22, '1', '2023-04-26 01:32:42', '2023-07-18 05:40:51'),
 (2086, 2051, 'app.menus.left.shop.transtask', 'fanyirenwu', 'file-done', 'C', '', 'trans_task_index', 'transtask/TransTaskIndex', '', '1', '2', '1', '', 2, '', 13, '1', '2023-05-18 08:29:07', '2023-06-02 08:21:37'),
 (2087, 2051, 'app.menus.left.shop.liuyan', 'email', 'mail', 'C', '', 'emailConfig', 'config/email/index', '', '1', '2', '2', '', 2, '', 2, '1', '2023-05-26 10:26:19', '2023-08-24 00:06:36'),
 (2088, 2051, 'app.menus.left.shop.emailList', 'emailList', 'mail', 'C', '', 'emailList', 'email/index', '', '1', '2', '2', '', 2, '', 10, '1', '2023-05-30 05:23:19', '2023-07-18 05:42:27'),
 (2089, 2051, 'app.menus.left.shopconfig', 'shopconfig', 'setting', 'C', '', '/shopconfig', 'config/shop/index', '', '1', '2', '2', '', 2, '', 1, '1', '2023-06-05 15:02:58', '2023-08-24 00:06:17'),
-(2090, 2043, 'app.menus.left.item.skustocklist', 'skulist', 'reconciliation', 'C', '', '/skulist', 'item/skulist/index', '', '1', '2', '2', '', 2, '', 3, '1', '2023-06-07 09:08:58', '2023-08-24 00:05:49'),
+(2090, 2176, 'app.menus.left.item.skustocklist', 'skulist', 'reconciliation', 'C', '', '/skulist', 'item/skulist/index', '', '1', '2', '2', '', 2, '', 3, '1', '2023-06-07 09:08:58', '2023-08-24 00:05:49'),
 (2091, 0, 'app.menus.left.article', 'article', 'file-text', 'M', '', '/article', '', '', '1', '2', '2', '', 1, '', 10, '1', '2023-07-03 03:32:00', '2023-07-03 03:32:00'),
 (2092, 2091, 'app.menus.left.article.cat_list', 'articleCat', 'bars', 'C', '', 'articlecat', 'article/ArticleCat', '', '1', '2', '2', '', 2, '', 2, '1', '2023-07-03 11:33:29', '2023-11-01 08:21:59'),
 (2093, 2091, 'app.menus.left.article.article_list', 'articleList', 'bars', 'C', '', 'articleList', 'article/ArticleList', '', '1', '2', '2', '', 2, '', 1, '1', '2023-07-03 11:34:48', '2023-11-01 08:21:48'),
@@ -13597,7 +13598,7 @@ INSERT INTO `admin_menu` (`id`, `pid`, `name`, `code`, `icon`, `type`, `perms`,
 (2142, 2140, 'app.menus.left.supply.supplyOrder', 'supplyOrder', 'file', 'C', '', '/supplyOrder', 'supply/supplyOrder', '', '1', '2', '2', '', 2, '', 20, '1', '2024-01-09 08:03:53', '2024-01-09 08:20:07'),
 (2143, 2006, 'app.menus.left.public.scat.service', 'scat', 'profile', 'C', '', 'scat', 'system/scat/index', '', '1', '2', '2', '', 2, '', 1010, '1', '2023-09-05 00:49:12', '2023-09-05 00:49:12'),
 (2144, 2006, 'app.menus.left.public.scat.goodinfo.service', 'goodinfo', 'bars', 'C', '', 'goodinfo', 'system/goodinfo/index', '', '1', '2', '1', '', 2, '', 1010, '1', '2023-09-06 00:41:01', '2023-09-06 00:50:18'),
-(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'),
+(2145, 2176, 'app.menus.left.setting.webhook.order', 'webhook', 'bars', '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'),
@@ -13619,7 +13620,8 @@ INSERT INTO `admin_menu` (`id`, `pid`, `name`, `code`, `icon`, `type`, `perms`,
 (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'),
 (2174, 2166, 'app.menus.left.goodsSource.other', 'spyder', 'shop', 'C', '', 'spyder', 'goodsSource/spyder/index', '', '1', '2', '2', '', 2, '', 21, '1', '2024-09-02 03:54:14', '2024-09-18 00:41:42'),
-(2175, 2043, 'app.menus.left.warehouse.rule', 'warehouseRule', 'bars', 'C', '', 'warehouseRule', 'wareHouse/rule/list', '', '1', '2', '2', '', 2, '', 12, '1', '2024-12-02 06:16:22', '2024-12-03 05:56:35');
+(2175, 2176, 'app.menus.left.warehouse.rule', 'warehouseRule', 'bars', 'C', '', 'warehouseRule', 'wareHouse/rule/list', '', '1', '2', '2', '', 2, '', 12, '1', '2024-12-02 06:16:22', '2024-12-03 05:56:35'),
+(2176, 0, 'compoents.warehousePolicy.warehouse', 'cangku', 'home', 'M', '', '/cangku', '', '', '1', '2', '2', '', 1, '', 10, '1', '2024-12-10 07:29:36', '2024-12-10 07:29:36');
 
 -- --------------------------------------------------------
 
@@ -31375,6 +31377,7 @@ CREATE TABLE `admin_wms_config` (
   `config` longtext COMMENT '关于仓库的配置json',
   `status` int(1) NOT NULL DEFAULT '2' COMMENT '状态 1=>启用  2=>不启用',
   `is_sand_box` int(1) DEFAULT NULL COMMENT '是否沙箱 1=>是，2=>否',
+  `api_charging` int(1) DEFAULT '1' COMMENT '是否开启api计费，1=>是， 2=>否',
   `create_time` datetime DEFAULT NULL COMMENT '添加时间'
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
@@ -41947,7 +41950,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=2176;
+  MODIFY `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '菜单ID', AUTO_INCREMENT=2177;
 
 --
 -- 使用表AUTO_INCREMENT `admin_netsea_product`

package/storage/patch/patch.sql

@@ -1,17 +1,32 @@
-DROP TABLE IF EXISTS `admin_wms_config`;
-CREATE TABLE `admin_wms_config` (
-    `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键',
-    `user_id` bigint(20) NOT NULL COMMENT '用户ID',
-    `shop_id` bigint(20) NOT NULL COMMENT '店铺ID',
-    `name` varchar(255) DEFAULT NULL COMMENT '仓库名称',
-    `wms_type` varchar(64) DEFAULT NULL COMMENT '仓库类型',
-    `config` longtext COMMENT '关于仓库的配置json',
-    `status` int(1) NOT NULL DEFAULT '2' COMMENT '状态 1=>启用  2=>不启用',
-    `is_sand_box` int(1) DEFAULT NULL COMMENT '是否沙箱 1=>是，2=>否',
-    `create_time` datetime DEFAULT NULL COMMENT '添加时间',
-    PRIMARY KEY (`id`),
-    UNIQUE KEY `wms` (`shop_id`,`wms_type`) USING BTREE
-) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4;
+ALTER TABLE `admin_wms_config` ADD COLUMN `api_charging`  int(1) NULL DEFAULT 1 COMMENT '是否开启api计费，1=>是， 2=>否' AFTER `is_sand_box`;
+
+ALTER TABLE `admin_division_rule` ADD `fencang_mode` TINYINT(1) NOT NULL DEFAULT '1' COMMENT '1=基础 2=比价 默认1' AFTER `other_conditions`;
 
 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
-    (2043, 'app.menus.left.warehouse.rule', 'warehouseRule', 'bars', 'C', '', 'warehouseRule', 'wareHouse/rule/list', '', '1', '2', '2', '', 2, '', 12, '1', '2024-12-02 06:16:22', '2024-12-03 05:56:35');
+    (0, 'compoents.warehousePolicy.warehouse', 'cangku', 'home', 'M', '', '/cangku', '', '', '1', '2', '2', '', 1, '', 10, '1', '2024-12-10 07:29:36', '2024-12-10 07:29:36');
+
+UPDATE `admin_menu` AS am
+    JOIN (SELECT `id` FROM `admin_menu` WHERE `code` = 'cangku' LIMIT 1) AS cangku_id
+    ON 1=1
+SET am.`pid` = COALESCE(cangku_id.`id`, am.`pid`)
+WHERE am.`code` = 'warehouseRule';
+
+UPDATE `admin_menu` AS am
+    JOIN (SELECT `id` FROM `admin_menu` WHERE `code` = 'cangku' LIMIT 1) AS cangku_id
+    ON 1=1
+SET am.`pid` = COALESCE(cangku_id.`id`, am.`pid`)
+WHERE am.`code` = 'webhook';
+
+UPDATE `admin_menu` AS am
+    JOIN (SELECT `id` FROM `admin_menu` WHERE `code` = 'cangku' LIMIT 1) AS cangku_id
+    ON 1=1
+SET am.`pid` = COALESCE(cangku_id.`id`, am.`pid`)
+WHERE am.`code` = 'skulist';
+
+UPDATE `admin_menu` AS am
+    JOIN (SELECT `id` FROM `admin_menu` WHERE `code` = 'cangku' LIMIT 1) AS cangku_id
+    ON 1=1
+SET am.`pid` = COALESCE(cangku_id.`id`, am.`pid`)
+WHERE am.`code` = 'warehouse';
+
+UPDATE `admin_menu` SET `name` = 'app.menus.left.setting.webhook.order', `icon` = 'bars' WHERE `admin_menu`.`code` = 'webhook';

package/version

@@ -1 +1 @@
-v1.97.0
+v1.98.0