@bee-hole/server 1.60.4 → 1.61.0

package/storage/init/init.sql

@@ -9,6 +9,26 @@ SET time_zone = "+00:00";
 
 -- --------------------------------------------------------
 
+--
+-- 表的结构 `admin_alibaba_oauth`
+--
+
+CREATE TABLE `admin_alibaba_oauth` (
+  `id` bigint(20) NOT NULL COMMENT '主键',
+  `shop_id` bigint(20) DEFAULT NULL COMMENT '店铺ID',
+  `ali_id` varchar(100) DEFAULT NULL COMMENT '1688ID',
+  `resource_owner` varchar(100) DEFAULT NULL COMMENT '1688用户昵称',
+  `member_id` varchar(100) DEFAULT NULL COMMENT '1688用户ID',
+  `expires_in` varchar(100) DEFAULT NULL COMMENT 'token过期时间',
+  `refresh_token` varchar(100) DEFAULT NULL COMMENT '刷新token',
+  `access_token` varchar(100) DEFAULT NULL COMMENT 'token',
+  `refresh_token_timeout` varchar(100) DEFAULT NULL COMMENT '刷新token过期时间',
+  `update_time` datetime DEFAULT NULL,
+  `create_time` datetime DEFAULT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='admin_alibaba';
+
+-- --------------------------------------------------------
+
 --
 -- 表的结构 `admin_alibaba_order`
 --
@@ -29,6 +49,8 @@ CREATE TABLE `admin_alibaba_order` (
   `total_discount` decimal(10,2) DEFAULT NULL COMMENT '总优惠',
   `total_tax` decimal(10,2) DEFAULT NULL COMMENT '总税费',
   `order_status` varchar(20) DEFAULT NULL COMMENT '订单状态',
+  `logistics_name` varchar(20) DEFAULT NULL,
+  `shipment_id` varchar(64) DEFAULT NULL,
   `order_date` datetime DEFAULT NULL COMMENT '订单时间',
   `create_time` datetime DEFAULT NULL COMMENT '创建时间'
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
@@ -142,6 +164,25 @@ CREATE TABLE `admin_dept` (
 
 -- --------------------------------------------------------
 
+--
+-- 表的结构 `admin_ebay_product`
+--
+
+CREATE TABLE `admin_ebay_product` (
+  `id` bigint(20) UNSIGNED NOT NULL COMMENT '表主键',
+  `shop_id` bigint(20) NOT NULL COMMENT '所属店铺',
+  `seller_id` varchar(128) NOT NULL COMMENT 'yahoo侧seller_id',
+  `goods_id` bigint(20) NOT NULL COMMENT 'bee-hole侧商品ID',
+  `item_id` varchar(128) NOT NULL COMMENT '商品编码,fd-(bee-hole侧shop_id)-(bee-hole侧goods_id)',
+  `title` varchar(255) NOT NULL COMMENT '商品名称',
+  `category_id` varchar(64) NOT NULL COMMENT '商品类目ID',
+  `message_from` text NOT NULL COMMENT '请求添加商品时的报文',
+  `message_to` text COMMENT '请求添加返回的报文',
+  `create_time` datetime NOT NULL COMMENT '数据创建时间'
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+-- --------------------------------------------------------
+
 --
 -- 表的结构 `admin_express_company`
 --
@@ -22082,6 +22123,7 @@ CREATE TABLE `mall_warehouse` (
   `admin_email` varchar(64) DEFAULT NULL,
   `country_code` varchar(20) DEFAULT NULL,
   `city` varchar(255) DEFAULT NULL,
+  `district` varchar(255) DEFAULT NULL,
   `street` varchar(255) DEFAULT NULL,
   `zip_code` varchar(20) DEFAULT NULL,
   `address` varchar(255) NOT NULL COMMENT '仓库所在详细地址',
@@ -26903,6 +26945,12 @@ CREATE TABLE `sys_version` (
 -- 转储表的索引
 --
 
+--
+-- 表的索引 `admin_alibaba_oauth`
+--
+ALTER TABLE `admin_alibaba_oauth`
+  ADD PRIMARY KEY (`id`) USING BTREE;
+
 --
 -- 表的索引 `admin_alibaba_order`
 --
@@ -26942,6 +26990,13 @@ ALTER TABLE `admin_configs`
 ALTER TABLE `admin_dept`
   ADD PRIMARY KEY (`id`);
 
+--
+-- 表的索引 `admin_ebay_product`
+--
+ALTER TABLE `admin_ebay_product`
+  ADD PRIMARY KEY (`id`),
+  ADD UNIQUE KEY `admin_yahoo_product_shop_id_item_code_uindex` (`shop_id`,`item_id`);
+
 --
 -- 表的索引 `admin_express_company`
 --
@@ -28190,6 +28245,12 @@ ALTER TABLE `sys_version`
 -- 在导出的表使用AUTO_INCREMENT
 --
 
+--
+-- 使用表AUTO_INCREMENT `admin_alibaba_oauth`
+--
+ALTER TABLE `admin_alibaba_oauth`
+  MODIFY `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键';
+
 --
 -- 使用表AUTO_INCREMENT `admin_alibaba_order`
 --
@@ -28220,6 +28281,12 @@ ALTER TABLE `admin_chat_topics`
 ALTER TABLE `admin_dept`
   MODIFY `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '部门id';
 
+--
+-- 使用表AUTO_INCREMENT `admin_ebay_product`
+--
+ALTER TABLE `admin_ebay_product`
+  MODIFY `id` bigint(20) UNSIGNED NOT NULL AUTO_INCREMENT COMMENT '表主键';
+
 --
 -- 使用表AUTO_INCREMENT `admin_express_company`
 --

package/storage/patch/patch.sql

@@ -1,148 +1,37 @@
-INSERT INTO `admin_menu` (`id`, `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
-    (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'),
-    (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'),
-    (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'),
-    (2159, 2158, 'app.menus.left.member.distribution.distributor', 'mdistributor', 'user', 'C', '', '/mdistributor', 'mallfenxiao/mdistributor', '', '1', '2', '2', '', 2, '', 20, '1', '2024-06-24 03:06:46', '2024-06-26 05:53:12'),
-    (2158, 0, 'app.menus.left.member.distribution', 'mallfenxiao', 'user', 'M', '', '/mallfenxiao', '', '', '1', '2', '2', '', 1, '', 10, '1', '2024-06-24 03:04:38', '2024-06-26 05:52:55');
-CREATE TABLE `mall_fx_clearing` (
-    `clearing_id` bigint(20) NOT NULL COMMENT '结算编号',
-    `shop_id` bigint(20) NOT NULL COMMENT '店铺编号',
-    `distributor_id` bigint(20) NOT NULL COMMENT '代理商编号',
-    `money` decimal(10,2) NOT NULL COMMENT '佣金',
-    `apply_time` datetime NOT NULL COMMENT '申请时间',
-    `audit_time` datetime DEFAULT NULL COMMENT '审核时间',
-    `status` tinyint(1) NOT NULL COMMENT '状态',
-    `pay_time` datetime DEFAULT NULL COMMENT '支付时间',
-    `create_time` datetime NOT NULL COMMENT '创建时间',
-    `update_time` datetime NOT NULL COMMENT '更新时间'
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='代理订单结算表';
-CREATE TABLE `mall_fx_clearing_detail` (
-   `clearing_detail_id` bigint(20) NOT NULL,
-   `shop_id` bigint(20) NOT NULL COMMENT '店铺编号',
-   `clearing_id` bigint(20) NOT NULL COMMENT '结算单号',
-   `detail_id` bigint(20) NOT NULL COMMENT '明细编号',
-   `distributor_id` bigint(20) NOT NULL COMMENT '代理商编号',
-   `user_id` bigint(20) NOT NULL COMMENT '会员编号',
-   `order_id` varchar(64) NOT NULL COMMENT '订单编号',
-   `order_time` datetime NOT NULL COMMENT '订单时间',
-   `payment` decimal(10,2) NOT NULL COMMENT '支付金额',
-   `proportion` decimal(10,2) NOT NULL COMMENT '佣金比例',
-   `money` decimal(10,2) NOT NULL COMMENT '佣金',
-   `create_time` datetime NOT NULL COMMENT '创建时间',
-   `update_time` datetime NOT NULL COMMENT '更新时间'
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='代理订单结算明细表';
-CREATE TABLE `mall_fx_detail` (
-  `detail_id` bigint(20) NOT NULL,
-  `shop_id` bigint(20) NOT NULL COMMENT '店铺编号',
-  `distributor_id` bigint(20) NOT NULL COMMENT '代理商编号',
-  `user_id` bigint(20) NOT NULL COMMENT '商家编号',
-  `order_id` varchar(64) NOT NULL COMMENT '订单编号',
-  `payment` decimal(10,2) NOT NULL COMMENT '订单支付金额',
-  `proportion` decimal(10,2) NOT NULL COMMENT '分佣比例',
-  `money` decimal(10,2) NOT NULL COMMENT '佣金',
-  `status` tinyint(1) NOT NULL COMMENT '状态',
-  `order_time` datetime DEFAULT NULL COMMENT '订单时间',
-  `audit_time` datetime DEFAULT NULL COMMENT '审核时间',
-  `clearing_time` datetime DEFAULT NULL COMMENT '结算时间',
-  `create_time` datetime NOT NULL,
-  `update_time` datetime NOT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='代理订单表';
-CREATE TABLE `mall_fx_distributor` (
-   `distributor_id` bigint(20) NOT NULL COMMENT '代理商编号',
-   `shop_id` bigint(20) NOT NULL COMMENT '店铺编号',
-   `user_id` bigint(20) NOT NULL COMMENT '商城用户编号',
-   `distributor_name` varchar(64) NOT NULL COMMENT '代理商名称',
-   `distributor_code` varchar(64) NOT NULL COMMENT '分销码',
-   `grade_id` bigint(20) NOT NULL COMMENT '等级编号',
-   `status` tinyint(1) NOT NULL DEFAULT '1' COMMENT '状态 1=未通过 2=审核通过',
-   `create_time` datetime NOT NULL COMMENT '创建时间',
-   `update_time` datetime NOT NULL COMMENT '更新时间'
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='商家代理商';
-CREATE TABLE `mall_fx_distributor_relation` (
-    `relation_id` bigint(20) NOT NULL COMMENT '关系编号',
-    `shop_id` bigint(20) NOT NULL COMMENT '店铺编号',
-    `distributor_id` bigint(20) NOT NULL COMMENT '代理商编号',
-    `user_id` bigint(20) NOT NULL COMMENT '商城用户编号',
-    `create_time` datetime NOT NULL COMMENT '绑定时间'
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='代理商-商城用户关系表';
-CREATE TABLE `mall_fx_grade` (
-     `grade_id` bigint(20) NOT NULL COMMENT '等级编号',
-     `shop_id` bigint(20) NOT NULL COMMENT '店铺编号',
-     `grade_name` varchar(64) NOT NULL COMMENT '等级名称',
-     `proportion` decimal(10,2) NOT NULL COMMENT '分佣比例',
-     `create_time` datetime NOT NULL COMMENT '创建时间',
-     `update_time` datetime NOT NULL COMMENT '更新时间'
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='商家代理商等级表';
-ALTER TABLE `mall_fx_clearing`
-    ADD PRIMARY KEY (`clearing_id`);
-ALTER TABLE `mall_fx_clearing_detail`
-    ADD PRIMARY KEY (`clearing_detail_id`);
-ALTER TABLE `mall_fx_detail`
-    ADD PRIMARY KEY (`detail_id`);
-ALTER TABLE `mall_fx_distributor`
-    ADD PRIMARY KEY (`distributor_id`);
-ALTER TABLE `mall_fx_distributor_relation`
-    ADD PRIMARY KEY (`relation_id`);
-ALTER TABLE `mall_fx_grade`
-    ADD PRIMARY KEY (`grade_id`);
+CREATE TABLE `admin_alibaba_oauth` (
+   `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键',
+   `shop_id` bigint(20) DEFAULT NULL COMMENT '店铺ID',
+   `ali_id` varchar(100) DEFAULT NULL COMMENT '1688ID',
+   `resource_owner` varchar(100) DEFAULT NULL COMMENT '1688用户昵称',
+   `member_id` varchar(100) DEFAULT NULL COMMENT '1688用户ID',
+   `expires_in` varchar(100) DEFAULT NULL COMMENT 'token过期时间',
+   `refresh_token` varchar(100) DEFAULT NULL COMMENT '刷新token',
+   `access_token` varchar(100) DEFAULT NULL COMMENT 'token',
+   `refresh_token_timeout` varchar(100) DEFAULT NULL COMMENT '刷新token过期时间',
+   `update_time` datetime DEFAULT NULL,
+   `create_time` datetime DEFAULT NULL,
+   PRIMARY KEY (`id`) USING BTREE
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COMMENT='admin_alibaba';
 
-ALTER TABLE `mall_fx_clearing`
-    MODIFY `clearing_id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '结算编号';
-ALTER TABLE `mall_fx_clearing_detail`
-    MODIFY `clearing_detail_id` bigint(20) NOT NULL AUTO_INCREMENT;
-ALTER TABLE `mall_fx_detail`
-    MODIFY `detail_id` bigint(20) NOT NULL AUTO_INCREMENT;
-ALTER TABLE `mall_fx_distributor`
-    MODIFY `distributor_id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '代理商编号';
-ALTER TABLE `mall_fx_distributor_relation`
-    MODIFY `relation_id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '关系编号';
-ALTER TABLE `mall_fx_grade`
-    MODIFY `grade_id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '等级编号';
+ALTER TABLE `admin_alibaba_order`
+    ADD COLUMN `logistics_name`  varchar(20) NULL AFTER `order_status`,
+    ADD COLUMN `shipment_id`  varchar(64) NULL AFTER `logistics_name`;
 
-/**
- * 阿里巴巴1688商品菜单   在商品主菜单下
- */
-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.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');
+create table if not exists admin_ebay_product
+(
+    id           bigint unsigned auto_increment comment '表主键'
+    primary key,
+    shop_id      bigint       not null comment '所属店铺',
+    seller_id    varchar(128) not null comment 'yahoo侧seller_id',
+    goods_id     bigint       not null comment 'bee-hole侧商品ID',
+    item_id      varchar(128) not null comment '商品编码,fd-(bee-hole侧shop_id)-(bee-hole侧goods_id)',
+    title        varchar(255) not null comment '商品名称',
+    category_id  varchar(64)  not null comment '商品类目ID',
+    message_from text         not null comment '请求添加商品时的报文',
+    message_to   text         null comment '请求添加返回的报文',
+    create_time  datetime     not null comment '数据创建时间',
+    constraint admin_yahoo_product_shop_id_item_code_uindex
+    unique (shop_id, item_id)
+    );
 
-CREATE TABLE `admin_alibaba_order` (
-    `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '大健云仓订单信息',
-    `order_id` varchar(64) DEFAULT NULL COMMENT '订单号',
-    `alibaba_order_id` varchar(64) DEFAULT NULL,
-    `shop_id` bigint(20) DEFAULT NULL COMMENT '店铺ID',
-    `delivery_name` char(80) DEFAULT NULL COMMENT '收货人名字',
-    `delivery_phone` char(20) DEFAULT NULL COMMENT '收货人联系方式',
-    `delivery_country` char(10) DEFAULT NULL COMMENT '收货人国家编码(英文2位)',
-    `delivery_state` char(10) DEFAULT NULL COMMENT '收货人省(英文2位编码)',
-    `delivery_city` char(80) DEFAULT NULL COMMENT '收货人城市(英文)',
-    `delivery_address` varchar(255) DEFAULT NULL COMMENT '收货人地址 美国/英国/德国市场的参赛限制：35 个字符以内 JP商场的参赛限制：100个字符以内',
-    `delivery_zip_code` char(50) DEFAULT NULL COMMENT '收货人邮编(国外)',
-    `total_amount` decimal(10,2) DEFAULT NULL COMMENT '总货款',
-    `total_discount` decimal(10,2) DEFAULT NULL COMMENT '总优惠',
-    `total_tax` decimal(10,2) DEFAULT NULL COMMENT '总税费',
-    `order_status` varchar(20) DEFAULT NULL COMMENT '订单状态',
-    `order_date` datetime DEFAULT NULL COMMENT '订单时间',
-    `create_time` datetime DEFAULT NULL COMMENT '创建时间',
-    PRIMARY KEY (`id`),
-    UNIQUE KEY `order_id` (`order_id`,`shop_id`),
-    KEY `shop_id` (`shop_id`)
-) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4;
-
-
-CREATE TABLE `admin_alibaba_order_items` (
-    `id` bigint(20) NOT NULL AUTO_INCREMENT,
-    `order_id` varchar(64) DEFAULT NULL COMMENT '订单号',
-    `shop_id` bigint(20) DEFAULT NULL COMMENT '店铺ID',
-    `good_id` bigint(20) DEFAULT NULL COMMENT 'good_id',
-    `sku_id` bigint(20) DEFAULT NULL COMMENT 'sku_id',
-    `title` varchar(255) DEFAULT NULL COMMENT '产品名称',
-    `img_url` varchar(255) DEFAULT NULL,
-    `sku_prop` varchar(100) DEFAULT NULL,
-    `price` decimal(10,2) DEFAULT NULL COMMENT '第三方销售平台售价',
-    `num` int(11) DEFAULT NULL COMMENT '产品数量',
-    `out_id` char(80) DEFAULT NULL COMMENT 'B2B产品SKU',
-    `tax` decimal(10,2) DEFAULT NULL COMMENT '货物税',
-    `discount` decimal(10,2) DEFAULT NULL COMMENT '优惠金额',
-    `create_time` datetime DEFAULT NULL COMMENT '创建时间',
-    PRIMARY KEY (`id`),
-    KEY `order_id` (`order_id`,`shop_id`)
-) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4;
+ALTER TABLE `mall_warehouse` ADD COLUMN `district`  varchar(255) NULL AFTER `city`;

package/version

@@ -1 +1 @@
-v1.60.4
+v1.61.0