@bee-hole/server 1.96.2 → 1.97.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bee-hole/server",
-  "version": "1.96.2",
+  "version": "1.97.0",
   "description": "www.bee-hole.com",
   "main": "index.js",
   "directories": {

package/storage/init/init.sql

@@ -13618,7 +13618,8 @@ INSERT INTO `admin_menu` (`id`, `pid`, `name`, `code`, `icon`, `type`, `perms`,
 (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'),
-(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');
+(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');
 
 -- --------------------------------------------------------
 
@@ -31361,6 +31362,24 @@ CREATE TABLE `admin_video_dubbing` (
 
 -- --------------------------------------------------------
 
+--
+-- 表的结构 `admin_wms_config`
+--
+
+CREATE TABLE `admin_wms_config` (
+  `id` bigint(20) NOT NULL 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 '添加时间'
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+-- --------------------------------------------------------
+
 --
 -- 表的结构 `admin_work_order`
 --
@@ -40636,6 +40655,13 @@ ALTER TABLE `admin_video_dubbing`
   ADD UNIQUE KEY `admin_video_dubbing_shop_id_digest_uindex` (`shop_id`,`digest`),
   ADD KEY `admin_video_dubbing_status_index` (`status`);
 
+--
+-- 表的索引 `admin_wms_config`
+--
+ALTER TABLE `admin_wms_config`
+  ADD PRIMARY KEY (`id`),
+  ADD UNIQUE KEY `wms` (`shop_id`,`wms_type`) USING BTREE;
+
 --
 -- 表的索引 `admin_work_order`
 --
@@ -41921,7 +41947,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=2175;
+  MODIFY `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '菜单ID', AUTO_INCREMENT=2176;
 
 --
 -- 使用表AUTO_INCREMENT `admin_netsea_product`
@@ -42055,6 +42081,12 @@ ALTER TABLE `admin_trans`
 ALTER TABLE `admin_video_dubbing`
   MODIFY `id` bigint(20) UNSIGNED NOT NULL AUTO_INCREMENT COMMENT '表主键';
 
+--
+-- 使用表AUTO_INCREMENT `admin_wms_config`
+--
+ALTER TABLE `admin_wms_config`
+  MODIFY `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键';
+
 --
 -- 使用表AUTO_INCREMENT `admin_work_order`
 --
@@ -42814,4 +42846,4 @@ COMMIT;
 
 /*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
 /*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
-/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
+/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;

package/storage/patch/patch.sql

@@ -1,155 +1,17 @@
-ALTER TABLE `mall_warehouse`
-    ADD COLUMN `wms_id`  bigint(20) NULL COMMENT 'wmsConfigID' AFTER `province`,
-    ADD COLUMN `cang_id`  bigint(20) NULL AFTER `wms_id`,
-    ADD COLUMN `shipping_methods`  longtext NULL COMMENT '物流服务商list' AFTER `cang_id`,
-    ADD COLUMN `api_charging`  int(1) NULL COMMENT '是否开启api计费，0=>否， 1=>是' default 0 AFTER `shipping_methods`;
-
-DROP TABLE IF EXISTS `admin_good_cang_warehouse`;
-CREATE TABLE `admin_good_cang_warehouse` (
-     `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键',
-     `shop_id` bigint(20) NOT NULL COMMENT '店铺ID',
-     `wms_id` bigint(20) NOT NULL COMMENT '服务商ID',
-     `warehouse_code` varchar(128) NOT NULL COMMENT '仓库代码',
-     `warehouse_name` varchar(255) NOT NULL COMMENT '仓库名称',
-     `warehouse_name_cn` varchar(255) DEFAULT NULL COMMENT '仓库中文名称',
-     `warehouse_address` varchar(255) DEFAULT NULL COMMENT '仓库地址',
-     `warehouse_contact` varchar(255) DEFAULT NULL COMMENT '仓库联系人',
-     `warehouse_phone` varchar(255) DEFAULT NULL COMMENT '仓库电话',
-     `warehouse_email` varchar(255) DEFAULT NULL COMMENT '仓库邮箱',
-     `warehouse_status` int(11) DEFAULT NULL COMMENT '仓库状态：1-正常，2-维护中，3-已关闭',
-     `country_code` varchar(2) DEFAULT NULL COMMENT '仓库所在国家二字码',
-     `country_name` varchar(255) DEFAULT NULL COMMENT '仓库所在国家名称',
-     `country_name_cn` varchar(255) DEFAULT NULL COMMENT '仓库所在国家中文名称',
-     `wp_list` longtext COMMENT '物理仓对象数组，存储为JSON格式',
-     `created_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '记录创建时间',
-     `updated_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '记录更新时间',
-     PRIMARY KEY (`id`),
-     UNIQUE KEY `warehouse` (`shop_id`,`warehouse_code`) USING BTREE
-) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4;
-
-DROP TABLE IF EXISTS `admin_good_cang_shipping_methods`;
-CREATE TABLE `admin_good_cang_shipping_methods` (
-    `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键',
-    `code` varchar(128) DEFAULT NULL COMMENT '物流产品编码',
-    `name` varchar(255) DEFAULT NULL COMMENT '物流产品中文名称',
-    `name_en` varchar(255) DEFAULT NULL COMMENT '物流产品英文名称',
-    `type` varchar(255) NOT NULL COMMENT '物流产品类型(必填) 0:尾程物流产品 1:退货代选物流产品 2:头程物流产品 3:退货自选物流产品',
-    `is_signature` int(11) DEFAULT NULL COMMENT '是否需要签名 0否 1是',
-    `sp_code` varchar(255) DEFAULT NULL COMMENT '物流商代码',
-    `address_validation` int(11) DEFAULT NULL COMMENT '是否支持地址校验 0否 1是',
-    `is_specify_arrival_time` int(11) DEFAULT NULL COMMENT '是否支持指定送达时间 0否 1是',
-    `delivery_time_list` longtext COMMENT '送达时间列表',
-    `is_truck` int(11) DEFAULT NULL COMMENT '是否卡车派送 0否 1是',
-    `sm_business_type` int(11) DEFAULT NULL COMMENT '业务类型',
-    `is_optional_board` int(11) DEFAULT NULL COMMENT '是否支持选择面板 0否 1是',
-    `distributor_type` int(11) DEFAULT NULL COMMENT '配送商类型',
-    `is_ooh` int(11) DEFAULT NULL COMMENT '是否支持户外配送 0否 1是',
-    `created_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '记录创建时间',
-    `updated_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '记录更新时间',
-    PRIMARY KEY (`id`),
-    KEY `wareShipping` (`code`)
-) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4;
-
-DROP TABLE IF EXISTS `admin_good_cang_shipping_method`;
-CREATE TABLE `admin_good_cang_shipping_method` (
+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',
-    `wms_id` bigint(20) NOT NULL COMMENT '服务商ID',
-    `warehouse_code` varchar(128) NOT NULL COMMENT '仓库code',
-    `code` varchar(255) NOT NULL COMMENT '物流商code',
-    `is_enabled` int(1) NOT NULL DEFAULT '2' COMMENT '是否启用 1=>是，2=>否',
+    `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`),
-    KEY `wareShipping` (`shop_id`,`code`(128))
-) ENGINE=InnoDB AUTO_INCREMENT=4957 DEFAULT CHARSET=utf8mb4;
-
-DROP TABLE IF EXISTS `admin_video_dubbing`;
-CREATE TABLE IF NOT EXISTS `admin_video_dubbing`
-(
-    id           bigint unsigned auto_increment comment '表主键'
-        primary key,
-    shop_id      bigint       not null comment '店铺名称',
-    project_name varchar(50) null comment '项目名称',
-    filename     varchar(255) not null comment '文件名称',
-    digest       varchar(128) not null comment '摘要',
-    dubbing_id   varchar(128) not null comment 'elevenlabs侧dubbing_id',
-    source_lang  varchar(2)   not null comment '原视频语言',
-    target_lang  varchar(2)   not null comment '配音语言',
-    video_url    text null comment '视频地址',
-    status       int          not null comment '0不可下载,1可下载,2已下载',
-    create_time  datetime     not null comment '数据创建时间',
-    constraint admin_video_dubbing_shop_id_digest_uindex
-        unique (shop_id, digest)
-)comment '视频配音表';
-
-create index admin_video_dubbing_status_index on admin_video_dubbing (status);
-alter table mall_uploads add size BIGINT not null comment '文件大小' after oss_type;
-alter table mall_uploads modify name varchar (128) not null comment '图片名称';
-create index mall_uploads_id_shop_id_name_index on mall_uploads (shop_id, name);
-
-ALTER TABLE `mall_goods` ADD `source_language` VARCHAR(10) NULL DEFAULT NULL COMMENT '源语言' AFTER `shipping_period`;
-UPDATE `mall_goods` SET `source_language` = (SELECT `language` FROM `mall_shop_view` WHERE `is_default` = 1 LIMIT 1);
-
-ALTER TABLE `mall_sku_props_sub` CHANGE `prop_name` `prop_name` VARCHAR(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '类型名称';
-ALTER TABLE `mall_sku_props` CHANGE `prop_name` `prop_name` VARCHAR(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '类型名称';
-ALTER TABLE `mall_sku_values` CHANGE `prop_value` `prop_value` VARCHAR(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '类型值';
-ALTER TABLE `mall_sku_values_sub` CHANGE `prop_value` `prop_value` VARCHAR(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '类型值';
-
-DROP TABLE IF EXISTS `mall_goods_trans`;
-CREATE TABLE IF NOT EXISTS `mall_goods_trans` (
-    `trans_id` bigint(20) NOT NULL AUTO_INCREMENT,
-    `shop_id` bigint(20) NOT NULL COMMENT '店铺编号',
-    `view_id` bigint(20) NOT NULL,
-    `good_id` bigint(20) NOT NULL COMMENT '商品编号',
-    `type` varchar(50) NOT NULL COMMENT '类型',
-    `origin_url` varchar(255) NOT NULL COMMENT '原始图片',
-    `request_id` varchar(50) DEFAULT NULL COMMENT '图片翻译的请求编号',
-    `result_url` varchar(255) DEFAULT NULL COMMENT '翻译后的图片',
-    `status` tinyint(1) NOT NULL DEFAULT '0',
-    `create_time` datetime DEFAULT NULL COMMENT '创建时间',
-    `update_time` datetime DEFAULT NULL COMMENT '更新时间',
-    PRIMARY KEY (`trans_id`) USING BTREE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
-
-DROP TABLE IF EXISTS `admin_division_rule`;
-CREATE TABLE IF NOT EXISTS `admin_division_rule` (
-    `rule_id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '规则编号',
-    `shop_id` bigint(20) NOT NULL COMMENT '店铺编号',
-    `user_id` bigint(20) NOT NULL COMMENT '用户编号',
-    `rule_name` varchar(255) NOT NULL COMMENT '规则名称',
-    `sort` int(10) NOT NULL DEFAULT '999' COMMENT '优先级顺序',
-    `status` tinyint(1) NOT NULL DEFAULT '1' COMMENT '启用状态1=启用2=禁用默认1',
-    `order_from` longtext COMMENT '订单来源',
-    `target_country` longtext COMMENT '目标国家',
-    `province` longtext COMMENT '州/省',
-    `other_conditions` longtext COMMENT '其他条件比如邮编、邮编长度等',
-    `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',
-    `balance_type` varchar(128) DEFAULT NULL COMMENT '差额类型比如USD',
-    `priority_type` tinyint(1) NOT NULL DEFAULT '1' COMMENT '优先方式 1=时效快2=价格低',
-    `wms_id` bigint(20) NOT NULL COMMENT '服务商编号',
-    `warehouse` longtext COMMENT '仓库',
-    `is_check_inventory` tinyint(4) NOT NULL DEFAULT '1' COMMENT '是否检测库存1=检测2=不检测默认1',
-    `Inventory_num` bigint(20) NOT NULL DEFAULT '0' COMMENT '检测库存开启时，库存小于等于数量不使用规则',
-    `create_time` datetime DEFAULT NULL COMMENT '创建时间',
-    `update_time` datetime DEFAULT NULL COMMENT '更新时间',
-    PRIMARY KEY (`rule_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='分仓规则';
+    UNIQUE KEY `wms` (`shop_id`,`wms_type`) USING BTREE
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4;
 
-DROP TABLE IF EXISTS `admin_division_rule_log`;
-CREATE TABLE IF NOT EXISTS `admin_division_rule_log` (
-     `log_id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '日志编号',
-     `shop_id` bigint(20) NOT NULL COMMENT '店铺编号',
-     `order_id` varchar(64) NOT NULL COMMENT '订单编号',
-     `rule_id` bigint(20) NOT NULL COMMENT '规则编号',
-     `status` tinyint(1) NOT NULL DEFAULT '1' COMMENT '是否成功检测1=成功2=失败',
-     `message_content` longtext COMMENT '错误信息',
-     `fuwu_id` bigint(20) NOT NULL COMMENT '服务商编号',
-     `warehouse_code` varchar(128) NOT NULL COMMENT '仓库代码',
-     `shipping_method` varchar(128) NOT NULL COMMENT '物流方式',
-     `distributor_type` tinyint(1) NOT NULL DEFAULT '0' COMMENT '配送商 谷仓合作物流、1客户物流(谷仓交运》、2客户物流(自提)',
-     `shipping_fee` decimal(10,2) NOT NULL COMMENT '邮费',
-     `delivery_time` bigint(20) NOT NULL COMMENT '时效',
-     `create_time` datetime DEFAULT NULL COMMENT '创建时间',
-     PRIMARY KEY (`log_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='分仓规则日志表';
+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');

package/version

@@ -1 +1 @@
-v1.96.2
+v1.97.0