@bee-hole/server 1.28.6 → 1.29.1

package/storage/init/init.sql

@@ -2978,7 +2978,7 @@ CREATE TABLE `mall_goods_sub` (
   `good_id` bigint(20) NOT NULL COMMENT '编号',
   `shop_id` bigint(20) NOT NULL COMMENT '所属门店',
   `view_id` bigint(20) NOT NULL COMMENT '所属视图',
-  `cat_id` bigint(20) NOT NULL COMMENT '所属类目',
+  `cat_id` bigint(20) DEFAULT NULL COMMENT '所属类目',
   `title` varchar(255) NOT NULL COMMENT '标题',
   `sub_title` text COMMENT '副标题',
   `desc` longtext COMMENT '描述',

package/storage/patch/patch.sql

@@ -1,363 +1 @@
-ALTER TABLE `admin_syn_config` ADD COLUMN `syn_idf` int(1) NOT NULL DEFAULT 1 COMMENT '1=>商品，2=>订单' AFTER `syn_type`;
-ALTER TABLE `admin_syn_config` DROP INDEX `shopId_syn_type`, ADD UNIQUE `shopId_syn_type` (`shop_id`, `syn_type`, `syn_idf`) USING BTREE;
-
-CREATE TABLE `admin_goods_public`
-(
-    `id`           int(11) NOT NULL AUTO_INCREMENT COMMENT '主键',
-    `main_shop_id` bigint(20) NOT NULL COMMENT '主店shop_id',
-    `main_good_id` bigint(20) NOT NULL COMMENT '主店good_id',
-    `main_view_id` bigint(20) NOT NULL COMMENT '主店视图ID',
-    `son_user_id` bigint(20) NOT NULL COMMENT '子商户userId',
-    `son_shop_id`  bigint(20) NOT NULL COMMENT '子店shop_id',
-    `son_good_id`  bigint(20) NOT NULL COMMENT '子店good_id',
-    `syn_time`     datetime NOT NULL COMMENT '同步时间',
-    `update_time`  datetime DEFAULT NULL COMMENT '更新时间',
-    `create_time`  datetime NOT NULL COMMENT '创建时间',
-    PRIMARY KEY (`id`),
-    UNIQUE KEY `uniq` (`main_shop_id`,`main_good_id`,`main_view_id`,`son_shop_id`)
-) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4;
-
-CREATE TABLE `mall_shop_funds_change_log`
-(
-    `id`           bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT '表主键',
-    `main_shop_id` bigint(20) NOT NULL COMMENT '主店shop_id',
-    `sub_shop_id`  bigint(20) NOT NULL COMMENT '子店shop_id',
-    `old_funds`    decimal(10, 5) NOT NULL COMMENT '变更前的资金',
-    `increment`    decimal(10, 5) NOT NULL COMMENT '增量',
-    `now_funds`    decimal(10, 5) NOT NULL COMMENT '变化后的资金数目',
-    `change_type`  varchar(16)    NOT NULL COMMENT '变更类型:PURCHASE_INC(采购单退款)PURCHASE_DEC(采购单支付)RECHARGE_INC(充值单支付)RECHARGE_DEC(充值单减少)',
-    `reference_id` varchar(64)    NOT NULL COMMENT '充值单支付和退款时,此字段表示mall_shop_recharge_log表中的recharge_id;\r\n采购单支付和退款时,此字段表示mall_prepay表中的prepay_id',
-    `create_time`  datetime       NOT NULL COMMENT '数据创建时间',
-    PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='店铺资金变更记录';
-
-CREATE TABLE `mall_purchase`
-(
-    `id`            bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT '表主键',
-    `out_order_id`  varchar(64)    NOT NULL COMMENT '外部订单号',
-    `purchase_id`   varchar(64)    NOT NULL COMMENT '采购单编号,以P开头',
-    `main_shop_id`  bigint(20) NOT NULL COMMENT '主店铺shop_id(货源方标记)',
-    `sub_shop_id`   bigint(20) NOT NULL COMMENT '采购店铺shop_id(采购方标记)',
-    `country`       varchar(255)   NOT NULL COMMENT '收货地址中的国家信息',
-    `state`         varchar(255)   NOT NULL COMMENT '收货地址中的省/州信息',
-    `city`          varchar(255)   NOT NULL COMMENT '收货地址中的城市信息',
-    `street`        text           NOT NULL COMMENT '收货地址中的街道信息',
-    `apartment`     text           NOT NULL COMMENT '收货地址中的详细信息',
-    `zip_code`      varchar(10)    NOT NULL COMMENT '收货地址中的邮编信息',
-    `phone`         varchar(100)   NOT NULL COMMENT '收货人手机号/电话号',
-    `first_name`    varchar(50)    NOT NULL COMMENT '收货人名讳',
-    `last_name`     varchar(50)    NOT NULL COMMENT '收货人姓氏',
-    `currency`      varchar(3)     NOT NULL COMMENT '交易货币编码',
-    `post_fee`      decimal(10, 2) NOT NULL COMMENT '邮费',
-    `discount`      decimal(10, 2) NOT NULL COMMENT '折扣金额',
-    `payment`       decimal(10, 2) NOT NULL COMMENT '实付金额',
-    `debit_channel` varchar(7)     NOT NULL COMMENT '扣款渠道:CASH(现金),BALANCE(余额)',
-    `status`        varchar(16)    NOT NULL COMMENT 'unpaid(未支付),paid(已支付),closed(已关闭)',
-    `closed_time`   datetime DEFAULT NULL COMMENT '采购单关闭时间',
-    `create_time`   datetime       NOT NULL COMMENT '数据创建时间',
-    PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=22 DEFAULT CHARSET=utf8mb4 COMMENT='采购单表';
-
-CREATE TABLE `mall_purchase_items`
-(
-    `id`           bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT '表主键',
-    `reference_id` bigint(20) unsigned NOT NULL COMMENT 'mall_purchase表的id',
-    `good_id`      bigint(20) NOT NULL COMMENT '商品good_id',
-    `sku_id`       bigint(20) NOT NULL COMMENT '商品sku_id',
-    `title`        varchar(255)   NOT NULL COMMENT '商品标题',
-    `sku_prop`     varchar(100)   NOT NULL COMMENT '商品属性',
-    `img_url`      text           NOT NULL COMMENT '商品图片',
-    `barcode`      varchar(64)    NOT NULL COMMENT '商品条码',
-    `out_id`       varchar(64)    NOT NULL COMMENT '商品外部编码',
-    `num`          int(11) NOT NULL COMMENT '商品数量',
-    `price`        decimal(10, 2) NOT NULL COMMENT '商品单价',
-    `discount`     decimal(10, 2) NOT NULL COMMENT '商品折扣',
-    `payment`      decimal(10, 2) NOT NULL COMMENT '商品总金额',
-    `create_time`  datetime       NOT NULL COMMENT '数据创建时间',
-    PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=22 DEFAULT CHARSET=utf8mb4 COMMENT='采购单商品 信息表';
-ALTER TABLE `mall_purchase_items`;
-
-CREATE TABLE `mall_shop_funds`
-(
-    `id`           bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT '表主键',
-    `main_shop_id` bigint(20) NOT NULL COMMENT '主店shop_id',
-    `sub_shop_id`  bigint(20) NOT NULL COMMENT '子店shop_id',
-    `funds`        decimal(15, 5) NOT NULL COMMENT '资金信息',
-    `currency`     varchar(3)     NOT NULL COMMENT '资金货币编码',
-    `create_time`  datetime       NOT NULL COMMENT '数据创建时间',
-    PRIMARY KEY (`id`),
-    KEY            `mall_shop_funds_sub_shop_id_IDX` (`sub_shop_id`) USING BTREE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='店铺资金表';
-
-CREATE TABLE `mall_purchase_orders`
-(
-    `id`          bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT '表主键',
-    `purchase_id` varchar(64) NOT NULL COMMENT '采购单号',
-    `order_id`    varchar(64) NOT NULL COMMENT '主店订单号',
-    `create_time` datetime    NOT NULL COMMENT '数据创建时间',
-    PRIMARY KEY (`id`),
-    KEY           `mall_purchase_orders_purchase_id_IDX` (`purchase_id`) USING BTREE,
-    KEY           `mall_purchase_orders_order_id_IDX` (`order_id`) USING BTREE
-) ENGINE=InnoDB AUTO_INCREMENT=15 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.setting.synitem.title', 'synitem', 'book', 'C', '', 'synitem', 'item/synitem/index', '', '1', '2', '1', '', '2', '', '12', '1', '2023-12-28 06:32:06', '2023-12-28 06:33:57');
-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 ('2118', '0', 'app.menus.left.procure.procure', 'procud', 'smile', 'M', '', '/PurchaseOrder', '', '', '1', '2', '2', '', '1', '', '10', '1', '2023-12-28 08:28:16', '2023-12-29 01:34:48');
-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 ('2118', 'app.menus.left.procure.publishItem', 'productPublish', 'smile', 'C', '', '/productPublish', 'procure/productPublish', '', '1', '2', '2', '', '2', '', '20', '1', '2023-12-28 08:29:02', '2023-12-29 01:29:28');
-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 ('2118', 'app.menus.left.procure.procureOrder', 'procureOrder', 'inbox', 'C', '', '/procureOrder', 'procure/list', '', '1', '2', '2', '', '2', '', '20', '1', '2023-12-29 01:35:52', '2023-12-29 01:35:52');
-
-
-ALTER TABLE `mall_articles_cats_sub`
-    ADD COLUMN `language` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '语言简写' AFTER `ai`;
-ALTER TABLE `mall_articles_sub`
-    ADD COLUMN `language` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '语言简写' AFTER `status`;
-ALTER TABLE `mall_cats_sub`
-    ADD COLUMN `language` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '语言简写' AFTER `ai`;
-ALTER TABLE `mall_goods_sub`
-    ADD COLUMN `language` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '语言简写' AFTER `ai`;
-ALTER TABLE `mall_sku_props_sub`
-    ADD COLUMN `language` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '语言简写' AFTER `ai`;
-ALTER TABLE `mall_sku_values_sub`
-    ADD COLUMN `language` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '语言简写' AFTER `ai`;
-ALTER TABLE `mall_skus_sub`
-    ADD COLUMN `language` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '语言简写' AFTER `sku_image`;
-
-UPDATE mall_articles_cats_sub
-    JOIN mall_shop_view
-ON mall_shop_view.view_id = mall_articles_cats_sub.view_id
-    SET mall_articles_cats_sub.language = mall_shop_view.language;
-
-UPDATE mall_articles_sub
-    JOIN mall_shop_view
-ON mall_shop_view.view_id = mall_articles_sub.view_id
-    SET mall_articles_sub.language = mall_shop_view.language;
-
-UPDATE mall_cats_sub
-    JOIN mall_shop_view
-ON mall_shop_view.view_id = mall_cats_sub.view_id
-    SET mall_cats_sub.language = mall_shop_view.language;
-
-UPDATE mall_goods_sub
-    JOIN mall_shop_view
-ON mall_shop_view.view_id = mall_goods_sub.view_id
-    SET mall_goods_sub.language = mall_shop_view.language;
-
-UPDATE mall_sku_props_sub
-    JOIN mall_shop_view
-ON mall_shop_view.view_id = mall_sku_props_sub.view_id
-    SET mall_sku_props_sub.language = mall_shop_view.language;
-
-UPDATE mall_sku_values_sub
-    JOIN mall_shop_view
-ON mall_shop_view.view_id = mall_sku_values_sub.view_id
-    SET mall_sku_values_sub.language = mall_shop_view.language;
-
-UPDATE `mall_order` AS o JOIN `mall_shops` as s
-ON o.shop_id = s.shop_id SET o.user_id = s.user_id;
-
-UPDATE `mall_order` AS o JOIN `mall_shops` as s
-ON o.shop_id = s.shop_id SET o.user_id = s.user_id;
-
-
-CREATE TABLE `admin_fx_detail` (
-   `detail_id` bigint(20) NOT NULL,
-   `distributor_id` bigint(20) NOT NULL COMMENT '代理商编号',
-   `seller_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='代理订单表';
-ALTER TABLE `admin_fx_detail`
-    ADD PRIMARY KEY (`detail_id`);
-ALTER TABLE `admin_fx_detail`
-    MODIFY `detail_id` bigint(20) NOT NULL AUTO_INCREMENT;
-
-CREATE TABLE `admin_fx_distributor`
-(
-    `distributor_id`   bigint(20) NOT NULL COMMENT '代理商编号',
-    `seller_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='商家代理商';
-ALTER TABLE `admin_fx_distributor`
-    ADD PRIMARY KEY (`distributor_id`);
-ALTER TABLE `admin_fx_distributor`
-    MODIFY `distributor_id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '代理商编号';
-
-CREATE TABLE `admin_fx_distributor_relation`
-(
-    `relation_id`    bigint(20) NOT NULL COMMENT '关系编号',
-    `distributor_id` bigint(20) NOT NULL COMMENT '代理商编号',
-    `seller_id`      bigint(20) NOT NULL COMMENT '商家编号',
-    `create_time`    datetime NOT NULL COMMENT '创建时间'
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='代理商商家关系表';
-ALTER TABLE `admin_fx_distributor_relation`
-    ADD PRIMARY KEY (`relation_id`);
-ALTER TABLE `admin_fx_distributor_relation`
-    MODIFY `relation_id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '关系编号';
-
-CREATE TABLE `admin_fx_grade`
-(
-    `grade_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='商家代理商等级表';
-INSERT INTO `admin_fx_grade` (`grade_id`, `grade_name`, `proportion`, `create_time`, `update_time`)
-VALUES (1, '1级代理商', 10.00, '2024-01-05 01:24:47', '2024-01-05 01:24:47');
-ALTER TABLE `admin_fx_grade`
-    ADD PRIMARY KEY (`grade_id`);
-ALTER TABLE `admin_fx_grade`
-    MODIFY `grade_id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '等级编号', AUTO_INCREMENT=2;
-
-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
-(2130, 0, 'app.menus.left.distribution', 'fenxiao', 'user', 'M', '', '/fenxiao', '', '', '1', '2', '2', '', 1, '', 10, '1', '2023-12-25 07:50:13', '2024-01-05 01:11:05');
-
-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
-(2130, 'app.menus.left.distribution.distributor.order', 'detail', 'bars', 'C', '', 'detail', 'fenxiao/detail', '', '1', '2', '2', '', 2, '', 19, '1', '2023-12-29 01:34:16', '2024-01-05 01:11:25'),
-(2130, 'app.menus.left.distribution.distributor.grade', 'grade', 'star', 'C', '', 'grade', 'fenxiao/grade', '', '1', '2', '2', '', 2, '', 21, '1', '2023-12-27 00:53:03', '2024-01-05 01:13:55'),
-(2130, 'app.menus.left.distribution.distributor', 'distributor', 'user', 'C', '', 'distributor', 'fenxiao/distributor', '', '1', '2', '2', '', 2, '', 20, '1', '2023-12-25 08:10:02', '2024-01-05 01:12:40');
-
-CREATE TABLE `mall_shop_recharge_log`
-(
-    `id`             bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT '表主键',
-    `recharge_id`    varchar(64)    NOT NULL COMMENT '充值单标记',
-    `prepay_id`      varchar(64)    NOT NULL COMMENT '预支付单号',
-    `main_shop_id`   bigint(20) NOT NULL COMMENT '主店shop_id',
-    `sub_shop_id`    bigint(20) NOT NULL COMMENT '子店shop_id',
-    `trans_currency` varchar(3)     NOT NULL COMMENT '子店充值时选择的货币编码',
-    `real_currency`  varchar(3)     NOT NULL COMMENT '主店收款货币编码',
-    `exchange_rate`  decimal(10, 5) NOT NULL COMMENT '汇率',
-    `trans_amount`   decimal(10, 5) NOT NULL COMMENT '子店支付金额',
-    `real_amount`    decimal(10, 2) NOT NULL COMMENT '子店在主店实际充值的金额',
-    `pay_way_id`     tinyint(4) DEFAULT NULL COMMENT '支付方式标记: 1(微信支付) 2(paypal) 3(支付宝)',
-    `transaction_id` varchar(64) DEFAULT NULL COMMENT '支付平台交易流水号',
-    `paid_time`      datetime    DEFAULT NULL COMMENT '充值单支付时间',
-    `refunded_time`  datetime    DEFAULT NULL COMMENT '充值单退款时间',
-    `status`         varchar(10)    NOT NULL COMMENT '充值单状态:PENDING(待支付)PAID(已支付)REFUNDED(已退款)CLOSED(已关闭)',
-    `create_time`    datetime       NOT NULL COMMENT '数据创建时间',
-    PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=10 DEFAULT CHARSET=utf8mb4 COMMENT='店铺充值记录';
-
-CREATE TABLE `admin_fx_clearing`
-(
-    `clearing_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='代理订单结算表';
-ALTER TABLE `admin_fx_clearing`
-    ADD PRIMARY KEY (`clearing_id`);
-ALTER TABLE `admin_fx_clearing`
-    MODIFY `clearing_id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '结算编号';
-
-CREATE TABLE `admin_fx_clearing_detail` (
-    `clearing_detail_id` bigint(20) NOT NULL,
-    `clearing_id` bigint(20) NOT NULL COMMENT '结算单号',
-    `detail_id` bigint(20) NOT NULL COMMENT '明细编号',
-    `distributor_id` bigint(20) NOT NULL COMMENT '代理商编号',
-    `seller_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='代理订单结算明细表';
-ALTER TABLE `admin_fx_clearing_detail`
-    ADD PRIMARY KEY (`clearing_detail_id`);
-ALTER TABLE `admin_fx_clearing_detail`
-    MODIFY `clearing_detail_id` bigint(20) NOT NULL AUTO_INCREMENT;
-
-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 (2121, 'app.menus.left.distribution.clearing.order', 'clearing', 'bars', 'C', '', 'clearing', 'fenxiao/clearing', '', '1', '2', '2', '', 2, '', 20, '1', '2024-01-08 07:22:29', '2024-01-08 09:01:57');
-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 (2130, 'app.menus.left.distribution.clearing.order', 'clearing', 'bars', 'C', '', 'clearing', 'fenxiao/clearing','', '1', '2', '2', '', 2, '', 20, '1', '2024-01-08 07:22:29', '2024-01-08 09:01:57');
-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 ('2140', '0', 'app.menus.left.supply.title', 'supply', 'smile', 'M', '', '/supply', '', '', '1', '2', '2', '', '1', '', '10', '1', '2024-01-09 07:05:56', '2024-01-09 07:05:56');
-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 ('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');
-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 ('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');
-
-ALTER TABLE `mall_order_items` ADD INDEX(`shop_id`);
-ALTER TABLE `mall_order_items` ADD INDEX(`good_id`);
-ALTER TABLE `mall_order_items` ADD INDEX(`shop_id`, `good_id`);
-
-ALTER TABLE `mall_skus` ADD `extra_fee` DECIMAL(10,2) NOT NULL DEFAULT '0' COMMENT '额外的费用' AFTER `is_for_sale`;
-
-CREATE TABLE `mall_purchase_prepay`
-(
-    `id`             bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT '表主键',
-    `prepay_id`      varchar(64)    NOT NULL COMMENT '预支付ID',
-    `main_shop_id`   bigint(20) NOT NULL COMMENT '主店shop_id',
-    `sub_shop_id`    bigint(20) NOT NULL COMMENT '子店铺shop_id',
-    `signature`      varchar(32)    NOT NULL COMMENT '采购单签名',
-    `quote_currency` varchar(3)     NOT NULL COMMENT '主店标价货币编码',
-    `quote_amount`   decimal(10, 2) NOT NULL COMMENT '标价货币对应的金额',
-    `exchange_rate`  decimal(15, 5) NOT NULL COMMENT '汇率',
-    `trans_currency` varchar(3)     NOT NULL COMMENT '交易货币编码',
-    `trans_amount`   decimal(10, 2) NOT NULL COMMENT '交易货币对应的金额',
-    `transaction_id` varchar(64)    NOT NULL COMMENT 'xBuy侧交易ID',
-    `status`         varchar(10)    NOT NULL COMMENT '预支付单状态: UNPAID(未支付)PAID(已支付)CLOSED(已关闭)',
-    `debit_channel`  varchar(7) DEFAULT NULL COMMENT '扣款渠道:CASH(现金),BALANCE(余额)',
-    `create_time`    datetime       NOT NULL COMMENT '数据创建时间',
-    PRIMARY KEY (`id`),
-    UNIQUE KEY `mall_purchase_prepay_UN` (`prepay_id`)
-) ENGINE=InnoDB AUTO_INCREMENT=6 DEFAULT CHARSET=utf8mb4 COMMENT='采购单预支付信息';
-
-CREATE TABLE `mall_purchase_prepay_details`
-(
-    `id`          bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT '表主键',
-    `prepay_id`   varchar(64)    NOT NULL COMMENT '预支付ID',
-    `purchase_id` varchar(64)    NOT NULL COMMENT '采购单ID',
-    `sub_shop_id` bigint(20) NOT NULL COMMENT '子店铺shop_id',
-    `amount`      decimal(10, 2) NOT NULL COMMENT '采购单金额',
-    `create_time` datetime       NOT NULL COMMENT '数据创建时间',
-    PRIMARY KEY (`id`),
-    KEY           `mall_purchase_prepay_details_prepay_id_IDX` (`prepay_id`) USING BTREE
-) ENGINE=InnoDB AUTO_INCREMENT=6 DEFAULT CHARSET=utf8mb4 COMMENT='采购单预支付详情';
-
-CREATE TABLE `admin_goods_supply` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '供应ID 主键',
-  `shop_id` bigint(20) NOT NULL COMMENT '供应方shop_id(子店)',
-  `good_id` bigint(20) NOT NULL COMMENT '供应商品ID',
-  `main_shop_id` bigint(20) NOT NULL COMMENT '主店shop_id',
-  `main_good_id` bigint(20) DEFAULT '0' COMMENT '主店商品ID',
-  `good_url` varchar(255) NOT NULL COMMENT '商品链接',
-  `good_data` longtext NOT NULL COMMENT '商品数据',
-  `reject_content` varchar(255) DEFAULT NULL COMMENT '驳回信息',
-  `status` int(1) NOT NULL DEFAULT '2' COMMENT '审核状态,1为通过,2为待审核,3为驳回',
-  `create_time` datetime NOT NULL COMMENT '创建时间',
-  PRIMARY KEY (`id`),
-  UNIQUE KEY `unq` (`shop_id`,`good_id`,`main_shop_id`),
-  FULLTEXT KEY `search` (`good_data`)
-) ENGINE=InnoDB AUTO_INCREMENT=19 DEFAULT CHARSET=utf8mb4;
-
-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.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');
-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.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');
-
-INSERT INTO `admin_role_menu` (`role_id`,`menu_id`) VALUES ('2', '2096');
-INSERT INTO `admin_role_menu` (`role_id`,`menu_id`) VALUES ('2', '2117');
-INSERT INTO `admin_menu_perms` (`menu_id`, `res_group_id`, `created_at`) VALUES
-    (2119, 39, '2024-01-12 07:26:59'),
-    (2119, 58, '2024-01-12 07:26:59'),
-    (2120, 58, '2024-01-12 08:02:23');
-INSERT INTO `admin_menu_perms` (`menu_id`, `res_group_id`, `created_at`) VALUES
-    (2132, 62, '2024-01-12 08:27:04'),
-    (2135, 62, '2024-01-12 08:27:04'),
-    (2133, 62, '2024-01-12 08:26:07'),
-    (2131, 62, '2024-01-12 08:25:56');
+ALTER TABLE `mall_goods_sub` CHANGE `cat_id` `cat_id` BIGINT(20) NULL DEFAULT NULL COMMENT '所属类目';

package/version

@@ -1 +1 @@
-v1.28.6
+v1.29.1