@bee-hole/server 1.48.2 → 1.49.1

package/package.json

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

package/storage/init/init.sql

@@ -3456,56 +3456,6 @@ CREATE TABLE `mall_member_tag_associations` (
 
 -- --------------------------------------------------------
 
---
--- 表的结构 `mall_notification_records`
---
-
-CREATE TABLE `mall_notification_records` (
-  `id` bigint(20) UNSIGNED NOT NULL COMMENT '表主键',
-  `shop_id` bigint(20) NOT NULL COMMENT '所属店铺',
-  `sort` varchar(20) NOT NULL COMMENT '分类:  订单>    ORD_PAID(订单已支付)   ORD_SHIPPED(订单已发货)    ORD_RECEIVED(订单已收货)    ORD_RATED(订单已评价)    ORD_AFTER_SALE(订单售后中)    ORD_REFUNDED(订单已退款)     营销>    MAR_PRODUCT_NEW(商品上新)    MAR_COUPON_GIVEAWAY(优惠券派送)         供货>       SUP_PRODUCT_SUBMIT(供货商品提交)       SUP_PRODUCT_REVIEW(供货商品审核)       SUP_ORDER_CREATE(供货商品产生订单)      SUP_ORDER_SHIPPED(供应单发货)            分销>         DIS_PUB_PRODUCT_ON(刊登商品上架)         DIS_PUB_PRODUCT_OFF(刊登商品下架)         DIS_PURCHASE_CREATE(刊登商品产生采购单)        DIS_PURCHASE_SHIPPED(采购单发货)             库存>        STO_GOODS_NOT_ENOUGH(商品库存不足)               互动>         INT_USER_COMMENTS(用户留言)        INT_USER_FEEDBACK(留言回复)   ',
-  `audience` varchar(64) NOT NULL COMMENT '受众',
-  `sender_type` varchar(5) NOT NULL COMMENT '发送类型:SMS短信,EMAIL邮件',
-  `subject` varchar(100) NOT NULL COMMENT '主题',
-  `body` text COMMENT '消息体',
-  `status` int(11) NOT NULL COMMENT '发送状态,默认0成功,1失败',
-  `failure_reason` varchar(200) DEFAULT NULL COMMENT '失败原因',
-  `create_time` datetime NOT NULL COMMENT '数据创建时间'
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='通知记录表';
-
--- --------------------------------------------------------
-
---
--- 表的结构 `mall_notification_switch`
---
-
-CREATE TABLE `mall_notification_switch` (
-  `id` bigint(20) NOT NULL COMMENT '表主键',
-  `shop_id` bigint(20) NOT NULL COMMENT '店铺ID',
-  `sort` varchar(20) NOT NULL COMMENT '事件类型',
-  `switch` tinyint(4) NOT NULL COMMENT '开关: 0开1关',
-  `create_time` datetime NOT NULL COMMENT '数据创建时间'
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='通知开关表';
-
--- --------------------------------------------------------
-
---
--- 表的结构 `mall_notification_template`
---
-
-CREATE TABLE `mall_notification_template` (
-  `id` bigint(20) UNSIGNED NOT NULL COMMENT '表主键',
-  `template_id` varchar(32) NOT NULL COMMENT '模板id',
-  `subject` varchar(100) NOT NULL COMMENT '邮件主题或短信标题',
-  `body` text NOT NULL COMMENT '模板定义消息体',
-  `sort` varchar(20) NOT NULL COMMENT '分类: \n订单> \n  ORD_PAID(订单已支付)\n  ORD_SHIPPED(订单已发货) \n  ORD_RECEIVED(订单已收货) \n  ORD_RATED(订单已评价) \n  ORD_AFTER_SALE(订单售后中) \n  ORD_REFUNDED(订单已退款) \n \n 营销>\n   MAR_PRODUCT_NEW(商品上新)\n   MAR_COUPON_GIVEAWAY(优惠券派送) \n    \n  供货> \n     SUP_PRODUCT_SUBMIT(供货商品提交) \n     SUP_PRODUCT_REVIEW(供货商品审核) \n     SUP_ORDER_CREATE(供货商品产生订单)\n     SUP_ORDER_SHIPPED(供应单发货) \n      \n   分销> \n       DIS_PUB_PRODUCT_ON(刊登商品上架) \n       DIS_PUB_PRODUCT_OFF(刊登商品下架) \n       DIS_PURCHASE_CREATE(刊登商品产生采购单)\n       DIS_PURCHASE_SHIPPED(采购单发货) \n        \n  库存>\n       STO_GOODS_NOT_ENOUGH(商品库存不足) \n          \n  互动> \n       INT_USER_COMMENTS(用户留言)\n       INT_USER_FEEDBACK(留言回复)   ',
-  `shop_id` bigint(20) NOT NULL COMMENT '店铺ID',
-  `sender_type` varchar(5) NOT NULL COMMENT '发送类型:SMS(短信)EMAIL(邮件)',
-  `create_time` datetime NOT NULL COMMENT '数据创建时间'
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='通知模板';
-
--- --------------------------------------------------------
-
 --
 -- 表的结构 `mall_oauth_google`
 --
@@ -4681,23 +4631,6 @@ CREATE TABLE `mall_warehouse_stock` (
 
 -- --------------------------------------------------------
 
---
--- 表的结构 `mall_webhook_config`
---
-
-CREATE TABLE `mall_webhook_config` (
-  `id` bigint(20) UNSIGNED NOT NULL COMMENT '表主键',
-  `config_id` int(10) UNSIGNED NOT NULL COMMENT '配置ID',
-  `shop_id` bigint(20) NOT NULL COMMENT '店铺ID',
-  `event_type` varchar(20) NOT NULL COMMENT '事件类型',
-  `req_url` varchar(255) DEFAULT NULL COMMENT '事件通知地址',
-  `options` text COMMENT '其他参数;格式为{"warehouse_id":"11"}',
-  `secret_key` varchar(64) NOT NULL COMMENT '秘钥',
-  `create_time` datetime NOT NULL COMMENT '创建时间'
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='webhook配置表';
-
--- --------------------------------------------------------
-
 --
 -- 表的结构 `mall_webhook_logs`
 --
@@ -4705,7 +4638,6 @@ CREATE TABLE `mall_webhook_config` (
 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',
   `order_id` varchar(64) NOT NULL COMMENT '商户订单号',
   `event_type` varchar(20) NOT NULL COMMENT '事件类型',
   `req_url` varchar(255) NOT NULL COMMENT '请求地址',
@@ -9957,7 +9889,8 @@ ALTER TABLE `mall_goods`
 ALTER TABLE `mall_goods_relate`
   ADD PRIMARY KEY (`id`),
   ADD UNIQUE KEY `goodId` (`good_id`) USING BTREE,
-  ADD KEY `shop_id` (`shop_id`);
+  ADD KEY `shop_id` (`shop_id`),
+  ADD KEY `hash_id` (`hash_id`);
 
 --
 -- 表的索引 `mall_goods_sub`
@@ -10057,26 +9990,6 @@ ALTER TABLE `mall_member_tags`
 ALTER TABLE `mall_member_tag_associations`
   ADD PRIMARY KEY (`id`) USING BTREE;
 
---
--- 表的索引 `mall_notification_records`
---
-ALTER TABLE `mall_notification_records`
-  ADD PRIMARY KEY (`id`);
-
---
--- 表的索引 `mall_notification_switch`
---
-ALTER TABLE `mall_notification_switch`
-  ADD PRIMARY KEY (`id`),
-  ADD UNIQUE KEY `mall_notification_switch_shop_id_sort_uindex` (`shop_id`,`sort`);
-
---
--- 表的索引 `mall_notification_template`
---
-ALTER TABLE `mall_notification_template`
-  ADD PRIMARY KEY (`id`),
-  ADD UNIQUE KEY `mall_notification_template_pk` (`shop_id`,`sort`,`sender_type`);
-
 --
 -- 表的索引 `mall_oauth_google`
 --
@@ -10435,7 +10348,8 @@ ALTER TABLE `mall_sku_props`
 ALTER TABLE `mall_sku_props_sub`
   ADD UNIQUE KEY `prop_name` (`prop_id`,`view_id`) USING BTREE,
   ADD KEY `index_0` (`view_id`,`good_id`),
-  ADD KEY `prop_id` (`prop_id`,`view_id`,`ai`);
+  ADD KEY `prop_id` (`prop_id`,`view_id`,`ai`),
+  ADD KEY `good_id` (`good_id`,`language`);
 
 --
 -- 表的索引 `mall_sku_tax`
@@ -10486,10 +10400,11 @@ ALTER TABLE `mall_trans`
 --
 ALTER TABLE `mall_trans_task`
   ADD PRIMARY KEY (`id`) USING BTREE,
-  ADD UNIQUE KEY `lang` (`shop_id`,`xid`,`lang`,`type_name`,`type_id`) USING BTREE,
+  ADD UNIQUE KEY `uindex` (`shop_id`,`md5`,`lang`,`xid`,`type_name`,`type_id`) USING BTREE,
   ADD KEY `shop_id` (`shop_id`,`md5`) USING BTREE COMMENT '查询使用组合索引',
   ADD KEY `status` (`status`,`shop_id`),
-  ADD KEY `good_id` (`xid`,`lang`,`status`);
+  ADD KEY `good_id` (`xid`,`lang`,`status`),
+  ADD KEY `shop_id_2` (`shop_id`,`md5`,`lang`,`status`);
 
 --
 -- 表的索引 `mall_trans_task_logs`
@@ -10543,13 +10458,6 @@ ALTER TABLE `mall_warehouse_stock`
   ADD PRIMARY KEY (`id`),
   ADD UNIQUE KEY `warehouse_id` (`warehouse_id`,`sku_id`,`shop_id`);
 
---
--- 表的索引 `mall_webhook_config`
---
-ALTER TABLE `mall_webhook_config`
-  ADD PRIMARY KEY (`id`),
-  ADD UNIQUE KEY `mall_webhook_config_shop_id_event_type_uindex` (`shop_id`,`event_type`);
-
 --
 -- 表的索引 `mall_webhook_logs`
 --
@@ -11032,24 +10940,6 @@ ALTER TABLE `mall_member_tags`
 ALTER TABLE `mall_member_tag_associations`
   MODIFY `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '标签的id';
 
---
--- 使用表AUTO_INCREMENT `mall_notification_records`
---
-ALTER TABLE `mall_notification_records`
-  MODIFY `id` bigint(20) UNSIGNED NOT NULL AUTO_INCREMENT COMMENT '表主键', AUTO_INCREMENT=9;
-
---
--- 使用表AUTO_INCREMENT `mall_notification_switch`
---
-ALTER TABLE `mall_notification_switch`
-  MODIFY `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '表主键';
-
---
--- 使用表AUTO_INCREMENT `mall_notification_template`
---
-ALTER TABLE `mall_notification_template`
-  MODIFY `id` bigint(20) UNSIGNED NOT NULL AUTO_INCREMENT COMMENT '表主键', AUTO_INCREMENT=4;
-
 --
 -- 使用表AUTO_INCREMENT `mall_oauth_google`
 --
@@ -11374,12 +11264,6 @@ ALTER TABLE `mall_warehouse_priority_shipping`
 ALTER TABLE `mall_warehouse_stock`
   MODIFY `id` bigint(20) UNSIGNED NOT NULL AUTO_INCREMENT COMMENT '表主键';
 
---
--- 使用表AUTO_INCREMENT `mall_webhook_config`
---
-ALTER TABLE `mall_webhook_config`
-  MODIFY `id` bigint(20) UNSIGNED NOT NULL AUTO_INCREMENT COMMENT '表主键';
-
 --
 -- 使用表AUTO_INCREMENT `mall_webhook_logs`
 --

package/storage/patch/patch.sql

@@ -1,56 +1,19 @@
-CREATE TABLE `mall_notification_template`
-(
-    `id`          bigint unsigned NOT NULL AUTO_INCREMENT COMMENT '表主键',
-    `template_id` varchar(32) COLLATE utf8mb4_general_ci  NOT NULL COMMENT '模板id',
-    `subject`     varchar(100) COLLATE utf8mb4_general_ci NOT NULL COMMENT '邮件主题或短信标题',
-    `body`        text COLLATE utf8mb4_general_ci         NOT NULL COMMENT '模板定义消息体',
-    `sort`        varchar(20) COLLATE utf8mb4_general_ci  NOT NULL COMMENT '分类: \n订单> \n  ORD_PAID(订单已支付)\n  ORD_SHIPPED(订单已发货) \n  ORD_RECEIVED(订单已收货) \n  ORD_RATED(订单已评价) \n  ORD_AFTER_SALE(订单售后中) \n  ORD_REFUNDED(订单已退款) \n \n 营销>\n   MAR_PRODUCT_NEW(商品上新)\n   MAR_COUPON_GIVEAWAY(优惠券派送) \n    \n  供货> \n     SUP_PRODUCT_SUBMIT(供货商品提交) \n     SUP_PRODUCT_REVIEW(供货商品审核) \n     SUP_ORDER_CREATE(供货商品产生订单)\n     SUP_ORDER_SHIPPED(供应单发货) \n      \n   分销> \n       DIS_PUB_PRODUCT_ON(刊登商品上架) \n       DIS_PUB_PRODUCT_OFF(刊登商品下架) \n       DIS_PURCHASE_CREATE(刊登商品产生采购单)\n       DIS_PURCHASE_SHIPPED(采购单发货) \n        \n  库存>\n       STO_GOODS_NOT_ENOUGH(商品库存不足) \n          \n  互动> \n       INT_USER_COMMENTS(用户留言)\n       INT_USER_FEEDBACK(留言回复)   ',
-    `shop_id`     bigint                                  NOT NULL COMMENT '店铺ID',
-    `sender_type` varchar(5) COLLATE utf8mb4_general_ci   NOT NULL COMMENT '发送类型:SMS(短信)EMAIL(邮件)',
-    `create_time` datetime                                NOT NULL COMMENT '数据创建时间',
-    PRIMARY KEY (`id`),
-    UNIQUE KEY `mall_notification_template_pk` (`shop_id`,`sort`,`sender_type`)
-) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='通知模板';
+-- Step 1: 查询记录A
+SELECT res_group_id INTO @A_res_group_id
+FROM `sys_resource_groups`
+WHERE `title` LIKE 'order';
 
-CREATE TABLE `mall_notification_switch`
-(
-    `id`          bigint                                 NOT NULL AUTO_INCREMENT COMMENT '表主键',
-    `shop_id`     bigint                                 NOT NULL COMMENT '店铺ID',
-    `sort`        varchar(20) COLLATE utf8mb4_general_ci NOT NULL COMMENT '事件类型',
-    `switch`      tinyint                                NOT NULL COMMENT '开关: 0开1关',
-    `create_time` datetime                               NOT NULL COMMENT '数据创建时间',
-    PRIMARY KEY (`id`),
-    UNIQUE KEY `mall_notification_switch_shop_id_sort_uindex` (`shop_id`,`sort`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='通知开关表';
+-- Step 2: 查询记录B
+SELECT resource_id INTO @B_resource_id
+FROM `sys_resources`
+WHERE `path` LIKE '/admin/order/handle_pay';
 
-CREATE TABLE `mall_notification_records`
-(
-    `id`             bigint unsigned NOT NULL AUTO_INCREMENT COMMENT '表主键',
-    `shop_id`        bigint                                  NOT NULL COMMENT '所属店铺',
-    `sort`           varchar(20) COLLATE utf8mb4_general_ci  NOT NULL COMMENT '分类:  订单>    ORD_PAID(订单已支付)   ORD_SHIPPED(订单已发货)    ORD_RECEIVED(订单已收货)    ORD_RATED(订单已评价)    ORD_AFTER_SALE(订单售后中)    ORD_REFUNDED(订单已退款)     营销>    MAR_PRODUCT_NEW(商品上新)    MAR_COUPON_GIVEAWAY(优惠券派送)         供货>       SUP_PRODUCT_SUBMIT(供货商品提交)       SUP_PRODUCT_REVIEW(供货商品审核)       SUP_ORDER_CREATE(供货商品产生订单)      SUP_ORDER_SHIPPED(供应单发货)            分销>         DIS_PUB_PRODUCT_ON(刊登商品上架)         DIS_PUB_PRODUCT_OFF(刊登商品下架)         DIS_PURCHASE_CREATE(刊登商品产生采购单)        DIS_PURCHASE_SHIPPED(采购单发货)             库存>        STO_GOODS_NOT_ENOUGH(商品库存不足)               互动>         INT_USER_COMMENTS(用户留言)        INT_USER_FEEDBACK(留言回复)   ',
-    `audience`       varchar(64) COLLATE utf8mb4_general_ci  NOT NULL COMMENT '受众',
-    `sender_type`    varchar(5) COLLATE utf8mb4_general_ci   NOT NULL COMMENT '发送类型:SMS短信,EMAIL邮件',
-    `subject`        varchar(100) COLLATE utf8mb4_general_ci NOT NULL COMMENT '主题',
-    `body`           text COLLATE utf8mb4_general_ci COMMENT '消息体',
-    `status`         int                                     NOT NULL COMMENT '发送状态,默认0成功,1失败',
-    `failure_reason` varchar(200) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '失败原因',
-    `create_time`    datetime                                NOT NULL COMMENT '数据创建时间',
-    PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=9 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='通知记录表';
+-- 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;
 
-CREATE TABLE `mall_webhook_config`
-(
-    `id`          bigint unsigned NOT NULL AUTO_INCREMENT COMMENT '表主键',
-    `config_id`   int unsigned NOT NULL COMMENT '配置ID',
-    `shop_id`     bigint                                 NOT NULL COMMENT '店铺ID',
-    `event_type`  varchar(20) COLLATE utf8mb4_general_ci NOT NULL COMMENT '事件类型',
-    `req_url`     varchar(255) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '事件通知地址',
-    `options`     text COLLATE utf8mb4_general_ci COMMENT '其他参数;格式为{"warehouse_id":"11"}',
-    `secret_key`  varchar(64) COLLATE utf8mb4_general_ci NOT NULL COMMENT '秘钥',
-    `create_time` datetime                               NOT NULL COMMENT '创建时间',
-    PRIMARY KEY (`id`),
-    UNIQUE KEY `mall_webhook_config_shop_id_event_type_uindex` (`shop_id`,`event_type`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='webhook配置表';
+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 mall_webhook_logs
-    add config_id int UNSIGNED not null comment '配置ID' after shop_id;

package/version

@@ -1 +1 @@
-v1.48.2
+v1.49.1