@bee-hole/server 1.32.2 → 1.33.0

package/storage/init/init.sql

@@ -531,7 +531,8 @@ INSERT INTO `admin_menu` (`id`, `pid`, `name`, `code`, `icon`, `type`, `perms`,
 (2141, 2140, 'app.menus.left.supply.productSupply', 'productSupply', 'book', 'C', '', '/supply', 'supply/productSupply', '', '1', '2', '2', '', 2, '', 20, '1', '2024-01-08 06:03:37', '2024-01-08 06:03:37'),
 (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');
+(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');
 
 -- --------------------------------------------------------
 
@@ -2955,6 +2956,11 @@ CREATE TABLE `mall_goods` (
   `image_url2` varchar(255) DEFAULT NULL COMMENT '商品主图',
   `image_url3` varchar(255) DEFAULT NULL COMMENT '商品主图',
   `image_url4` varchar(255) DEFAULT NULL COMMENT '商品主图',
+  `image_url5` varchar(255) DEFAULT NULL COMMENT '商品主图',
+  `image_url6` varchar(255) DEFAULT NULL COMMENT '商品主图',
+  `image_url7` varchar(255) DEFAULT NULL COMMENT '商品主图',
+  `image_url8` varchar(255) DEFAULT NULL COMMENT '商品主图',
+  `image_url9` varchar(255) DEFAULT NULL COMMENT '商品主图',
   `on_shelves` tinyint(1) NOT NULL DEFAULT '1' COMMENT '是否上架,默认1(上架)2下架',
   `isgift` tinyint(1) DEFAULT '0' COMMENT '是否是赠品，1是，0不是,默认0不是',
   `slug` varchar(255) DEFAULT NULL COMMENT '别名',
@@ -2971,6 +2977,20 @@ CREATE TABLE `mall_goods` (
 
 -- --------------------------------------------------------
 
+--
+-- 表的结构 `mall_goods_relate`
+--
+
+CREATE TABLE `mall_goods_relate` (
+  `id` bigint(20) NOT NULL COMMENT '主键',
+  `shop_id` bigint(20) UNSIGNED DEFAULT NULL COMMENT '店铺ID',
+  `good_id` bigint(20) UNSIGNED DEFAULT NULL COMMENT '商品ID',
+  `hash_id` bigint(20) UNSIGNED DEFAULT NULL COMMENT '哈希值',
+  `create_time` datetime DEFAULT NULL COMMENT '创建时间'
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='商品关联';
+
+-- --------------------------------------------------------
+
 --
 -- 表的结构 `mall_goods_sub`
 --
@@ -2990,6 +3010,11 @@ CREATE TABLE `mall_goods_sub` (
   `image_url2` varchar(255) DEFAULT NULL COMMENT '商品主图',
   `image_url3` varchar(255) DEFAULT NULL COMMENT '商品主图',
   `image_url4` varchar(255) DEFAULT NULL COMMENT '商品主图',
+  `image_url5` varchar(255) DEFAULT NULL COMMENT '商品主图',
+  `image_url6` varchar(255) DEFAULT NULL COMMENT '商品主图',
+  `image_url7` varchar(255) DEFAULT NULL COMMENT '商品主图',
+  `image_url8` varchar(255) DEFAULT NULL COMMENT '商品主图',
+  `image_url9` varchar(255) DEFAULT NULL COMMENT '商品主图',
   `slug` varchar(255) DEFAULT NULL COMMENT '别名',
   `create_time` datetime DEFAULT NULL COMMENT '创建时间',
   `update_time` datetime DEFAULT NULL COMMENT '更新时间',
@@ -3302,6 +3327,24 @@ CREATE TABLE `mall_order` (
 
 -- --------------------------------------------------------
 
+--
+-- 表的结构 `mall_order_handlepay`
+--
+
+CREATE TABLE `mall_order_handlepay` (
+  `id` bigint(20) NOT NULL COMMENT '主键',
+  `order_id` varchar(64) NOT NULL COMMENT '订单号',
+  `shop_id` bigint(20) NOT NULL COMMENT '店铺编号',
+  `payment_no` varchar(64) NOT NULL COMMENT '支付单号',
+  `payment` decimal(10,2) NOT NULL COMMENT '支付金额',
+  `currency` varchar(3) NOT NULL COMMENT '交易货币',
+  `payment_document` varchar(255) NOT NULL COMMENT '支付凭证',
+  `payment_remark` longtext COMMENT '支付说明',
+  `create_time` datetime NOT NULL COMMENT '创建时间'
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+-- --------------------------------------------------------
+
 --
 -- 表的结构 `mall_order_insured`
 --
@@ -4034,6 +4077,7 @@ CREATE TABLE `mall_skus` (
   `good_id` bigint(20) NOT NULL COMMENT '所属商品编号',
   `props_ids` varchar(128) NOT NULL COMMENT '1:2;2:3=颜色id:红色id;尺寸id:大id',
   `price` decimal(12,2) NOT NULL COMMENT '价格',
+  `purchase_price` decimal(12,2) DEFAULT NULL COMMENT '采购价',
   `stock_num` int(11) DEFAULT '0' COMMENT '库存',
   `out_id` varchar(64) DEFAULT '' COMMENT '外部编码',
   `barcode` varchar(50) DEFAULT NULL COMMENT '条码',
@@ -4315,6 +4359,24 @@ CREATE TABLE `mall_warehouse_stock` (
 
 -- --------------------------------------------------------
 
+--
+-- 表的结构 `mall_webhook_logs`
+--
+
+CREATE TABLE `mall_webhook_logs` (
+  `id` bigint(20) UNSIGNED NOT NULL COMMENT '表主键',
+  `shop_id` bigint(20) NOT NULL COMMENT '店铺shop_id',
+  `event_type` varchar(16) NOT NULL COMMENT '事件类型',
+  `req_url` varchar(255) NOT NULL COMMENT '请求地址',
+  `payload` text COMMENT '消息载体',
+  `push_times` tinyint(4) NOT NULL COMMENT '推送次数',
+  `failure_reason` varchar(200) DEFAULT NULL COMMENT '失败原因',
+  `success_time` datetime DEFAULT NULL COMMENT '推送成功时间',
+  `create_time` datetime NOT NULL COMMENT '数据创建时间'
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='事件通知日志';
+
+-- --------------------------------------------------------
+
 --
 -- 表的结构 `sys_config`
 --
@@ -9469,6 +9531,14 @@ ALTER TABLE `mall_goods`
   ADD KEY `shop_id_2` (`shop_id`,`good_id`),
   ADD KEY `estimated_on_shelves` (`on_shelves`,`estimated_time`);
 
+--
+-- 表的索引 `mall_goods_relate`
+--
+ALTER TABLE `mall_goods_relate`
+  ADD PRIMARY KEY (`id`),
+  ADD UNIQUE KEY `goodId` (`good_id`) USING BTREE,
+  ADD KEY `shop_id` (`shop_id`);
+
 --
 -- 表的索引 `mall_goods_sub`
 --
@@ -9598,6 +9668,14 @@ ALTER TABLE `mall_order`
   ADD KEY `sidUid` (`user_id`,`shop_id`),
   ADD KEY `sidFid` (`from_id`,`shop_id`);
 
+--
+-- 表的索引 `mall_order_handlepay`
+--
+ALTER TABLE `mall_order_handlepay`
+  ADD PRIMARY KEY (`id`),
+  ADD KEY `order_id` (`order_id`),
+  ADD KEY `shop_id` (`shop_id`);
+
 --
 -- 表的索引 `mall_order_insured`
 --
@@ -10010,6 +10088,14 @@ ALTER TABLE `mall_warehouse_stock`
   ADD PRIMARY KEY (`id`),
   ADD UNIQUE KEY `warehouse_id` (`warehouse_id`,`sku_id`,`shop_id`);
 
+--
+-- 表的索引 `mall_webhook_logs`
+--
+ALTER TABLE `mall_webhook_logs`
+  ADD PRIMARY KEY (`id`),
+  ADD KEY `mall_webhook_logs_push_times_IDX` (`push_times`,`success_time`) USING BTREE,
+  ADD KEY `shop_id` (`shop_id`);
+
 --
 -- 表的索引 `sys_config`
 --
@@ -10146,7 +10232,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=2145;
+  MODIFY `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '菜单ID', AUTO_INCREMENT=2146;
 
 --
 -- 使用表AUTO_INCREMENT `admin_notice`
@@ -10340,6 +10426,12 @@ ALTER TABLE `mall_favs`
 ALTER TABLE `mall_goods`
   MODIFY `good_id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '编号';
 
+--
+-- 使用表AUTO_INCREMENT `mall_goods_relate`
+--
+ALTER TABLE `mall_goods_relate`
+  MODIFY `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键';
+
 --
 -- 使用表AUTO_INCREMENT `mall_good_infos`
 --
@@ -10436,6 +10528,12 @@ ALTER TABLE `mall_oauth_wechat`
 ALTER TABLE `mall_order`
   MODIFY `id` bigint(20) NOT NULL AUTO_INCREMENT;
 
+--
+-- 使用表AUTO_INCREMENT `mall_order_handlepay`
+--
+ALTER TABLE `mall_order_handlepay`
+  MODIFY `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键';
+
 --
 -- 使用表AUTO_INCREMENT `mall_order_insured`
 --
@@ -10718,6 +10816,12 @@ 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_logs`
+--
+ALTER TABLE `mall_webhook_logs`
+  MODIFY `id` bigint(20) UNSIGNED NOT NULL AUTO_INCREMENT COMMENT '表主键';
+
 --
 -- 使用表AUTO_INCREMENT `sys_config`
 --

package/storage/patch/patch.sql

@@ -1,2 +1,61 @@
-ALTER TABLE `admin_goods_supply` ADD COLUMN `user_id`  bigint(20) NOT NULL COMMENT '操作用户Id' AFTER `id`;
+CREATE TABLE `mall_goods_relate` (
+    `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键',
+    `shop_id` bigint(20) UNSIGNED DEFAULT NULL COMMENT '店铺ID',
+    `good_id` bigint(20) UNSIGNED DEFAULT NULL COMMENT '商品ID',
+    `hash_id` bigint(20) UNSIGNED DEFAULT NULL COMMENT '哈希值',
+    `create_time` datetime DEFAULT NULL COMMENT '创建时间',
+    PRIMARY KEY (`id`),
+    UNIQUE KEY `goodId` (`good_id`) USING BTREE,
+    KEY `shop_id` (`shop_id`)
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4  COMMENT='商品关联';
 
+CREATE TABLE `mall_webhook_logs` (
+    `id` bigint(20) UNSIGNED NOT NULL AUTO_INCREMENT COMMENT '表主键',
+    `shop_id` bigint(20) NOT NULL COMMENT '店铺shop_id',
+    `event_type` varchar(16) NOT NULL COMMENT '事件类型',
+    `req_url` varchar(255) NOT NULL COMMENT '请求地址',
+    `payload` text COMMENT '消息载体',
+    `push_times` tinyint(4) NOT NULL COMMENT '推送次数',
+    `failure_reason` varchar(200) DEFAULT NULL COMMENT '失败原因',
+    `success_time` datetime DEFAULT NULL COMMENT '推送成功时间',
+    `create_time` datetime NOT NULL COMMENT '数据创建时间',
+    PRIMARY KEY (`id`),
+    KEY `mall_webhook_logs_push_times_IDX` (`push_times`,`success_time`) USING BTREE,
+    KEY `shop_id` (`shop_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='事件通知日志';
+
+CREATE TABLE `mall_order_handlepay` (
+    `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键',
+    `order_id` varchar(64) NOT NULL COMMENT '订单号',
+    `shop_id` bigint(20) NOT NULL COMMENT '店铺编号',
+    `payment_no` varchar(64) NOT NULL COMMENT '支付单号',
+    `payment` decimal(10,2) NOT NULL COMMENT '支付金额',
+    `currency` varchar(3) NOT NULL COMMENT '交易货币',
+    `payment_document` varchar(255) NOT NULL COMMENT '支付凭证',
+    `payment_remark` longtext COMMENT '支付说明',
+    `create_time` datetime NOT NULL COMMENT '创建时间',
+    PRIMARY KEY (`id`),
+    KEY `order_id` (`order_id`),
+    KEY `shop_id` (`shop_id`)
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4;
+
+
+ALTER TABLE `mall_goods`
+    ADD COLUMN `image_url5`  varchar(255) NULL COMMENT '商品主图' AFTER `image_url4`,
+    ADD COLUMN `image_url6`  varchar(255) NULL COMMENT '商品主图' AFTER `image_url5`,
+    ADD COLUMN `image_url7`  varchar(255) NULL COMMENT '商品主图' AFTER `image_url6`,
+    ADD COLUMN `image_url8`  varchar(255) NULL COMMENT '商品主图' AFTER `image_url7`,
+    ADD COLUMN `image_url9`  varchar(255) NULL COMMENT '商品主图' AFTER `image_url8`;
+
+ALTER TABLE `mall_goods_sub`
+    ADD COLUMN `image_url5`  varchar(255) NULL COMMENT '商品主图' AFTER `image_url4`,
+    ADD COLUMN `image_url6`  varchar(255) NULL COMMENT '商品主图' AFTER `image_url5`,
+    ADD COLUMN `image_url7`  varchar(255) NULL COMMENT '商品主图' AFTER `image_url6`,
+    ADD COLUMN `image_url8`  varchar(255) NULL COMMENT '商品主图' AFTER `image_url7`,
+    ADD COLUMN `image_url9`  varchar(255) NULL COMMENT '商品主图' AFTER `image_url8`;
+
+ALTER TABLE `mall_skus`
+    ADD COLUMN `purchase_price`  decimal(12,2) NULL COMMENT '采购价' AFTER `price`;
+
+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
+    (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');

package/version

@@ -1 +1 @@
-v1.32.2
+v1.33.0

package/resource/public/cp/css/chunk-d608cfda.8687a2a6.css

@@ -1 +0,0 @@
-.loginTitle[data-v-3cd93d3e]{margin-top:0;margin-bottom:2rem}.loginTitle .ant-tabs-bar[data-v-3cd93d3e]{border:0}.loginTitle .ant-tabs-bar .ant-tabs-nav-scroll[data-v-3cd93d3e]{text-align:center}.loginTitle .ant-tabs-bar .ant-tabs-nav-scroll .ant-tabs-tab-active.ant-tabs-tab[data-v-3cd93d3e]{color:#000;font-weight:600;font-size:14px}.link-btns .ant-btn.ant-btn-link[data-v-3cd93d3e],.link-btns[data-v-3cd93d3e],.loginTitle .ant-tabs-bar .ant-tabs-nav-scroll .ant-tabs-tab[data-v-3cd93d3e]{color:rgba(0,0,0,.25)}.QRcodeIcon[data-v-3cd93d3e]{position:absolute;right:0;font-size:32px;color:#1890ff;margin-top:5px;margin-right:5px}.ant-space-align-center[data-v-3cd93d3e]{color:#8f959e;line-height:30px;height:30px}.user-layout-login label[data-v-3cd93d3e]{font-size:12px!important;font-size:14px}.user-layout-login .ant-page-header[data-v-3cd93d3e]{padding:60px 0 45px 0}.user-layout-login .getCaptcha[data-v-3cd93d3e]{display:block;width:100%;height:40px}.user-layout-login button.login-button[data-v-3cd93d3e]{padding:0 15px;font-size:16px;height:40px;width:100%;border-radius:4px}.user-layout-login .icons-list .anticon[data-v-3cd93d3e]{font-size:30px;width:40px}.user-layout-login .icons-list .dingtalk[data-v-3cd93d3e]{color:#0089ff}.user-layout-login .icons-list .WeChat[data-v-3cd93d3e]{color:#51c332}.user-layout-login .icons-list .Alipay[data-v-3cd93d3e]{color:#06b4fd}.user-layout-login .icons-list .Sina[data-v-3cd93d3e]{color:#d81e06}