调整样本

# Conflicts:
#	tashow-module/tashow-module-infra/src/main/resources/application-local.yaml

.gitignore

@@ -31,6 +31,8 @@ target/*
 /.nb-gradle/
 /build/
 .idea
+.cursor
+.lingma
 
 
 

pom.xml

@@ -47,6 +47,22 @@
         </dependencies>
     </dependencyManagement>
 
+    <profiles>
+        <profile>
+            <id>prod</id>
+            <build>
+                <resources>
+                    <resource>
+                        <directory>src/main/resources</directory>
+                        <excludes>
+                            <exclude>*.yaml</exclude>
+                        </excludes>
+                    </resource>
+                </resources>
+            </build>
+        </profile>
+    </profiles>
+
     <build>
         <pluginManagement>
             <plugins>

sql/db2/README.md

@@ -1,3 +0,0 @@
-暂未适配 IBM DB2 数据库，如果你有需要，可以微信联系 wangwenbin-server 一起建设。
-
-你需要把表结构与数据导入到 DM 数据库，我a来测试与适配代码。

sql/mysql/ai-manage.sql

@@ -0,0 +1,113 @@
+DROP TABLE IF EXISTS `tz_ai_sample`;
+CREATE TABLE `tz_ai_sample`
+(
+    `id`               bigint       NOT NULL AUTO_INCREMENT COMMENT '主键',
+    `sample_file_id`   bigint       NOT NULL COMMENT '样本文件id',
+    `sample_name`      varchar(64)  NULL     DEFAULT '' COMMENT '样本名称',
+    `sample_time`      varchar(16)  NULL     DEFAULT '' COMMENT '样本时长',
+    `sample_mine_type` varchar(16)  NULL     DEFAULT '' COMMENT '样本格式',
+    `sample_size`      varchar(16)  NULL     DEFAULT '' COMMENT '样本大小',
+    `remark`           varchar(255) NULL     DEFAULT '' COMMENT '样本注释',
+    `creator`          varchar(64)  NULL     DEFAULT '' COMMENT '创建者',
+    `create_time`      datetime     NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    `updater`          varchar(64)  NULL     DEFAULT '' COMMENT '更新者',
+    `update_time`      datetime     NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
+    `deleted`          bit(1)       NOT NULL DEFAULT b'0' COMMENT '是否删除',
+    `tenant_id`        bigint       NOT NULL DEFAULT 0 COMMENT '租户编号',
+    PRIMARY KEY (`id`) USING BTREE,
+    INDEX `idx_create_time` (`create_time` ASC) USING BTREE
+) ENGINE = InnoDB COMMENT = '样本库';
+
+
+DROP TABLE IF EXISTS `tz_ai_sample_tag_relate`;
+CREATE TABLE `tz_ai_sample_tag_relate`
+(
+    `id`            bigint NOT NULL AUTO_INCREMENT COMMENT '主键',
+    `sample_id`     bigint NOT NULL COMMENT '样本id',
+    `sample_tag_id` bigint NOT NULL COMMENT '样本标签id',
+    PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB COMMENT = '样本-标签关联表';
+
+
+
+DROP TABLE IF EXISTS `tz_ai_sample_tag`;
+CREATE TABLE `tz_ai_sample_tag`
+(
+    `id`          bigint      NOT NULL AUTO_INCREMENT COMMENT '主键',
+    `tag_name`    varchar(64) NULL     DEFAULT '' COMMENT '标签名称',
+    `creator`     varchar(64) NULL     DEFAULT '' COMMENT '创建者',
+    `create_time` datetime    NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    `updater`     varchar(64) NULL     DEFAULT '' COMMENT '更新者',
+    `update_time` datetime    NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
+    `deleted`     bit(1)      NOT NULL DEFAULT b'0' COMMENT '是否删除',
+    `tenant_id`   bigint      NOT NULL DEFAULT 0 COMMENT '租户编号',
+    PRIMARY KEY (`id`) USING BTREE,
+    INDEX `idx_create_time` (`create_time` ASC) USING BTREE
+) ENGINE = InnoDB COMMENT = '样本标签库';
+
+DROP TABLE IF EXISTS `tz_ai_sample_tag_group`;
+CREATE TABLE `tz_ai_sample_tag_group`
+(
+    `id`          bigint      NOT NULL AUTO_INCREMENT COMMENT '主键',
+    `group_name`  varchar(64) NULL     DEFAULT '' COMMENT '分组名称',
+    `creator`     varchar(64) NULL     DEFAULT '' COMMENT '创建者',
+    `create_time` datetime    NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    `updater`     varchar(64) NULL     DEFAULT '' COMMENT '更新者',
+    `update_time` datetime    NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
+    `deleted`     bit(1)      NOT NULL DEFAULT b'0' COMMENT '是否删除',
+    `tenant_id`   bigint      NOT NULL DEFAULT 0 COMMENT '租户编号',
+    PRIMARY KEY (`id`) USING BTREE,
+    INDEX `idx_create_time` (`create_time` ASC) USING BTREE
+) ENGINE = InnoDB COMMENT = '样本标签分组库';
+
+
+
+DROP TABLE IF EXISTS `tz_ai_sample_tag_group_relate`;
+CREATE TABLE `tz_ai_sample_tag_group_relate`
+(
+    `id`                  bigint NOT NULL AUTO_INCREMENT COMMENT '主键',
+    `sample_tag_id`       bigint NOT NULL COMMENT '样本标签id',
+    `sample_tag_group_id` bigint NOT NULL COMMENT '样本标签分组id',
+    PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB COMMENT = '样本标签-分组关联表';
+
+
+DROP TABLE IF EXISTS `tz_ai_dialog`;
+CREATE TABLE `tz_ai_dialog`
+(
+    `id`            bigint   NOT NULL AUTO_INCREMENT COMMENT '主键',
+    `title`         varchar(128)      DEFAULT '' COMMENT '对话标题',
+    `user_id`       bigint   NOT NULL COMMENT '用户id',
+    `dialog_status` int               DEFAULT NULL COMMENT '对话状态（1active, 2archived, 3deleted）',
+    `creator`       varchar(64)       DEFAULT '' COMMENT '创建者',
+    `create_time`   datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    `updater`       varchar(64)       DEFAULT '' COMMENT '更新者',
+    `update_time`   datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
+    `deleted`       bit(1)   NOT NULL DEFAULT b'0' COMMENT '是否删除',
+    `tenant_id`     bigint   NOT NULL DEFAULT '0' COMMENT '租户编号',
+    PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB COMMENT ='ai-对话表';
+
+DROP TABLE IF EXISTS `tz_ai_dialog_message`;
+CREATE TABLE `tz_ai_dialog_message`
+(
+    `id`               bigint NOT NULL AUTO_INCREMENT COMMENT '主键',
+    `dialog_id`        bigint NOT NULL COMMENT '对话id',
+    `content_text`     text COMMENT '内容',
+    `content_type`     int          DEFAULT NULL COMMENT '文本类型（1text，2file）',
+    `message_order`    int          DEFAULT NULL COMMENT '对话中的顺序',
+    `message_status`   int          DEFAULT NULL COMMENT '消息状态 1正常 0删除',
+    `pet_id`           bigint       DEFAULT NULL COMMENT '宠物id',
+    `pet_name`         varchar(255) DEFAULT NULL COMMENT '宠物名称',
+    `pet_avatar`       varchar(255) DEFAULT NULL COMMENT '宠物头像',
+    `pet_type`         varchar(64)  DEFAULT NULL COMMENT '宠物类型',
+    `create_time`      datetime     DEFAULT NULL COMMENT '创建时间',
+    `trans_result`     text COMMENT '回答结果',
+    `content_duration` bigint       DEFAULT NULL COMMENT '文件时长',
+    `trans_status`     int          DEFAULT NULL COMMENT '翻译状态（1成功 0失败）',
+    `source_result`    text COMMENT '原始结果',
+    `file_name`        varchar(255) DEFAULT NULL COMMENT '文件名称',
+    PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB COMMENT ='ai-对话消息表';
+
+

sql/mysql/member.sql

@@ -1,51 +0,0 @@
--- 会员用户表 (tz_member_user)
-CREATE TABLE `tz_member_user` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '用户ID',
-  `mobile` varchar(11) NOT NULL COMMENT '手机',
-  `password` varchar(128) NOT NULL COMMENT '加密后的密码',
-  `status` tinyint(4) NOT NULL COMMENT '帐号状态 (枚举 CommonStatusEnum)',
-  `register_ip` varchar(32) DEFAULT NULL COMMENT '注册 IP',
-  `register_terminal` tinyint(4) DEFAULT NULL COMMENT '注册终端 (枚举 TerminalEnum)',
-  `login_ip` varchar(32) DEFAULT NULL COMMENT '最后登录IP',
-  `login_date` datetime DEFAULT NULL COMMENT '最后登录时间',
-  `nickname` varchar(64) DEFAULT NULL COMMENT '用户昵称',
-  `avatar` varchar(512) DEFAULT NULL COMMENT '用户头像',
-  `name` varchar(64) DEFAULT NULL COMMENT '真实名字',
-  `sex` tinyint(4) DEFAULT NULL COMMENT '性别 (枚举 SexEnum)',
-  `birthday` datetime DEFAULT NULL COMMENT '出生日期',
-  `area_id` int(11) DEFAULT NULL COMMENT '所在地 (关联 Area.id 字段)',
-  `mark` varchar(512) DEFAULT NULL COMMENT '用户备注',
-  `point` int(11) DEFAULT NULL COMMENT '积分',
-  `tag_ids` varchar(512) DEFAULT NULL COMMENT '会员标签列表，以逗号分隔',
-  `level_id` bigint(20) DEFAULT NULL COMMENT '会员级别编号 (关联 MemberLevelDO.id 字段)',
-  `experience` int(11) DEFAULT NULL COMMENT '会员经验',
-  `group_id` bigint(20) DEFAULT NULL COMMENT '用户分组编号 (关联 MemberGroupDO.id 字段)',
-  `tenant_id` bigint(20) NOT NULL COMMENT '租户ID',
-  `create_time` datetime NOT NULL COMMENT '创建时间',
-  `update_time` datetime NOT NULL COMMENT '最后更新时间',
-  `creator` varchar(64) NOT NULL COMMENT '创建者',
-  `updater` varchar(64) NOT NULL COMMENT '更新者',
-  `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否删除',
-  PRIMARY KEY (`id`),
-  UNIQUE KEY `uk_mobile` (`mobile`),
-  KEY `idx_level_id` (`level_id`),
-  KEY `idx_group_id` (`group_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='会员用户表';
-
--- 用户收件地址表 (tz_member_address)
-CREATE TABLE `tz_member_address` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '编号',
-  `user_id` bigint(20) NOT NULL COMMENT '用户编号',
-  `name` varchar(64) NOT NULL COMMENT '收件人名称',
-  `mobile` varchar(11) NOT NULL COMMENT '手机号',
-  `area_id` bigint(20) NOT NULL COMMENT '地区编号',
-  `detail_address` varchar(512) NOT NULL COMMENT '收件详细地址',
-  `default_status` tinyint(1) DEFAULT NULL COMMENT '是否默认 (true - 默认收件地址)',
-  `create_time` datetime NOT NULL COMMENT '创建时间',
-  `update_time` datetime NOT NULL COMMENT '最后更新时间',
-  `creator` varchar(64) NOT NULL COMMENT '创建者',
-  `updater` varchar(64) NOT NULL COMMENT '更新者',
-  `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否删除',
-  PRIMARY KEY (`id`),
-  KEY `idx_user_id` (`user_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='用户收件地址表';

sql/mysql/order.sql

@@ -1,266 +1,338 @@
 -- 基础实体表结构 (BaseDO) 不单独建表，字段会被继承到其他表中
-
--- 交易订单表 (trade_order)
 CREATE TABLE `tz_trade_order`
 (
-    `id`                      bigint(20) NOT NULL AUTO_INCREMENT COMMENT '订单编号，主键自增',
+    `id`                      bigint      NOT NULL AUTO_INCREMENT COMMENT '订单编号，主键自增',
-    `order_num`               varchar(64)  NOT NULL COMMENT '订单流水号',
+    `order_num`               varchar(64) NOT NULL COMMENT '订单流水号',
-    `order_type`              tinyint(4) NOT NULL COMMENT '订单类型 (枚举 TradeOrderTypeEnum)',
+    `order_type`              tinyint     NOT NULL COMMENT '订单类型 (枚举 TradeOrderTypeEnum)',
-    `order_terminal`          tinyint(4) NOT NULL COMMENT '订单来源 (枚举 TerminalEnum)',
+    `order_terminal`          tinyint     NOT NULL COMMENT '订单来源 (枚举 TerminalEnum)',
-    `order_status`            tinyint(4) NOT NULL COMMENT '订单状态 (枚举 TradeOrderStatusEnum)',
+    `order_status`            tinyint     NOT NULL COMMENT '订单状态 (枚举 TradeOrderStatusEnum)',
-    `user_id`                 bigint(20) NOT NULL COMMENT '用户编号',
+    `user_id`                 bigint      NOT NULL COMMENT '用户编号',
-    `user_ip`                 varchar(64)  DEFAULT NULL COMMENT '用户IP',
+    `user_ip`                 varchar(64)          DEFAULT NULL COMMENT '用户IP',
-    `user_remark`             varchar(512) DEFAULT NULL COMMENT '用户备注',
+    `user_name`               varchar(64)          DEFAULT NULL COMMENT '用户昵称',
-    `finish_time`             datetime     DEFAULT NULL COMMENT '订单完成时间',
+    `user_mobile`             varchar(11)          DEFAULT NULL COMMENT '用户手机号',
-    `cancel_time`             datetime     DEFAULT NULL COMMENT '订单取消时间',
+    `user_remark`             varchar(512)         DEFAULT NULL COMMENT '用户备注',
-    `cancel_type`             tinyint(4) DEFAULT NULL COMMENT '取消类型 (枚举 TradeOrderCancelTypeEnum)',
+    `finish_time`             datetime             DEFAULT NULL COMMENT '订单完成时间',
-    `merchant_remark`         varchar(512) DEFAULT NULL COMMENT '商家备注',
+    `cancel_time`             datetime             DEFAULT NULL COMMENT '订单取消时间',
-    `comment_status`          tinyint(1) DEFAULT NULL COMMENT '是否评价 (true-已评价, false-未评价)',
+    `cancel_type`             tinyint              DEFAULT NULL COMMENT '取消类型 (枚举 TradeOrderCancelTypeEnum)',
-    `total_price`             int(11) NOT NULL COMMENT '商品原价，单位：分',
+    `cancel_reason`           varchar(128)         DEFAULT NULL COMMENT '取消原因',
-    `discount_price`          int(11) NOT NULL COMMENT '优惠金额，单位：分',
+    `cancel_remark`           varchar(255)         DEFAULT NULL COMMENT '取消原因备注',
-    `delivery_price`          int(11) NOT NULL COMMENT '运费金额，单位：分',
+    `merchant_id`             bigint               DEFAULT NULL COMMENT '商家编号',
-    `adjust_price`            int(11) NOT NULL COMMENT '订单调价，单位：分',
+    `merchant_name`           varchar(64)          DEFAULT NULL COMMENT '商家名称',
-    `pay_price`               int(11) NOT NULL COMMENT '应付金额（总），单位：分',
+    `merchant_remark`         varchar(512)         DEFAULT NULL COMMENT '商家备注',
-    `pay_order_id`            bigint(20) DEFAULT NULL COMMENT '支付订单编号',
+    `comment_status`          tinyint(1)           DEFAULT NULL COMMENT '是否评价 (true-已评价, false-未评价)',
-    `pay_status`              tinyint(1) NOT NULL COMMENT '是否已支付 (true-已支付, false-未支付)',
+    `expense_price`           int                  DEFAULT NULL COMMENT '商品成本（单），单位：分',
-    `pay_time`                datetime     DEFAULT NULL COMMENT '付款时间',
+    `price`                   int                  DEFAULT NULL COMMENT '商品原价（单），单位：分',
-    `pay_channel_code`        varchar(64)  DEFAULT NULL COMMENT '支付渠道',
+    `discount_price`          int                  DEFAULT NULL COMMENT '优惠金额（总），单位：分',
-    `delivery_type`           tinyint(4) NOT NULL COMMENT '配送方式 (枚举 DeliveryTypeEnum)',
+    `delivery_price`          int                  DEFAULT NULL COMMENT '运费金额（总），单位：分',
-    `logistics_id`            bigint(20) NOT NULL DEFAULT 0 COMMENT '发货物流公司编号',
+    `adjust_price`            int                  DEFAULT NULL COMMENT '订单调价（总），单位：分',
-    `logistics_no`            varchar(64)  DEFAULT '' COMMENT '发货物流单号',
+    `pay_price`               int                  DEFAULT NULL COMMENT '应付金额（总），单位：分',
-    `delivery_time`           datetime     DEFAULT NULL COMMENT '发货时间',
+    `live_price`              int                  DEFAULT NULL COMMENT '实收金额（总），单位：分',
-    `receive_time`            datetime     DEFAULT NULL COMMENT '收货时间',
+    `pay_order_id`            bigint               DEFAULT NULL COMMENT '支付订单编号',
-    `receiver_name`           varchar(64)  NOT NULL COMMENT '收件人名称',
+    `pay_status`              tinyint(1)           DEFAULT NULL COMMENT '是否已支付 (true-已支付, false-未支付)',
-    `receiver_mobile`         varchar(20)  NOT NULL COMMENT '收件人手机',
+    `pay_type`                tinyint              DEFAULT NULL COMMENT '支付方式（PayTypeEnum）',
-    `receiver_area_id`        int(11) NOT NULL COMMENT '收件人地区编号',
+    `pay_time`                datetime             DEFAULT NULL COMMENT '付款时间',
-    `receiver_detail_address` varchar(512) NOT NULL COMMENT '收件人详细地址',
+    `pay_channel_code`        tinyint              DEFAULT NULL COMMENT '支付渠道(PayTypeEnum)',
-    `pick_up_store_id`        bigint(20) DEFAULT NULL COMMENT '自提门店编号',
+    `delivery_type`           tinyint              DEFAULT NULL COMMENT '配送方式 (枚举 DeliveryTypeEnum)',
-    `pick_up_verify_code`     varchar(64)  DEFAULT NULL COMMENT '自提核销码',
+    `logistics_id`            bigint               DEFAULT '0' COMMENT '发货物流公司编号',
-    `refund_status`           tinyint(4) NOT NULL COMMENT '退款状态 (枚举 TradeOrderRefundStatusEnum)',
+    `logistics_no`            varchar(64)          DEFAULT '' COMMENT '发货物流单号',
-    `refund_price`            int(11) NOT NULL COMMENT '退款金额，单位：分',
+    `delivery_time`           datetime             DEFAULT NULL COMMENT '发货时间',
-    `after_sale_id`           bigint(20) DEFAULT NULL COMMENT '售后单编号',
+    `receive_time`            datetime             DEFAULT NULL COMMENT '收货时间',
-    `after_sale_status`       tinyint(4) NOT NULL COMMENT '售后状态 (枚举 TradeOrderItemAfterSaleStatusEnum)',
+    `receiver_name`           varchar(64)          DEFAULT NULL COMMENT '收件人名称',
-    `create_time`             datetime     NOT NULL COMMENT '创建时间',
+    `receiver_mobile`         varchar(20)          DEFAULT NULL COMMENT '收件人手机',
-    `update_time`             datetime     NOT NULL COMMENT '最后更新时间',
+    `receiver_area_id`        int                  DEFAULT NULL COMMENT '收件人地区编号',
-    `creator`                 varchar(64)  NOT NULL COMMENT '创建者',
+    `receiver_detail_address` varchar(512)         DEFAULT NULL COMMENT '收件人详细地址',
-    `updater`                 varchar(64)  NOT NULL COMMENT '更新者',
+    `pick_up_store_id`        bigint               DEFAULT NULL COMMENT '自提门店编号',
-    `deleted`                 tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否删除',
+    `pick_up_verify_code`     varchar(64)          DEFAULT NULL COMMENT '自提核销码',
+    `refund_status`           tinyint              DEFAULT NULL COMMENT '退款状态 (枚举 TradeOrderRefundStatusEnum)',
+    `refund_price`            int                  DEFAULT NULL COMMENT '退款金额，单位：分',
+    `refund_time`             datetime             DEFAULT NULL COMMENT '退款时间',
+    `after_sale_id`           bigint               DEFAULT NULL COMMENT '售后单编号',
+    `after_sale_status`       tinyint              DEFAULT NULL COMMENT '售后状态 (枚举 TradeOrderItemAfterSaleStatusEnum)',
+    `finance_id`              bigint               DEFAULT NULL COMMENT '财务单编号',
+    `finance_status`          tinyint              DEFAULT NULL COMMENT '财务状态 (枚举 TradeOrderItemFinanceEnum)',
+    `version`                 int         NOT NULL DEFAULT '0' COMMENT '版本号（乐观锁）',
+    `create_time`             datetime             DEFAULT NULL COMMENT '创建时间',
+    `update_time`             datetime             DEFAULT NULL COMMENT '最后更新时间',
+    `creator`                 varchar(64)          DEFAULT NULL COMMENT '创建者',
+    `updater`                 varchar(64)          DEFAULT NULL COMMENT '更新者',
+    `deleted`                 tinyint(1)  NOT NULL DEFAULT '0' COMMENT '是否删除',
+    `tenant_id`               bigint      NOT NULL DEFAULT '1' COMMENT '租户编号',
     PRIMARY KEY (`id`),
     UNIQUE KEY `uk_order_num` (`order_num`),
-    KEY                       `idx_user_id` (`user_id`),
+    KEY `idx_user_id` (`user_id`),
-    KEY                       `idx_status` (`order_status`),
+    KEY `idx_status` (`order_status`),
-    KEY                       `idx_pay_status` (`pay_status`)
+    KEY `idx_pay_status` (`pay_status`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='交易订单表';
+) ENGINE = InnoDB
+  AUTO_INCREMENT = 2
+  DEFAULT CHARSET = utf8mb4
+  COLLATE = utf8mb4_0900_ai_ci COMMENT ='交易订单表';
+
 
 -- 交易订单项表 (trade_order_item)
 CREATE TABLE `tz_trade_order_item`
 (
-    `id`             bigint(20) NOT NULL AUTO_INCREMENT COMMENT '编号',
+    `id`                  bigint       NOT NULL AUTO_INCREMENT COMMENT '编号',
-    `user_id`        bigint(20) NOT NULL COMMENT '用户编号',
+    `user_id`             bigint       NOT NULL COMMENT '用户编号',
-    `order_id`       bigint(20) NOT NULL COMMENT '订单编号',
+    `order_id`            bigint       NOT NULL COMMENT '订单编号',
-    `cart_id`        bigint(20) DEFAULT NULL COMMENT '购物车项编号',
+    `cart_id`             bigint                DEFAULT NULL COMMENT '购物车项编号',
-    `prod_id`        bigint(20) NOT NULL COMMENT '商品 SPU 编号',
+    `spu_id`              bigint       NOT NULL COMMENT '商品 SPU 编号',
-    `prod_name`      varchar(256) NOT NULL COMMENT '商品 SPU 名称',
+    `spu_name`            varchar(256) NOT NULL COMMENT '商品 SPU 名称',
-    `sku_id`         bigint(20) NOT NULL COMMENT '商品 SKU 编号',
+    `spu_type`            tinyint(1)   NOT NULL COMMENT '商品类型（1商品 2服务）',
-    `properties`     json DEFAULT NULL COMMENT '属性数组',
+    `sku_id`              bigint       NOT NULL COMMENT '商品 SKU 编号',
-    `pic_url`        varchar(512) NOT NULL COMMENT '商品图片',
+    `sku_name`            varchar(255) NOT NULL COMMENT '商品 SKU 名称',
-    `count`          int(11) NOT NULL COMMENT '购买数量',
+    `shop_id`             bigint                DEFAULT NULL COMMENT '店铺id',
-    `price`          int(11) NOT NULL COMMENT '商品原价（单），单位：分',
+    `shop_name`           varchar(64)           DEFAULT NULL COMMENT '店铺名称',
-    `discount_price` int(11) NOT NULL COMMENT '优惠金额（总），单位：分',
+    `shop_logo`           varchar(255)          DEFAULT NULL COMMENT '店铺logo',
-    `delivery_price` int(11) NOT NULL COMMENT '运费金额（总），单位：分',
+    `order_category_name` varchar(64)  NOT NULL COMMENT '订单类目名称',
-    `adjust_price`   int(11) NOT NULL COMMENT '订单调价（总），单位：分',
+    `order_category_id`   bigint       NOT NULL COMMENT '订单类目id',
-    `pay_price`      int(11) NOT NULL COMMENT '应付金额（总），单位：分',
+    `pic_url`             varchar(512) NOT NULL COMMENT '商品图片',
-    `serve_ext_info` json DEFAULT NULL COMMENT '扩展服务信息，存储额外的服务相关数据',
+    `count`               int          NOT NULL COMMENT '购买数量',
-    `price_ext_info` json DEFAULT NULL COMMENT '附加费信息',
+    `unit`                varchar(16)           DEFAULT NULL COMMENT '商品单位',
-    `create_time`    datetime     NOT NULL COMMENT '创建时间',
+    `expense_price`       int                   DEFAULT NULL COMMENT '商品成本（单），单位：分',
-    `update_time`    datetime     NOT NULL COMMENT '最后更新时间',
+    `price`               int                   DEFAULT NULL COMMENT '商品原价（单），单位：分',
-    `creator`        varchar(64)  NOT NULL COMMENT '创建者',
+    `discount_price`      int                   DEFAULT NULL COMMENT '优惠金额（总），单位：分',
-    `updater`        varchar(64)  NOT NULL COMMENT '更新者',
+    `delivery_price`      int                   DEFAULT NULL COMMENT '运费金额（总），单位：分',
-    `deleted`        tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否删除',
+    `adjust_price`        int                   DEFAULT NULL COMMENT '订单调价（总），单位：分',
+    `pay_price`           int                   DEFAULT NULL COMMENT '应付金额（总），单位：分',
+    `live_price`          int                   DEFAULT NULL COMMENT '实收金额（总），单位：分',
+    `refund_status`       tinyint               DEFAULT NULL COMMENT '退款状态 (枚举 TradeOrderRefundStatusEnum)',
+    `refund_price`        int                   DEFAULT NULL COMMENT '退款金额，单位：分',
+    `refund_time`         datetime              DEFAULT NULL COMMENT '退款时间',
+    `sub_type`            tinyint(1)            DEFAULT '1' COMMENT '预约类型（1预约 2 加急）',
+    `sub_time`            datetime              DEFAULT NULL COMMENT '预约时间',
+    `serve_address`       varchar(255)          DEFAULT NULL COMMENT '服务地址',
+    `serve_content`       varchar(255)          DEFAULT NULL COMMENT '服务内容',
+    `properties`          json                  DEFAULT NULL COMMENT '属性数组',
+    `serve_info`          json                  DEFAULT NULL COMMENT '服务信息',
+    `serve_ext_info`      json                  DEFAULT NULL COMMENT '扩展服务信息，存储额外的服务相关数据',
+    `price_ext_info`      json                  DEFAULT NULL COMMENT '附加费信息',
+    `version`             int          NOT NULL DEFAULT '0' COMMENT '版本号（乐观锁）',
+    `create_time`         datetime              DEFAULT NULL COMMENT '创建时间',
+    `update_time`         datetime              DEFAULT NULL COMMENT '最后更新时间',
+    `creator`             varchar(64)           DEFAULT NULL COMMENT '创建者',
+    `updater`             varchar(64)           DEFAULT NULL COMMENT '更新者',
+    `deleted`             tinyint(1)   NOT NULL DEFAULT '0' COMMENT '是否删除',
+    `tenant_id`           bigint       NOT NULL DEFAULT '1' COMMENT '租户编号',
     PRIMARY KEY (`id`),
-    KEY              `idx_order_id` (`order_id`),
+    KEY `idx_order_id` (`order_id`),
-    KEY              `idx_sku_id` (`sku_id`),
+    KEY `idx_sku_id` (`sku_id`),
-    KEY              `idx_user_id` (`user_id`)
+    KEY `idx_user_id` (`user_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='交易订单项表';
+) ENGINE = InnoDB
+  AUTO_INCREMENT = 2
+  DEFAULT CHARSET = utf8mb4
+  COLLATE = utf8mb4_0900_ai_ci COMMENT ='交易订单项表';
+
 
 -- 订单日志表 (trade_order_log)
 CREATE TABLE `tz_trade_order_log`
 (
-    `id`            bigint(20) NOT NULL AUTO_INCREMENT COMMENT '编号',
+    `id`            bigint(20)    NOT NULL AUTO_INCREMENT COMMENT '编号',
-    `user_id`       bigint(20) NOT NULL COMMENT '用户编号',
+    `user_id`       bigint(20)    NOT NULL COMMENT '用户编号',
-    `user_type`     tinyint(4) NOT NULL COMMENT '用户类型 (枚举 UserTypeEnum)',
+    `user_type`     tinyint(4)    NOT NULL COMMENT '用户类型 (枚举 UserTypeEnum)',
-    `order_id`      bigint(20) NOT NULL COMMENT '订单号',
+    `order_id`      bigint(20)    NOT NULL COMMENT '订单号',
-    `before_status` int(11) DEFAULT NULL COMMENT '操作前状态',
+    `before_status` int(11)                DEFAULT NULL COMMENT '操作前状态',
-    `after_status`  int(11) DEFAULT NULL COMMENT '操作后状态',
+    `after_status`  int(11)                DEFAULT NULL COMMENT '操作后状态',
-    `operate_type`  tinyint(4) NOT NULL COMMENT '操作类型 (枚举 TradeOrderOperateTypeEnum)',
+    `operate_type`  tinyint(4)    NOT NULL COMMENT '操作类型 (枚举 TradeOrderOperateTypeEnum)',
     `content`       varchar(1024) NOT NULL COMMENT '订单日志信息',
     `create_time`   datetime      NOT NULL COMMENT '创建时间',
     `update_time`   datetime      NOT NULL COMMENT '最后更新时间',
     `creator`       varchar(64)   NOT NULL COMMENT '创建者',
     `updater`       varchar(64)   NOT NULL COMMENT '更新者',
-    `deleted`       tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否删除',
+    `deleted`       tinyint(1)    NOT NULL DEFAULT 0 COMMENT '是否删除',
+    `tenant_id`     bigint        NOT NULL DEFAULT '1' COMMENT '租户编号',
     PRIMARY KEY (`id`),
-    KEY             `idx_order_id` (`order_id`),
+    KEY `idx_order_id` (`order_id`),
-    KEY             `idx_user_id` (`user_id`)
+    KEY `idx_user_id` (`user_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='订单日志表';
+) ENGINE = InnoDB
+  DEFAULT CHARSET = utf8mb4 COMMENT ='订单日志表';
 
 -- 售后订单表 (tz_trade_after_sale)
-CREATE TABLE `tz_trade_after_sale` (
+CREATE TABLE `tz_trade_after_sale`
-  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '售后编号，主键自增',
+(
-  `no` varchar(64) NOT NULL COMMENT '售后单号',
+    `id`                bigint(20)   NOT NULL AUTO_INCREMENT COMMENT '售后编号，主键自增',
-  `status` tinyint(4) NOT NULL COMMENT '退款状态 (枚举 AfterSaleStatusEnum)',
+    `no`                varchar(64)  NOT NULL COMMENT '售后单号',
-  `way` tinyint(4) NOT NULL COMMENT '售后方式 (枚举 AfterSaleWayEnum)',
+    `status`            tinyint(4)   NOT NULL COMMENT '退款状态 (枚举 AfterSaleStatusEnum)',
-  `type` tinyint(4) NOT NULL COMMENT '售后类型 (枚举 AfterSaleTypeEnum)',
+    `way`               tinyint(4)   NOT NULL COMMENT '售后方式 (枚举 AfterSaleWayEnum)',
-  `user_id` bigint(20) NOT NULL COMMENT '用户编号',
+    `type`              tinyint(4)   NOT NULL COMMENT '售后类型 (枚举 AfterSaleTypeEnum)',
-  `apply_reason` varchar(256) NOT NULL COMMENT '申请原因',
+    `user_id`           bigint(20)   NOT NULL COMMENT '用户编号',
-  `apply_description` varchar(512) DEFAULT NULL COMMENT '补充描述',
+    `apply_reason`      varchar(256) NOT NULL COMMENT '申请原因',
-  `apply_pic_urls` json DEFAULT NULL COMMENT '补充凭证图片',
+    `apply_description` varchar(512)          DEFAULT NULL COMMENT '补充描述',
-  `order_id` bigint(20) NOT NULL COMMENT '交易订单编号',
+    `apply_pic_urls`    json                  DEFAULT NULL COMMENT '补充凭证图片',
-  `order_no` varchar(64) NOT NULL COMMENT '订单流水号',
+    `order_id`          bigint(20)   NOT NULL COMMENT '交易订单编号',
-  `order_item_id` bigint(20) NOT NULL COMMENT '交易订单项编号',
+    `order_no`          varchar(64)  NOT NULL COMMENT '订单流水号',
-  `prod_id` bigint(20) NOT NULL COMMENT '商品 SPU 编号',
+    `order_item_id`     bigint(20)   NOT NULL COMMENT '交易订单项编号',
-  `prod_name` varchar(256) NOT NULL COMMENT '商品 SPU 名称',
+    `prod_id`           bigint(20)   NOT NULL COMMENT '商品 SPU 编号',
-  `sku_id` bigint(20) NOT NULL COMMENT '商品 SKU 编号',
+    `prod_name`         varchar(256) NOT NULL COMMENT '商品 SPU 名称',
-  `properties` json DEFAULT NULL COMMENT '属性数组',
+    `sku_id`            bigint(20)   NOT NULL COMMENT '商品 SKU 编号',
-  `pic_url` varchar(512) DEFAULT NULL COMMENT '商品图片',
+    `properties`        json                  DEFAULT NULL COMMENT '属性数组',
-  `count` int(11) NOT NULL COMMENT '退货商品数量',
+    `pic_url`           varchar(512)          DEFAULT NULL COMMENT '商品图片',
-  `audit_time` datetime DEFAULT NULL COMMENT '审批时间',
+    `count`             int(11)      NOT NULL COMMENT '退货商品数量',
-  `audit_user_id` bigint(20) DEFAULT NULL COMMENT '审批人',
+    `audit_time`        datetime              DEFAULT NULL COMMENT '审批时间',
-  `audit_reason` varchar(512) DEFAULT NULL COMMENT '审批备注',
+    `audit_user_id`     bigint(20)            DEFAULT NULL COMMENT '审批人',
-  `refund_price` int(11) NOT NULL COMMENT '退款金额，单位：分',
+    `audit_reason`      varchar(512)          DEFAULT NULL COMMENT '审批备注',
-  `pay_refund_id` bigint(20) DEFAULT NULL COMMENT '支付退款编号',
+    `refund_price`      int(11)      NOT NULL COMMENT '退款金额，单位：分',
-  `refund_time` datetime DEFAULT NULL COMMENT '退款时间',
+    `pay_refund_id`     bigint(20)            DEFAULT NULL COMMENT '支付退款编号',
-  `logistics_id` bigint(20) DEFAULT NULL COMMENT '退货物流公司编号',
+    `refund_time`       datetime              DEFAULT NULL COMMENT '退款时间',
-  `logistics_no` varchar(64) DEFAULT NULL COMMENT '退货物流单号',
+    `logistics_id`      bigint(20)            DEFAULT NULL COMMENT '退货物流公司编号',
-  `delivery_time` datetime DEFAULT NULL COMMENT '退货时间',
+    `logistics_no`      varchar(64)           DEFAULT NULL COMMENT '退货物流单号',
-  `receive_time` datetime DEFAULT NULL COMMENT '收货时间',
+    `delivery_time`     datetime              DEFAULT NULL COMMENT '退货时间',
-  `receive_reason` varchar(512) DEFAULT NULL COMMENT '收货备注',
+    `receive_time`      datetime              DEFAULT NULL COMMENT '收货时间',
-  `create_time` datetime NOT NULL COMMENT '创建时间',
+    `receive_reason`    varchar(512)          DEFAULT NULL COMMENT '收货备注',
-  `update_time` datetime NOT NULL COMMENT '最后更新时间',
+    `create_time`       datetime     NOT NULL COMMENT '创建时间',
-  `creator` varchar(64) NOT NULL COMMENT '创建者',
+    `update_time`       datetime     NOT NULL COMMENT '最后更新时间',
-  `updater` varchar(64) NOT NULL COMMENT '更新者',
+    `creator`           varchar(64)  NOT NULL COMMENT '创建者',
-  `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否删除',
+    `updater`           varchar(64)  NOT NULL COMMENT '更新者',
-  PRIMARY KEY (`id`),
+    `deleted`           tinyint(1)   NOT NULL DEFAULT 0 COMMENT '是否删除',
-  UNIQUE KEY `uk_no` (`no`),
+    PRIMARY KEY (`id`),
-  KEY `idx_user_id` (`user_id`),
+    UNIQUE KEY `uk_no` (`no`),
-  KEY `idx_order_id` (`order_id`),
+    KEY `idx_user_id` (`user_id`),
-  KEY `idx_order_item_id` (`order_item_id`),
+    KEY `idx_order_id` (`order_id`),
-  KEY `idx_status` (`status`)
+    KEY `idx_order_item_id` (`order_item_id`),
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='售后订单表';
+    KEY `idx_status` (`status`)
+) ENGINE = InnoDB
+  DEFAULT CHARSET = utf8mb4 COMMENT ='售后订单表';
 
 -- 交易售后日志表 (tz_trade_after_sale_log)
-CREATE TABLE `tz_trade_after_sale_log` (
+CREATE TABLE `tz_trade_after_sale_log`
-  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '编号',
+(
-  `user_id` bigint(20) NOT NULL COMMENT '用户编号',
+    `id`            bigint(20)   NOT NULL AUTO_INCREMENT COMMENT '编号',
-  `user_type` tinyint(4) NOT NULL COMMENT '用户类型 (枚举 UserTypeEnum)',
+    `user_id`       bigint(20)   NOT NULL COMMENT '用户编号',
-  `after_sale_id` bigint(20) NOT NULL COMMENT '售后编号',
+    `user_type`     tinyint(4)   NOT NULL COMMENT '用户类型 (枚举 UserTypeEnum)',
-  `before_status` tinyint(4) DEFAULT NULL COMMENT '操作前状态',
+    `after_sale_id` bigint(20)   NOT NULL COMMENT '售后编号',
-  `after_status` tinyint(4) DEFAULT NULL COMMENT '操作后状态',
+    `before_status` tinyint(4)            DEFAULT NULL COMMENT '操作前状态',
-  `operate_type` tinyint(4) NOT NULL COMMENT '操作类型 (枚举 AfterSaleOperateTypeEnum)',
+    `after_status`  tinyint(4)            DEFAULT NULL COMMENT '操作后状态',
-  `content` varchar(512) NOT NULL COMMENT '操作明细',
+    `operate_type`  tinyint(4)   NOT NULL COMMENT '操作类型 (枚举 AfterSaleOperateTypeEnum)',
-  `create_time` datetime NOT NULL COMMENT '创建时间',
+    `content`       varchar(512) NOT NULL COMMENT '操作明细',
-  `update_time` datetime NOT NULL COMMENT '最后更新时间',
+    `create_time`   datetime     NOT NULL COMMENT '创建时间',
-  `creator` varchar(64) NOT NULL COMMENT '创建者',
+    `update_time`   datetime     NOT NULL COMMENT '最后更新时间',
-  `updater` varchar(64) NOT NULL COMMENT '更新者',
+    `creator`       varchar(64)  NOT NULL COMMENT '创建者',
-  `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否删除',
+    `updater`       varchar(64)  NOT NULL COMMENT '更新者',
-  PRIMARY KEY (`id`),
+    `deleted`       tinyint(1)   NOT NULL DEFAULT 0 COMMENT '是否删除',
-  KEY `idx_after_sale_id` (`after_sale_id`),
+    PRIMARY KEY (`id`),
-  KEY `idx_user_id` (`user_id`),
+    KEY `idx_after_sale_id` (`after_sale_id`),
-  KEY `idx_operate_type` (`operate_type`)
+    KEY `idx_user_id` (`user_id`),
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='交易售后日志表';
+    KEY `idx_operate_type` (`operate_type`)
+) ENGINE = InnoDB
+  DEFAULT CHARSET = utf8mb4 COMMENT ='交易售后日志表';
 
 
 -- 快递公司表 (trade_delivery_express)
-CREATE TABLE `tz_trade_delivery_express` (
+CREATE TABLE `tz_trade_delivery_express`
-  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '编号，自增',
+(
-  `code` varchar(64) NOT NULL COMMENT '快递公司 code',
+    `id`          bigint(20)   NOT NULL AUTO_INCREMENT COMMENT '编号，自增',
-  `name` varchar(128) NOT NULL COMMENT '快递公司名称',
+    `code`        varchar(64)  NOT NULL COMMENT '快递公司 code',
-  `logo` varchar(512) DEFAULT NULL COMMENT '快递公司 logo',
+    `name`        varchar(128) NOT NULL COMMENT '快递公司名称',
-  `sort` int(11) DEFAULT NULL COMMENT '排序',
+    `logo`        varchar(512)          DEFAULT NULL COMMENT '快递公司 logo',
-  `status` tinyint(4) NOT NULL COMMENT '状态 (枚举 CommonStatusEnum)',
+    `sort`        int(11)               DEFAULT NULL COMMENT '排序',
-  `create_time` datetime NOT NULL COMMENT '创建时间',
+    `status`      tinyint(4)   NOT NULL COMMENT '状态 (枚举 CommonStatusEnum)',
-  `update_time` datetime NOT NULL COMMENT '最后更新时间',
+    `create_time` datetime     NOT NULL COMMENT '创建时间',
-  `creator` varchar(64) NOT NULL COMMENT '创建者',
+    `update_time` datetime     NOT NULL COMMENT '最后更新时间',
-  `updater` varchar(64) NOT NULL COMMENT '更新者',
+    `creator`     varchar(64)  NOT NULL COMMENT '创建者',
-  `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否删除',
+    `updater`     varchar(64)  NOT NULL COMMENT '更新者',
-  PRIMARY KEY (`id`),
+    `deleted`     tinyint(1)   NOT NULL DEFAULT 0 COMMENT '是否删除',
-  UNIQUE KEY `uk_code` (`code`)
+    PRIMARY KEY (`id`),
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='快递公司表';
+    UNIQUE KEY `uk_code` (`code`)
+) ENGINE = InnoDB
+  DEFAULT CHARSET = utf8mb4 COMMENT ='快递公司表';
 
 -- 快递运费模板表 (trade_delivery_express_template)
-CREATE TABLE `tz_trade_delivery_express_template` (
+CREATE TABLE `tz_trade_delivery_express_template`
-  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '编号，自增',
+(
-  `name` varchar(128) NOT NULL COMMENT '模板名称',
+    `id`          bigint(20)   NOT NULL AUTO_INCREMENT COMMENT '编号，自增',
-  `charge_mode` tinyint(4) NOT NULL COMMENT '配送计费方式 (枚举 DeliveryExpressChargeModeEnum)',
+    `name`        varchar(128) NOT NULL COMMENT '模板名称',
-  `sort` int(11) DEFAULT NULL COMMENT '排序',
+    `charge_mode` tinyint(4)   NOT NULL COMMENT '配送计费方式 (枚举 DeliveryExpressChargeModeEnum)',
-  `create_time` datetime NOT NULL COMMENT '创建时间',
+    `sort`        int(11)               DEFAULT NULL COMMENT '排序',
-  `update_time` datetime NOT NULL COMMENT '最后更新时间',
+    `create_time` datetime     NOT NULL COMMENT '创建时间',
-  `creator` varchar(64) NOT NULL COMMENT '创建者',
+    `update_time` datetime     NOT NULL COMMENT '最后更新时间',
-  `updater` varchar(64) NOT NULL COMMENT '更新者',
+    `creator`     varchar(64)  NOT NULL COMMENT '创建者',
-  `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否删除',
+    `updater`     varchar(64)  NOT NULL COMMENT '更新者',
-  PRIMARY KEY (`id`)
+    `deleted`     tinyint(1)   NOT NULL DEFAULT 0 COMMENT '是否删除',
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='快递运费模板表';
+    PRIMARY KEY (`id`)
+) ENGINE = InnoDB
+  DEFAULT CHARSET = utf8mb4 COMMENT ='快递运费模板表';
 
 -- 快递运费模板计费配置表 (trade_delivery_express_template_charge)
-CREATE TABLE `tz_trade_delivery_express_template_charge` (
+CREATE TABLE `tz_trade_delivery_express_template_charge`
-  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '编号，自增',
+(
-  `template_id` bigint(20) NOT NULL COMMENT '配送模板编号',
+    `id`          bigint(20)   NOT NULL AUTO_INCREMENT COMMENT '编号，自增',
-  `area_ids` varchar(512) NOT NULL COMMENT '配送区域编号列表',
+    `template_id` bigint(20)   NOT NULL COMMENT '配送模板编号',
-  `charge_mode` tinyint(4) NOT NULL COMMENT '配送计费方式',
+    `area_ids`    varchar(512) NOT NULL COMMENT '配送区域编号列表',
-  `start_count` double NOT NULL COMMENT '首件数量(件数,重量，或体积)',
+    `charge_mode` tinyint(4)   NOT NULL COMMENT '配送计费方式',
-  `start_price` int(11) NOT NULL COMMENT '起步价，单位：分',
+    `start_count` double       NOT NULL COMMENT '首件数量(件数,重量，或体积)',
-  `extra_count` double NOT NULL COMMENT '续件数量(件, 重量，或体积)',
+    `start_price` int(11)      NOT NULL COMMENT '起步价，单位：分',
-  `extra_price` int(11) NOT NULL COMMENT '额外价，单位：分',
+    `extra_count` double       NOT NULL COMMENT '续件数量(件, 重量，或体积)',
-  `create_time` datetime NOT NULL COMMENT '创建时间',
+    `extra_price` int(11)      NOT NULL COMMENT '额外价，单位：分',
-  `update_time` datetime NOT NULL COMMENT '最后更新时间',
+    `create_time` datetime     NOT NULL COMMENT '创建时间',
-  `creator` varchar(64) NOT NULL COMMENT '创建者',
+    `update_time` datetime     NOT NULL COMMENT '最后更新时间',
-  `updater` varchar(64) NOT NULL COMMENT '更新者',
+    `creator`     varchar(64)  NOT NULL COMMENT '创建者',
-  `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否删除',
+    `updater`     varchar(64)  NOT NULL COMMENT '更新者',
-  PRIMARY KEY (`id`),
+    `deleted`     tinyint(1)   NOT NULL DEFAULT 0 COMMENT '是否删除',
-  KEY `idx_template_id` (`template_id`),
+    PRIMARY KEY (`id`),
-  CONSTRAINT `fk_express_template_charge_template_id` FOREIGN KEY (`template_id`) REFERENCES `tz_trade_delivery_express_template` (`id`)
+    KEY `idx_template_id` (`template_id`),
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='快递运费模板计费配置表';
+    CONSTRAINT `fk_express_template_charge_template_id` FOREIGN KEY (`template_id`) REFERENCES `tz_trade_delivery_express_template` (`id`)
+) ENGINE = InnoDB
+  DEFAULT CHARSET = utf8mb4 COMMENT ='快递运费模板计费配置表';
 
 -- 快递运费模板包邮配置表 (trade_delivery_express_template_free)
-CREATE TABLE `tz_trade_delivery_express_template_free` (
+CREATE TABLE `tz_trade_delivery_express_template_free`
-  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '编号',
+(
-  `template_id` bigint(20) NOT NULL COMMENT '配送模板编号',
+    `id`          bigint(20)   NOT NULL AUTO_INCREMENT COMMENT '编号',
-  `area_ids` varchar(512) NOT NULL COMMENT '配送区域编号列表',
+    `template_id` bigint(20)   NOT NULL COMMENT '配送模板编号',
-  `free_price` int(11) DEFAULT NULL COMMENT '包邮金额，单位：分',
+    `area_ids`    varchar(512) NOT NULL COMMENT '配送区域编号列表',
-  `free_count` int(11) DEFAULT NULL COMMENT '包邮件数',
+    `free_price`  int(11)               DEFAULT NULL COMMENT '包邮金额，单位：分',
-  `create_time` datetime NOT NULL COMMENT '创建时间',
+    `free_count`  int(11)               DEFAULT NULL COMMENT '包邮件数',
-  `update_time` datetime NOT NULL COMMENT '最后更新时间',
+    `create_time` datetime     NOT NULL COMMENT '创建时间',
-  `creator` varchar(64) NOT NULL COMMENT '创建者',
+    `update_time` datetime     NOT NULL COMMENT '最后更新时间',
-  `updater` varchar(64) NOT NULL COMMENT '更新者',
+    `creator`     varchar(64)  NOT NULL COMMENT '创建者',
-  `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否删除',
+    `updater`     varchar(64)  NOT NULL COMMENT '更新者',
-  PRIMARY KEY (`id`),
+    `deleted`     tinyint(1)   NOT NULL DEFAULT 0 COMMENT '是否删除',
-  KEY `idx_template_id` (`template_id`),
+    PRIMARY KEY (`id`),
-  CONSTRAINT `fk_express_template_free_template_id` FOREIGN KEY (`template_id`) REFERENCES `tz_trade_delivery_express_template` (`id`)
+    KEY `idx_template_id` (`template_id`),
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='快递运费模板包邮配置表';
+    CONSTRAINT `fk_express_template_free_template_id` FOREIGN KEY (`template_id`) REFERENCES `tz_trade_delivery_express_template` (`id`)
+) ENGINE = InnoDB
+  DEFAULT CHARSET = utf8mb4 COMMENT ='快递运费模板包邮配置表';
 
 -- 自提门店表 (trade_delivery_pick_up_store)
-CREATE TABLE `tz_trade_delivery_pick_up_store` (
+CREATE TABLE `tz_trade_delivery_pick_up_store`
-  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '编号',
+(
-  `name` varchar(128) NOT NULL COMMENT '门店名称',
+    `id`              bigint(20)   NOT NULL AUTO_INCREMENT COMMENT '编号',
-  `introduction` varchar(512) DEFAULT NULL COMMENT '门店简介',
+    `name`            varchar(128) NOT NULL COMMENT '门店名称',
-  `phone` varchar(20) NOT NULL COMMENT '门店手机',
+    `introduction`    varchar(512)          DEFAULT NULL COMMENT '门店简介',
-  `area_id` int(11) NOT NULL COMMENT '区域编号',
+    `phone`           varchar(20)  NOT NULL COMMENT '门店手机',
-  `detail_address` varchar(512) NOT NULL COMMENT '门店详细地址',
+    `area_id`         int(11)      NOT NULL COMMENT '区域编号',
-  `logo` varchar(512) DEFAULT NULL COMMENT '门店 logo',
+    `detail_address`  varchar(512) NOT NULL COMMENT '门店详细地址',
-  `opening_time` time NOT NULL COMMENT '营业开始时间',
+    `logo`            varchar(512)          DEFAULT NULL COMMENT '门店 logo',
-  `closing_time` time NOT NULL COMMENT '营业结束时间',
+    `opening_time`    time         NOT NULL COMMENT '营业开始时间',
-  `latitude` double DEFAULT NULL COMMENT '纬度',
+    `closing_time`    time         NOT NULL COMMENT '营业结束时间',
-  `longitude` double DEFAULT NULL COMMENT '经度',
+    `latitude`        double                DEFAULT NULL COMMENT '纬度',
-  `verify_user_ids` varchar(512) DEFAULT NULL COMMENT '核销员工用户编号数组',
+    `longitude`       double                DEFAULT NULL COMMENT '经度',
-  `status` tinyint(4) NOT NULL COMMENT '门店状态 (枚举 CommonStatusEnum)',
+    `verify_user_ids` varchar(512)          DEFAULT NULL COMMENT '核销员工用户编号数组',
-  `create_time` datetime NOT NULL COMMENT '创建时间',
+    `status`          tinyint(4)   NOT NULL COMMENT '门店状态 (枚举 CommonStatusEnum)',
-  `update_time` datetime NOT NULL COMMENT '最后更新时间',
+    `create_time`     datetime     NOT NULL COMMENT '创建时间',
-  `creator` varchar(64) NOT NULL COMMENT '创建者',
+    `update_time`     datetime     NOT NULL COMMENT '最后更新时间',
-  `updater` varchar(64) NOT NULL COMMENT '更新者',
+    `creator`         varchar(64)  NOT NULL COMMENT '创建者',
-  `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否删除',
+    `updater`         varchar(64)  NOT NULL COMMENT '更新者',
-  PRIMARY KEY (`id`),
+    `deleted`         tinyint(1)   NOT NULL DEFAULT 0 COMMENT '是否删除',
-  KEY `idx_area_id` (`area_id`),
+    PRIMARY KEY (`id`),
-  KEY `idx_status` (`status`)
+    KEY `idx_area_id` (`area_id`),
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='自提门店表';
+    KEY `idx_status` (`status`)
+) ENGINE = InnoDB
+  DEFAULT CHARSET = utf8mb4 COMMENT ='自提门店表';
 
+-- 订单预约时间修改记录表 (tz_trade_sub_log)
+CREATE TABLE `tz_trade_sub_log`
+(
+    `id`          bigint(20)  NOT NULL AUTO_INCREMENT COMMENT '编号',
+    `user_id`     bigint(20)  NOT NULL COMMENT '用户编号',
+    `order_id`    bigint(20)  NOT NULL COMMENT '订单号',
+    `sub_time`    datetime    NOT NULL COMMENT '预约时间',
+    `create_time` datetime    NOT NULL COMMENT '创建时间',
+    `creator`     varchar(64) NOT NULL COMMENT '创建者',
+    `updater`     varchar(64) NOT NULL COMMENT '更新者',
+    `deleted`     tinyint(1)  NOT NULL DEFAULT 0 COMMENT '是否删除',
+    PRIMARY KEY (`id`),
+    KEY `idx_order_id` (`order_id`),
+    KEY `idx_user_id` (`user_id`)
+) ENGINE = InnoDB
+  DEFAULT CHARSET = utf8mb4 COMMENT ='订单预约时间修改记录表';
 

sql/mysql/user.sql

@@ -0,0 +1,90 @@
+-- 登录用户表 (tz_login_user) 后续拓展用户信息表
+CREATE TABLE `tz_user_login`
+(
+    `id`                bigint(20)   NOT NULL AUTO_INCREMENT COMMENT '用户ID',
+    `mobile`            varchar(11)  NOT NULL COMMENT '手机',
+    `password`          varchar(128) NOT NULL COMMENT '加密后的密码',
+    `status`            tinyint(4)   NOT NULL COMMENT '帐号状态 (枚举 CommonStatusEnum)',
+    `register_ip`       varchar(32)           DEFAULT NULL COMMENT '注册 IP',
+    `register_terminal` tinyint(4)            DEFAULT NULL COMMENT '注册渠道 (枚举 TerminalEnum)',
+    `register_date`     datetime              DEFAULT NULL COMMENT '注册时间',
+    `login_ip`          varchar(32)           DEFAULT NULL COMMENT '最后登录IP',
+    `login_date`        datetime              DEFAULT NULL COMMENT '最后登录时间',
+    `login_terminal`    varchar(32)           DEFAULT NULL COMMENT '最后登录设备',
+    `nickname`          varchar(64)           DEFAULT NULL COMMENT '用户昵称',
+    `avatar`            varchar(512)          DEFAULT NULL COMMENT '用户头像',
+    `remark`            varchar(512)          DEFAULT NULL COMMENT '用户备注',
+    `tenant_id`         bigint(20)   NOT NULL COMMENT '租户ID',
+    `create_time`       datetime     NOT NULL COMMENT '创建时间',
+    `update_time`       datetime     NOT NULL COMMENT '最后更新时间',
+    `creator`           varchar(64)  NOT NULL COMMENT '创建者',
+    `updater`           varchar(64)  NOT NULL COMMENT '更新者',
+    `deleted`           tinyint(1)   NOT NULL DEFAULT 0 COMMENT '是否删除',
+    PRIMARY KEY (`id`),
+    UNIQUE KEY `uk_mobile` (`mobile`)
+) ENGINE = InnoDB
+  DEFAULT CHARSET = utf8mb4 COMMENT ='登录用户表';
+
+-- 会员信息表 (tz_user_member)
+CREATE TABLE `tz_user_member`
+(
+    `id`          bigint(20)  NOT NULL AUTO_INCREMENT COMMENT '用户ID',
+    `name`        varchar(64)          DEFAULT NULL COMMENT '真实名字',
+    `sex`         tinyint              DEFAULT NULL COMMENT '性别 (枚举 SexEnum)',
+    `birthday`    datetime             DEFAULT NULL COMMENT '出生日期',
+    `area_id`     int                  DEFAULT NULL COMMENT '所在地 (关联 Area.id 字段)',
+    `point`       int                  DEFAULT NULL COMMENT '积分',
+    `tag_ids`     varchar(512)         DEFAULT NULL COMMENT '会员标签列表，以逗号分隔',
+    `level_id`    bigint               DEFAULT NULL COMMENT '会员级别编号 (关联 MemberLevelDO.id 字段)',
+    `experience`  int                  DEFAULT NULL COMMENT '会员经验',
+    `group_id`    bigint               DEFAULT NULL COMMENT '用户分组编号 (关联 MemberGroupDO.id 字段)',
+    `tenant_id`   bigint(20)  NOT NULL COMMENT '租户ID',
+    `create_time` datetime    NOT NULL COMMENT '创建时间',
+    `update_time` datetime    NOT NULL COMMENT '最后更新时间',
+    `creator`     varchar(64) NOT NULL COMMENT '创建者',
+    `updater`     varchar(64) NOT NULL COMMENT '更新者',
+    `deleted`     tinyint(1)  NOT NULL DEFAULT 0 COMMENT '是否删除',
+    PRIMARY KEY (`id`)
+) ENGINE = InnoDB
+  DEFAULT CHARSET = utf8mb4 COMMENT ='会员信息表';
+
+-- 会员地址表 (tz_user_member_address)
+CREATE TABLE `tz_user_member_address`
+(
+    `id`            bigint(20)  NOT NULL AUTO_INCREMENT COMMENT '用户编号',
+    `name`          varchar(128)         DEFAULT NULL COMMENT '收件人名称',
+    `mobile`        varchar(11)          DEFAULT NULL COMMENT '手机号',
+    `areaId`        bigint(20)           DEFAULT NULL COMMENT '地区编号',
+    `detailAddress` varchar(255)         DEFAULT NULL COMMENT '收件详细地址',
+    `defaultStatus` int                  DEFAULT NULL COMMENT '是否默认',
+    `tenant_id`     bigint(20)  NOT NULL COMMENT '租户ID',
+    `create_time`   datetime    NOT NULL COMMENT '创建时间',
+    `update_time`   datetime    NOT NULL COMMENT '最后更新时间',
+    `creator`       varchar(64) NOT NULL COMMENT '创建者',
+    `updater`       varchar(64) NOT NULL COMMENT '更新者',
+    `deleted`       tinyint(1)  NOT NULL DEFAULT 0 COMMENT '是否删除',
+    PRIMARY KEY (`id`)
+) ENGINE = InnoDB
+  DEFAULT CHARSET = utf8mb4 COMMENT ='会员地址表';
+
+-- 会员等级表 (tz_user_member_level)
+CREATE TABLE `tz_user_member_level`
+(
+    `id`               bigint(20)  NOT NULL AUTO_INCREMENT COMMENT 'ID',
+    `level_name`       varchar(64)          DEFAULT NULL COMMENT '等级名称',
+    `level`            int                  DEFAULT NULL COMMENT '性别 (枚举 SexEnum)',
+    `experience`       int                  DEFAULT NULL COMMENT '会员经验',
+    `discount_percent` int                  DEFAULT NULL COMMENT '享受折扣',
+    `icon`             varchar(128)         DEFAULT NULL COMMENT '等级图标',
+    `background_url`   varchar(128)         DEFAULT NULL COMMENT '等级背景图',
+    `status`           int                  DEFAULT NULL COMMENT '状态',
+    `tenant_id`        bigint(20)  NOT NULL COMMENT '租户ID',
+    `create_time`      datetime    NOT NULL COMMENT '创建时间',
+    `update_time`      datetime    NOT NULL COMMENT '最后更新时间',
+    `creator`          varchar(64) NOT NULL COMMENT '创建者',
+    `updater`          varchar(64) NOT NULL COMMENT '更新者',
+    `deleted`          tinyint(1)  NOT NULL DEFAULT 0 COMMENT '是否删除',
+    PRIMARY KEY (`id`)
+) ENGINE = InnoDB
+  DEFAULT CHARSET = utf8mb4 COMMENT ='会员等级表';
+

sql/tools/.gitignore

@@ -1,8 +0,0 @@
-# 忽略python虚拟环境
-.env
-.venv
-env/
-venv/
-ENV/
-env.bak/
-venv.bak/

sql/tools/README.md

@@ -1,130 +0,0 @@
-## 0. 友情提示
-
-在 `sql/tools` 目录下，我们提供一些数据库相关的工具，包括测试数据库的快速启动、MySQL 转换其它数据库等等。
-
-注意！所有的操作，必须在 `sql/tools` 目录下执行。
-
-## 1. 测试数据库的快速启动
-
-基于 Docker Compose，快速启动 MySQL、Oracle、PostgreSQL、SQL Server 等数据库。
-
-注意！使用 Docker Compose 启动完测试数据后，因为会自动导入项目的 SQL 脚本，所以可能需要等待 1-2 分钟。
-
-### 1.1 MySQL
-
-```Bash
-docker compose up -d mysql
-```
-
-#### 1.2 Oracle
-
-```Bash
-## x86 版本
-docker compose up -d oracle
-
-## MacBook Apple Silicon
-docker compose up -d oracle_m1
-```
-
-> 注意：如果使用 MacBook Apple Silicon 版本，它的 ORACLE_SID 不是 XE，而是 FREE！！！
-
-### 1.3 PostgreSQL
-
-```Bash
-docker compose up -d postgres
-```
-
-### 1.4 SQL Server
-
-```Bash
-docker compose up -d sqlserver
-# 注意：启动完 sqlserver 后，需要手动再执行如下命令，因为 SQL Server 不支持初始化脚本
-docker compose exec sqlserver bash /tmp/create_schema.sh
-```
-
-### 1.5 DM 达梦
-
-① 下载达梦 Docker 镜像：<https://eco.dameng.com/download/> 地址，点击“Docker 镜像”选项，进行下载。
-
-② 加载镜像文件，在镜像 tar 文件所在目录运行：
-
-```Bash
-docker load -i dm8_20240715_x86_rh6_rq_single.tar
-```
-
-③ 在项目 `sql/tools` 目录下运行：
-
-```Bash
-docker compose up -d dm8
-# 注意：启动完 dm 后，需要手动再执行如下命令，因为 dm 不支持初始化脚本
-docker compose exec dm8 bash -c '/opt/dmdbms/bin/disql SYSDBA/SYSDBA001 \`/tmp/schema.sql'
-exit
-```
-
-### 1.6 KingbaseES 人大金仓
-
-① 下载人大金仓 Docker 镜像：
-
-* [x86_64 版本](https://kingbase.oss-cn-beijing.aliyuncs.com/KESV8R3/V009R001C001B0025-安装包-docker/x86_64/kdb_x86_64_V009R001C001B0025.tar) 【Windows 选择这个】
-* [aarch64 版本](https://kingbase.oss-cn-beijing.aliyuncs.com/KESV8R3/V009R001C001B0025-安装包-docker/aarch64/kdb_aarch64_V009R001C001B0025.tar) 【MacBook Apple Silicon 选择这个】
-
-② 加载镜像文件，在镜像 tar 文件所在目录运行：
-
-```Bash
-docker load -i kdb_x86_64_V009R001C001B0025.tar
-```
-
-③ 在项目 `sql/tools` 目录下运行：
-
-```Bash
-docker compose up -d kingbase
-# 注意：启动完 kingbase 后，需要手动再执行如下命令
-docker compose exec kingbase bash -c 'ksql -U $DB_USER -d test -f /tmp/schema.sql'
-```
-
-### 1.7 华为 OpenGauss
-
-```Bash
-docker compose up -d opengauss
-# 注意：启动完 opengauss 后，需要手动再执行如下命令
-docker compose exec opengauss bash -c '/usr/local/opengauss/bin/gsql -U $GS_USERNAME -W $GS_PASSWORD -d postgres -f /tmp/schema.sql'
-```
-
-## 1.X 容器的销毁重建
-
-开发测试过程中，有时候需要创建全新干净的数据库。由于测试数据 Docker 容器采用数据卷 Volume 挂载数据库实例的数据目录，因此销毁数据需要停止容器后，删除数据卷，然后再重新创建容器。
-
-以 postgres 为例，操作如下：
-
-```Bash
-docker compose down postgres
-docker volume rm ruoyi-vue-pro_postgres
-```
-
-## 2. MySQL 转换其它数据库
-
-项目提供了 `sql/tools/convertor.py` 脚本，支持将 MySQL 转换为 Oracle、PostgreSQL、SQL Server、达梦、人大金仓、OpenGauss 等数据库的脚本。
-
-### 2.1 实现原理
-
-通过读取 MySQL 的 `sql/mysql/ruoyi-vue-pro.sql` 数据库文件，转换成对应的数据库脚本。
-
-### 2.2 使用方法
-
-① 安装依赖库 `simple-ddl-parser`
-
-```bash
-pip install simple-ddl-parser
-# pip3 install simple-ddl-parser
-```
-
-② 在 `sql/tools/` 目录下，执行如下命令打印生成 postgres 的脚本内容，其他可选参数有：`oracle`、`sqlserver`、`dm8`、`kingbase`、`opengauss`：
-
-```Bash
-python3 convertor.py postgres
-# python3 convertor.py postgres > tmp.sql
-```
-
-程序将 SQL 脚本打印到终端，可以重定向到临时文件 `tmp.sql`。
-
-确认无误后，可以利用 IDEA 进行格式化。当然，也可以直接导入到数据库中。

sql/tools/convertor.py

@@ -1,844 +0,0 @@
-# encoding=utf8
-"""芋道系统数据库迁移工具
-
-Author: dhb52 (https://gitee.com/dhb52)
-
-pip install simple-ddl-parser
-"""
-
-import argparse
-import pathlib
-import re
-import time
-from abc import ABC, abstractmethod
-from typing import Dict, Generator, Optional, Tuple, Union
-
-from simple_ddl_parser import DDLParser
-
-PREAMBLE = """/*
- Yudao Database Transfer Tool
-
- Source Server Type    : MySQL
-
- Target Server Type    : {db_type}
-
- Date: {date}
-*/
-
-"""
-
-
-def load_and_clean(sql_file: str) -> str:
-    """加载源 SQL 文件，并清理内容方便下一步 ddl 解析
-
-    Args:
-        sql_file (str): sql文件路径
-
-    Returns:
-        str: 清理后的sql文件内容
-    """
-    REPLACE_PAIR_LIST = (
-        (" CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ", " "),
-        (" KEY `", " INDEX `"),
-        ("UNIQUE INDEX", "UNIQUE KEY"),
-        ("b'0'", "'0'"),
-        ("b'1'", "'1'"),
-    )
-
-    content = open(sql_file).read()
-    for replace_pair in REPLACE_PAIR_LIST:
-        content = content.replace(*replace_pair)
-    content = re.sub(r"ENGINE.*COMMENT", "COMMENT", content)
-    content = re.sub(r"ENGINE.*;", ";", content)
-    return content
-
-
-class Convertor(ABC):
-    def __init__(self, src: str, db_type) -> None:
-        self.src = src
-        self.db_type = db_type
-        self.content = load_and_clean(self.src)
-        self.table_script_list = re.findall(r"CREATE TABLE [^;]*;", self.content)
-
-    @abstractmethod
-    def translate_type(self, type: str, size: Optional[Union[int, Tuple[int]]]) -> str:
-        """字段类型转换
-
-        Args:
-            type (str): 字段类型
-            size (Optional[Union[int, Tuple[int]]]): 字段长度描述, 如varchar(255), decimal(10,2)
-
-        Returns:
-            str: 类型定义
-        """
-        pass
-
-    @abstractmethod
-    def gen_create(self, table_ddl: Dict) -> str:
-        """生成 create 脚本
-
-        Args:
-            table_ddl (Dict): 表DDL
-
-        Returns:
-            str:  生成脚本
-        """
-        pass
-
-    @abstractmethod
-    def gen_pk(self, table_name: str) -> str:
-        """生成主键定义
-
-        Args:
-            table_name (str): 表名
-
-        Returns:
-            str: 生成脚本
-        """
-        pass
-
-    @abstractmethod
-    def gen_index(self, ddl: Dict) -> str:
-        """生成索引定义
-
-        Args:
-            table_ddl (Dict): 表DDL
-
-        Returns:
-            str: 生成脚本
-        """
-        pass
-
-    @abstractmethod
-    def gen_comment(self, table_sql: str, table_name: str) -> str:
-        """生成字段/表注释
-
-        Args:
-            table_sql (str): 原始表SQL
-            table_name (str): 表名
-
-        Returns:
-            str: 生成脚本
-        """
-        pass
-
-    @abstractmethod
-    def gen_insert(self, table_name: str) -> str:
-        """生成 insert 语句块
-
-        Args:
-            table_name (str): 表名
-
-        Returns:
-            str: 生成脚本
-        """
-        pass
-
-    def gen_dual(self) -> str:
-        """生成虚拟 dual 表
-
-        Returns:
-            str: 生成脚本, 默认返回空脚本, 表示当前数据库无需手工创建
-        """
-        return ""
-
-    @staticmethod
-    def inserts(table_name: str, script_content: str) -> Generator:
-        PREFIX = f"INSERT INTO `{table_name}`"
-
-        # 收集 `table_name` 对应的 insert 语句
-        for line in script_content.split("\n"):
-            if line.startswith(PREFIX):
-                head, tail = line.replace(PREFIX, "").split(" VALUES ", maxsplit=1)
-                head = head.strip().replace("`", "").lower()
-                tail = tail.strip().replace(r"\"", '"')
-                # tail = tail.replace("b'0'", "'0'").replace("b'1'", "'1'")
-                yield f"INSERT INTO {table_name.lower()} {head} VALUES {tail}"
-
-    @staticmethod
-    def index(ddl: Dict) -> Generator:
-        """生成索引定义
-
-        Args:
-            ddl (Dict): 表DDL
-
-        Yields:
-            Generator[str]: create index 语句
-        """
-
-        def generate_columns(columns):
-            keys = [
-                f"{col['name'].lower()}{' ' + col['order'].lower() if col['order'] != 'ASC' else ''}"
-                for col in columns[0]
-            ]
-            return ", ".join(keys)
-
-        for no, index in enumerate(ddl["index"], 1):
-            columns = generate_columns(index["columns"])
-            table_name = ddl["table_name"].lower()
-            yield f"CREATE INDEX idx_{table_name}_{no:02d} ON {table_name} ({columns})"
-
-    @staticmethod
-    def filed_comments(table_sql: str) -> Generator:
-        for line in table_sql.split("\n"):
-            match = re.match(r"^`([^`]+)`.* COMMENT '([^']+)'", line.strip())
-            if match:
-                field = match.group(1)
-                comment_string = match.group(2).replace("\\n", "\n")
-                yield field, comment_string
-
-    def table_comment(self, table_sql: str) -> str:
-        match = re.search(r"COMMENT \= '([^']+)';", table_sql)
-        return match.group(1) if match else None
-
-    def print(self):
-        """打印转换后的sql脚本到终端"""
-        print(
-            PREAMBLE.format(
-                db_type=self.db_type,
-                date=time.strftime("%Y-%m-%d %H:%M:%S"),
-            )
-        )
-
-        dual = self.gen_dual()
-        if dual:
-            print(
-                f"""-- ----------------------------
--- Table structure for dual
--- ----------------------------
-{dual}
-"""
-            )
-
-        error_scripts = []
-        for table_sql in self.table_script_list:
-            ddl = DDLParser(table_sql.replace("`", "")).run()
-
-            # 如果parse失败, 需要跟进
-            if len(ddl) == 0:
-                error_scripts.append(table_sql)
-                continue
-
-            table_ddl = ddl[0]
-            table_name = table_ddl["table_name"]
-
-            # 忽略 quartz 的内容
-            if table_name.lower().startswith("qrtz"):
-                continue
-
-            # 为每个表生成个5个基本部分
-            create = self.gen_create(table_ddl)
-            pk = self.gen_pk(table_name)
-            index = self.gen_index(table_ddl)
-            comment = self.gen_comment(table_sql, table_name)
-            inserts = self.gen_insert(table_name)
-
-            # 组合当前表的DDL脚本
-            script = f"""{create}
-
-{pk}
-
-{index}
-
-{comment}
-
-{inserts}
-"""
-
-            # 清理
-            script = re.sub("\n{3,}", "\n\n", script).strip() + "\n"
-
-            print(script)
-
-        # 将parse失败的脚本打印出来
-        if error_scripts:
-            for script in error_scripts:
-                print(script)
-
-
-class PostgreSQLConvertor(Convertor):
-    def __init__(self, src):
-        super().__init__(src, "PostgreSQL")
-
-    def translate_type(self, type: str, size: Optional[Union[int, Tuple[int]]]):
-        """类型转换"""
-
-        type = type.lower()
-
-        if type == "varchar":
-            return f"varchar({size})"
-        if type == "int":
-            return "int4"
-        if type == "bigint" or type == "bigint unsigned":
-            return "int8"
-        if type == "datetime":
-            return "timestamp"
-        if type == "bit":
-            return "bool"
-        if type in ("tinyint", "smallint"):
-            return "int2"
-        if type == "text":
-            return "text"
-        if type in ("blob", "mediumblob"):
-            return "bytea"
-        if type == "decimal":
-            return (
-                f"numeric({','.join(str(s) for s in size)})" if len(size) else "numeric"
-            )
-
-    def gen_create(self, ddl: Dict) -> str:
-        """生成 create"""
-
-        def _generate_column(col):
-            name = col["name"].lower()
-            if name == "deleted":
-                return "deleted int2 NOT NULL DEFAULT 0"
-
-            type = col["type"].lower()
-            full_type = self.translate_type(type, col["size"])
-            nullable = "NULL" if col["nullable"] else "NOT NULL"
-            default = f"DEFAULT {col['default']}" if col["default"] is not None else ""
-            return f"{name} {full_type} {nullable} {default}"
-
-        table_name = ddl["table_name"].lower()
-        columns = [f"{_generate_column(col).strip()}" for col in ddl["columns"]]
-        filed_def_list = ",\n  ".join(columns)
-        script = f"""-- ----------------------------
--- Table structure for {table_name}
--- ----------------------------
-DROP TABLE IF EXISTS {table_name};
-CREATE TABLE {table_name} (
-    {filed_def_list}
-);"""
-
-        return script
-
-    def gen_index(self, ddl: Dict) -> str:
-        return "\n".join(f"{script};" for script in self.index(ddl))
-
-    def gen_comment(self, table_sql: str, table_name: str) -> str:
-        """生成字段及表的注释"""
-
-        script = ""
-        for field, comment_string in self.filed_comments(table_sql):
-            script += (
-                f"COMMENT ON COLUMN {table_name}.{field} IS '{comment_string}';" + "\n"
-            )
-
-        table_comment = self.table_comment(table_sql)
-        if table_comment:
-            script += f"COMMENT ON TABLE {table_name} IS '{table_comment}';\n"
-
-        return script
-
-    def gen_pk(self, table_name) -> str:
-        """生成主键定义"""
-        return f"ALTER TABLE {table_name} ADD CONSTRAINT pk_{table_name} PRIMARY KEY (id);\n"
-
-    def gen_insert(self, table_name: str) -> str:
-        """生成 insert 语句，以及根据最后的 insert id+1 生成 Sequence"""
-
-        inserts = list(Convertor.inserts(table_name, self.content))
-        ## 生成 insert 脚本
-        script = ""
-        last_id = 0
-        if inserts:
-            inserts_lines = "\n".join(inserts)
-            script += f"""\n\n-- ----------------------------
--- Records of {table_name.lower()}
--- ----------------------------
--- @formatter:off
-BEGIN;
-{inserts_lines}
-COMMIT;
--- @formatter:on"""
-            match = re.search(r"VALUES \((\d+),", inserts[-1])
-            if match:
-                last_id = int(match.group(1))
-
-        # 生成 Sequence
-        script += (
-            "\n\n"
-            + f"""DROP SEQUENCE IF EXISTS {table_name}_seq;
-CREATE SEQUENCE {table_name}_seq
-    START {last_id + 1};"""
-        )
-
-        return script
-
-    def gen_dual(self) -> str:
-        return """DROP TABLE IF EXISTS dual;
-CREATE TABLE dual
-(
-    id int2
-);
-
-COMMENT ON TABLE dual IS '数据库连接的表';
-
--- ----------------------------
--- Records of dual
--- ----------------------------
--- @formatter:off
-INSERT INTO dual VALUES (1);
--- @formatter:on"""
-
-
-class OracleConvertor(Convertor):
-    def __init__(self, src):
-        super().__init__(src, "Oracle")
-
-    def translate_type(self, type: str, size: Optional[Union[int, Tuple[int]]]):
-        """类型转换"""
-        type = type.lower()
-
-        if type == "varchar":
-            return f"varchar2({size if size < 4000 else 4000})"
-        if type == "int":
-            return "number"
-        if type == "bigint" or type == "bigint unsigned":
-            return "number"
-        if type == "datetime":
-            return "date"
-        if type == "bit":
-            return "number(1,0)"
-        if type in ("tinyint", "smallint"):
-            return "smallint"
-        if type == "text":
-            return "clob"
-        if type in ("blob", "mediumblob"):
-            return "blob"
-        if type == "decimal":
-            return (
-                f"number({','.join(str(s) for s in size)})" if len(size) else "number"
-            )
-
-    def gen_create(self, ddl) -> str:
-        """生成 CREATE 语句"""
-
-        def generate_column(col):
-            name = col["name"].lower()
-            if name == "deleted":
-                return "deleted number(1,0) DEFAULT 0 NOT NULL"
-
-            type = col["type"].lower()
-            full_type = self.translate_type(type, col["size"])
-            nullable = "NULL" if col["nullable"] else "NOT NULL"
-            default = f"DEFAULT {col['default']}" if col["default"] is not None else ""
-            # Oracle 中 size 不能作为字段名
-            field_name = '"size"' if name == "size" else name
-            # Oracle DEFAULT 定义在 NULLABLE 之前
-            return f"{field_name} {full_type} {default} {nullable}"
-
-        table_name = ddl["table_name"].lower()
-        columns = [f"{generate_column(col).strip()}" for col in ddl["columns"]]
-        field_def_list = ",\n    ".join(columns)
-        script = f"""-- ----------------------------
--- Table structure for {table_name}
--- ----------------------------
-CREATE TABLE {table_name} (
-    {field_def_list}
-);"""
-
-        # oracle INSERT '' 不能通过 NOT NULL 校验
-        script = script.replace("DEFAULT '' NOT NULL", "DEFAULT '' NULL")
-
-        return script
-
-    def gen_index(self, ddl: Dict) -> str:
-        return "\n".join(f"{script};" for script in self.index(ddl))
-
-    def gen_comment(self, table_sql: str, table_name: str) -> str:
-        script = ""
-        for field, comment_string in self.filed_comments(table_sql):
-            script += (
-                f"COMMENT ON COLUMN {table_name}.{field} IS '{comment_string}';" + "\n"
-            )
-
-        table_comment = self.table_comment(table_sql)
-        if table_comment:
-            script += f"COMMENT ON TABLE {table_name} IS '{table_comment}';\n"
-
-        return script
-
-    def gen_pk(self, table_name: str) -> str:
-        """生成主键定义"""
-        return f"ALTER TABLE {table_name} ADD CONSTRAINT pk_{table_name} PRIMARY KEY (id);\n"
-
-    def gen_index(self, ddl: Dict) -> str:
-        return "\n".join(f"{script};" for script in self.index(ddl))
-
-    def gen_insert(self, table_name: str) -> str:
-        """拷贝 INSERT 语句"""
-        inserts = []
-        for insert_script in Convertor.inserts(table_name, self.content):
-            # 对日期数据添加 TO_DATE 转换
-            insert_script = re.sub(
-                r"('\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}')",
-                r"to_date(\g<1>, 'SYYYY-MM-DD HH24:MI:SS')",
-                insert_script,
-            )
-            inserts.append(insert_script)
-
-        ## 生成 insert 脚本
-        script = ""
-        last_id = 0
-        if inserts:
-            inserts_lines = "\n".join(inserts)
-            script += f"""\n\n-- ----------------------------
--- Records of {table_name.lower()}
--- ----------------------------
--- @formatter:off
-{inserts_lines}
-COMMIT;
--- @formatter:on"""
-            match = re.search(r"VALUES \((\d+),", inserts[-1])
-            if match:
-                last_id = int(match.group(1))
-
-        # 生成 Sequence
-        script += f"""
-
-CREATE SEQUENCE {table_name}_seq
-    START WITH {last_id + 1};"""
-
-        return script
-
-
-class SQLServerConvertor(Convertor):
-    """_summary_
-
-    Args:
-        Convertor (_type_): _description_
-    """
-
-    def __init__(self, src):
-        super().__init__(src, "Microsoft SQL Server")
-
-    def translate_type(self, type: str, size: Optional[Union[int, Tuple[int]]]):
-        """类型转换"""
-
-        type = type.lower()
-
-        if type == "varchar":
-            return f"nvarchar({size if size < 4000 else 4000})"
-        if type == "int":
-            return "int"
-        if type == "bigint" or type == "bigint unsigned":
-            return "bigint"
-        if type == "datetime":
-            return "datetime2"
-        if type == "bit":
-            return "varchar(1)"
-        if type in ("tinyint", "smallint"):
-            return "tinyint"
-        if type == "text":
-            return "nvarchar(max)"
-        if type in ("blob", "mediumblob"):
-            return "varbinary(max)"
-        if type == "decimal":
-            return (
-                f"numeric({','.join(str(s) for s in size)})" if len(size) else "numeric"
-            )
-
-    def gen_create(self, ddl: Dict) -> str:
-        """生成 create"""
-
-        def _generate_column(col):
-            name = col["name"].lower()
-            if name == "id":
-                return "id bigint NOT NULL PRIMARY KEY IDENTITY"
-            if name == "deleted":
-                return "deleted bit DEFAULT 0 NOT NULL"
-
-            type = col["type"].lower()
-            full_type = self.translate_type(type, col["size"])
-            nullable = "NULL" if col["nullable"] else "NOT NULL"
-            default = f"DEFAULT {col['default']}" if col["default"] is not None else ""
-            return f"{name} {full_type} {default} {nullable}"
-
-        table_name = ddl["table_name"].lower()
-        columns = [f"{_generate_column(col).strip()}" for col in ddl["columns"]]
-        filed_def_list = ",\n    ".join(columns)
-        script = f"""-- ----------------------------
--- Table structure for {table_name}
--- ----------------------------
-DROP TABLE IF EXISTS {table_name}
-GO
-CREATE TABLE {table_name} (
-    {filed_def_list}
-)
-GO"""
-
-        return script
-
-    def gen_comment(self, table_sql: str, table_name: str) -> str:
-        """生成字段及表的注释"""
-
-        script = ""
-
-        for field, comment_string in self.filed_comments(table_sql):
-            script += f"""EXEC sp_addextendedproperty
-    'MS_Description', N'{comment_string}',
-    'SCHEMA', N'dbo',
-    'TABLE', N'{table_name}',
-    'COLUMN', N'{field}'
-GO
-
-"""
-
-        table_comment = self.table_comment(table_sql)
-        if table_comment:
-            script += f"""EXEC sp_addextendedproperty
-    'MS_Description', N'{table_comment}',
-    'SCHEMA', N'dbo',
-    'TABLE', N'{table_name}'
-GO
-
-"""
-        return script
-
-    def gen_pk(self, table_name: str) -> str:
-        """生成主键定义"""
-        return ""
-
-    def gen_index(self, ddl: Dict) -> str:
-        """生成 index"""
-        return "\n".join(f"{script}\nGO" for script in self.index(ddl))
-
-    def gen_insert(self, table_name: str) -> str:
-        """生成 insert 语句"""
-
-        # 收集 `table_name` 对应的 insert 语句
-        inserts = []
-        for insert_script in Convertor.inserts(table_name, self.content):
-            # SQLServer: 字符串前加N，hack，是否存在替换字符串内容的风险
-            insert_script = insert_script.replace(", '", ", N'").replace(
-                "VALUES ('", "VALUES (N')"
-            )
-            # 删除 insert 的结尾分号
-            insert_script = re.sub(";$", r"\nGO", insert_script)
-            inserts.append(insert_script)
-
-        ## 生成 insert 脚本
-        script = ""
-        if inserts:
-            inserts_lines = "\n".join(inserts)
-            script += f"""\n\n-- ----------------------------
--- Records of {table_name.lower()}
--- ----------------------------
--- @formatter:off
-BEGIN TRANSACTION
-GO
-SET IDENTITY_INSERT {table_name.lower()} ON
-GO
-{inserts_lines}
-SET IDENTITY_INSERT {table_name.lower()} OFF
-GO
-COMMIT
-GO
--- @formatter:on"""
-
-        return script
-
-    def gen_dual(self) -> str:
-        return """DROP TABLE IF EXISTS dual
-GO
-CREATE TABLE dual
-(
-  id int
-)
-GO
-
-EXEC sp_addextendedproperty
-    'MS_Description', N'数据库连接的表',
-    'SCHEMA', N'dbo',
-    'TABLE', N'dual'
-GO
-
--- ----------------------------
--- Records of dual
--- ----------------------------
--- @formatter:off
-INSERT INTO dual VALUES (1)
-GO
--- @formatter:on"""
-
-
-class DM8Convertor(Convertor):
-    def __init__(self, src):
-        super().__init__(src, "DM8")
-
-    def translate_type(self, type: str, size: Optional[Union[int, Tuple[int]]]):
-        """类型转换"""
-        type = type.lower()
-
-        if type == "varchar":
-            return f"varchar({size})"
-        if type == "int":
-            return "int"
-        if type == "bigint" or type == "bigint unsigned":
-            return "bigint"
-        if type == "datetime":
-            return "datetime"
-        if type == "bit":
-            return "bit"
-        if type in ("tinyint", "smallint"):
-            return "smallint"
-        if type == "text":
-            return "text"
-        if type == "blob":
-            return "blob"
-        if type == "mediumblob":
-            return "varchar(10240)"
-        if type == "decimal":
-            return (
-                f"decimal({','.join(str(s) for s in size)})" if len(size) else "decimal"
-            )
-
-    def gen_create(self, ddl) -> str:
-        """生成 CREATE 语句"""
-
-        def generate_column(col):
-            name = col["name"].lower()
-            if name == "id":
-                return "id bigint NOT NULL PRIMARY KEY IDENTITY"
-
-            type = col["type"].lower()
-            full_type = self.translate_type(type, col["size"])
-            nullable = "NULL" if col["nullable"] else "NOT NULL"
-            default = f"DEFAULT {col['default']}" if col["default"] is not None else ""
-            return f"{name} {full_type} {default} {nullable}"
-
-        table_name = ddl["table_name"].lower()
-        columns = [f"{generate_column(col).strip()}" for col in ddl["columns"]]
-        field_def_list = ",\n    ".join(columns)
-        script = f"""-- ----------------------------
--- Table structure for {table_name}
--- ----------------------------
-CREATE TABLE {table_name} (
-    {field_def_list}
-);"""
-
-        # oracle INSERT '' 不能通过 NOT NULL 校验
-        script = script.replace("DEFAULT '' NOT NULL", "DEFAULT '' NULL")
-
-        return script
-
-    def gen_index(self, ddl: Dict) -> str:
-        return "\n".join(f"{script};" for script in self.index(ddl))
-
-    def gen_comment(self, table_sql: str, table_name: str) -> str:
-        script = ""
-        for field, comment_string in self.filed_comments(table_sql):
-            script += (
-                f"COMMENT ON COLUMN {table_name}.{field} IS '{comment_string}';" + "\n"
-            )
-
-        table_comment = self.table_comment(table_sql)
-        if table_comment:
-            script += f"COMMENT ON TABLE {table_name} IS '{table_comment}';\n"
-
-        return script
-
-    def gen_pk(self, table_name: str) -> str:
-        """生成主键定义"""
-        return ""
-
-    def gen_index(self, ddl: Dict) -> str:
-        return "\n".join(f"{script};" for script in self.index(ddl))
-
-    def gen_insert(self, table_name: str) -> str:
-        """拷贝 INSERT 语句"""
-        inserts = list(Convertor.inserts(table_name, self.content))
-
-        ## 生成 insert 脚本
-        script = ""
-        if inserts:
-            inserts_lines = "\n".join(inserts)
-            script += f"""\n\n-- ----------------------------
--- Records of {table_name.lower()}
--- ----------------------------
--- @formatter:off
-SET IDENTITY_INSERT {table_name.lower()} ON;
-{inserts_lines}
-COMMIT;
-SET IDENTITY_INSERT {table_name.lower()} OFF;
--- @formatter:on"""
-
-        return script
-
-
-class KingbaseConvertor(PostgreSQLConvertor):
-    def __init__(self, src):
-        super().__init__(src)
-        self.db_type = "Kingbase"
-
-    def gen_create(self, ddl: Dict) -> str:
-        """生成 create"""
-
-        def _generate_column(col):
-            name = col["name"].lower()
-            if name == "deleted":
-                return "deleted int2 NOT NULL DEFAULT 0"
-
-            type = col["type"].lower()
-            full_type = self.translate_type(type, col["size"])
-            nullable = "NULL" if col["nullable"] else "NOT NULL"
-            default = f"DEFAULT {col['default']}" if col["default"] is not None else ""
-            return f"{name} {full_type} {nullable} {default}"
-
-        table_name = ddl["table_name"].lower()
-        columns = [f"{_generate_column(col).strip()}" for col in ddl["columns"]]
-        filed_def_list = ",\n  ".join(columns)
-        script = f"""-- ----------------------------
--- Table structure for {table_name}
--- ----------------------------
-DROP TABLE IF EXISTS {table_name};
-CREATE TABLE {table_name} (
-    {filed_def_list}
-);"""
-
-        # Kingbase INSERT '' 不能通过 NOT NULL 校验
-        script = script.replace("NOT NULL DEFAULT ''", "NULL DEFAULT ''")
-
-        return script
-
-
-class OpengaussConvertor(KingbaseConvertor):
-    def __init__(self, src):
-        super().__init__(src)
-        self.db_type = "OpenGauss"
-
-
-def main():
-    parser = argparse.ArgumentParser(description="芋道系统数据库转换工具")
-    parser.add_argument(
-        "type",
-        type=str,
-        help="目标数据库类型",
-        choices=["postgres", "oracle", "sqlserver", "dm8", "kingbase", "opengauss"],
-    )
-    args = parser.parse_args()
-
-    sql_file = pathlib.Path("../mysql/ruoyi-vue-pro.sql").resolve().as_posix()
-    convertor = None
-    if args.type == "postgres":
-        convertor = PostgreSQLConvertor(sql_file)
-    elif args.type == "oracle":
-        convertor = OracleConvertor(sql_file)
-    elif args.type == "sqlserver":
-        convertor = SQLServerConvertor(sql_file)
-    elif args.type == "dm8":
-        convertor = DM8Convertor(sql_file)
-    elif args.type == "kingbase":
-        convertor = KingbaseConvertor(sql_file)
-    elif args.type == "opengauss":
-        convertor = OpengaussConvertor(sql_file)
-    else:
-        raise NotImplementedError(f"不支持目标数据库类型: {args.type}")
-
-    convertor.print()
-
-
-if __name__ == "__main__":
-    main()

sql/tools/docker-compose.yaml

@@ -1,134 +0,0 @@
-name: ruoyi-vue-pro
-
-volumes:
-    mysql: { }
-    postgres: { }
-    sqlserver: { }
-    dm8: { }
-    kingbase: { }
-    opengauss: { }
-
-services:
-    mysql:
-        image: mysql:8.0.33
-        restart: unless-stopped
-        environment:
-            TZ: Asia/Shanghai
-            MYSQL_ROOT_PASSWORD: 123456
-            MYSQL_DATABASE: ruoyi-vue-pro
-        ports:
-            - "3306:3306"
-        volumes:
-            - mysql:/var/lib/mysql/
-            # 注入初始化脚本
-            - ./mysql/ruoyi-vue-pro.sql:/docker-entrypoint-initdb.d/init.sql:ro
-        command:
-            --default-authentication-plugin=mysql_native_password
-            --character-set-server=utf8mb4
-            --collation-server=utf8mb4_general_ci
-            --explicit_defaults_for_timestamp=true
-            --lower_case_table_names=1
-
-    postgres:
-        image: postgres:14.2
-        restart: unless-stopped
-        environment:
-            POSTGRES_USER: root
-            POSTGRES_PASSWORD: 123456
-            POSTGRES_DB: ruoyi-vue-pro
-        ports:
-            - "5432:5432"
-        volumes:
-            - postgres:/var/lib/postgresql/data
-            # 注入初始化脚本
-            - ../postgresql/quartz.sql:/docker-entrypoint-initdb.d/quartz.sql:ro
-            - ../postgresql/ruoyi-vue-pro.sql:/docker-entrypoint-initdb.d/ruoyi-vue-pro.sql:ro
-
-    oracle:
-        image: gvenzl/oracle-xe:18-slim-faststart
-        restart: unless-stopped
-        environment:
-            ## 登录信息 SID: XE user: system password: oracle
-            ORACLE_PASSWORD: oracle
-        ports:
-            - "1521:1521"
-        volumes:
-            - ../oracle/ruoyi-vue-pro.sql:/tmp/schema.sql:ro
-            # 创建app用户: ROOT/123456@//localhost/XEPDB1
-            - ./oracle/1_create_user.sql:/docker-entrypoint-initdb.d/1_create_user.sql:ro
-            - ./oracle/2_create_schema.sh:/docker-entrypoint-initdb.d/2_create_schema.sh:ro
-
-    oracle_m1:
-      image: einslib/oracle-19c:19.3.0-ee-slim-faststart
-      restart: unless-stopped
-      environment:
-        ## 登录信息 SID: FREE user: system password: oracle
-        ORACLE_PASSWORD: oracle
-      ports:
-        - "1521:1521"
-      volumes:
-        - ../oracle/ruoyi-vue-pro.sql:/tmp/schema.sql:ro
-        # 创建app用户: ROOT/123456@//localhost/XEPDB1
-        - ./oracle/1_create_user.sql:/docker-entrypoint-initdb.d/1_create_user.sql:ro
-        - ./oracle/2_create_schema.sh:/docker-entrypoint-initdb.d/2_create_schema.sh:ro
-
-    sqlserver:
-        image: mcr.microsoft.com/mssql/server:2017-latest
-        restart: unless-stopped
-        environment:
-            TZ: Asia/Shanghai
-            ACCEPT_EULA: "Y"
-            SA_PASSWORD: "Yudao@2024"
-        ports:
-            - "1433:1433"
-        volumes:
-            - sqlserver:/var/opt/mssql
-            - ../sqlserver/ruoyi-vue-pro.sql:/tmp/schema.sql:ro
-            # docker compose exec sqlserver bash /tmp/create_schema.sh
-            - ./sqlserver/create_schema.sh:/tmp/create_schema.sh:ro
-
-    dm8:
-        # docker load -i dm8_20240715_x86_rh6_rq_single.tar
-        image: dm8_single:dm8_20240715_rev232765_x86_rh6_64
-        restart: unless-stopped
-        environment:
-            PAGE_SIZE: 16
-            LD_LIBRARY_PATH: /opt/dmdbms/bin
-            EXTENT_SIZE: 32
-            BLANK_PAD_MODE: 1
-            LOG_SIZE: 1024
-            UNICODE_FLAG: 1
-            LENGTH_IN_CHAR: 1
-            INSTANCE_NAME: dm8_test
-        ports:
-            - "5236:5236"
-        volumes:
-            - dm8:/opt/dmdbms/data
-            - ../dm/ruoyi-vue-pro-dm8.sql:/tmp/schema.sql:ro
-
-    kingbase:
-        image: kingbase_v009r001c001b0025_single_x86:v1
-#        image: kingbase_v009r001c001b0025_single_arm:v1
-        restart: unless-stopped
-        environment:
-            DB_USER: root
-            DB_PASSWORD: 123456
-        ports:
-            - "54321:54321"
-        volumes:
-            - kingbase:/home/kingbase/userdata
-            - ../kingbase/ruoyi-vue-pro.sql:/tmp/schema.sql:ro
-
-    opengauss:
-        image: opengauss/opengauss:5.0.0
-        restart: unless-stopped
-        environment:
-            GS_USERNAME: root
-            GS_PASSWORD: Yudao@2024
-            LD_LIBRARY_PATH: /usr/local/opengauss/lib:/usr/lib
-        ports:
-            - "5432:5432"
-        volumes:
-            - opengauss:/var/lib/opengauss
-            - ../opengauss/ruoyi-vue-pro.sql:/tmp/schema.sql:ro
-            # docker compose exec opengauss bash -c '/usr/local/opengauss/bin/gsql -U $GS_USERNAME -W $GS_PASSWORD -d postgres -f /tmp/schema.sql'

sql/tools/oracle/1_create_user.sql

@@ -1,3 +0,0 @@
-ALTER SESSION SET CONTAINER=XEPDB1;
-CREATE USER ROOT IDENTIFIED BY 123456 QUOTA UNLIMITED ON USERS;
-GRANT CONNECT, RESOURCE TO ROOT;

sql/tools/oracle/2_create_schema.sh

@@ -1 +0,0 @@
-sqlplus -s ROOT/123456@//localhost/XEPDB1 @/tmp/schema.sql

sql/tools/sqlserver/create_schema.sh

@@ -1,5 +0,0 @@
-#!/usr/bin/env bash
-
-/opt/mssql-tools/bin/sqlcmd -S localhost -U sa -P ${SA_PASSWORD} -Q "CREATE DATABASE [ruoyi-vue-pro];
-GO"
-/opt/mssql-tools/bin/sqlcmd -S localhost -U sa -P ${SA_PASSWORD} -d 'ruoyi-vue-pro' -i /tmp/schema.sql

tashow-dependencies/pom.xml

@@ -34,6 +34,8 @@
         <rocketmq-spring.version>2.3.1</rocketmq-spring.version>
         <!-- RPC 相关 -->
         <!-- Config 配置中心相关 -->
+        <springdoc.version>2.7.0</springdoc.version>
+        <knife4j.version>4.6.0</knife4j.version>
         <!-- Job 定时任务相关 -->
         <xxl-job.version>2.4.0</xxl-job.version>
         <!-- 服务保障相关 -->
@@ -150,12 +152,27 @@
                 <artifactId>tashow-data-permission</artifactId>
                 <version>${revision}</version>
             </dependency>
+            <dependency>
+                <groupId>com.tashow.cloud</groupId>
+                <artifactId>tashow-sdk-file</artifactId>
+                <version>${revision}</version>
+            </dependency>
 
             <dependency>
                 <groupId>com.tashow.cloud</groupId>
                 <artifactId>tashow-trade-api</artifactId>
                 <version>${revision}</version>
             </dependency>
+            <dependency>
+                <groupId>com.tashow.cloud</groupId>
+                <artifactId>tashow-module-file</artifactId>
+                <version>${revision}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.tashow.cloud</groupId>
+                <artifactId>tashow-file-api</artifactId>
+                <version>${revision}</version>
+            </dependency>
             <dependency>
                 <groupId>com.tashow.cloud</groupId>
                 <artifactId>tashow-module-trade</artifactId>
@@ -173,7 +190,7 @@
             </dependency>
             <dependency>
                 <groupId>com.tashow.cloud</groupId>
-                <artifactId>tashow-member-api</artifactId>
+                <artifactId>tashow-user-api</artifactId>
                 <version>${revision}</version>
             </dependency>
             <dependency>
@@ -186,6 +203,11 @@
                 <artifactId>tashow-sdk-payment</artifactId>
                 <version>${revision}</version>
             </dependency>
+            <dependency>
+                <groupId>com.tashow.cloud</groupId>
+                <artifactId>tashow-product-api</artifactId>
+                <version>${revision}</version>
+            </dependency>
 
             <!-- Spring 核心 -->
             <dependency>
@@ -433,6 +455,22 @@
                 <version>${spring-boot-admin.version}</version>
             </dependency>
 
+
+            <dependency>
+                <groupId>com.github.xingfudeshi</groupId> <!-- TODO 芋艿：https://github.com/xiaoymin/knife4j/issues/874 -->
+                <artifactId>knife4j-openapi3-jakarta-spring-boot-starter</artifactId>
+                <version>${knife4j.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.springdoc</groupId>
+                <artifactId>springdoc-openapi-starter-webmvc-api</artifactId>
+                <version>${springdoc.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.github.xiaoymin</groupId> <!-- 接口文档 UI：knife4j【网关专属】 -->
+                <artifactId>knife4j-gateway-spring-boot-starter</artifactId>
+                <version>4.5.0</version> <!-- TODO 芋艿：等 4.5.0 => 4.6.0 -->
+            </dependency>
             <!-- Test 测试相关 -->
             <dependency>
                 <groupId>org.mockito</groupId>

tashow-feign/pom.xml

@@ -16,7 +16,8 @@
         <module>tashow-product-api</module>
         <module>tashow-trade-api</module>
         <module>tashow-pay-api</module>
-        <module>tashow-member-api</module>
+        <module>tashow-user-api</module>
+        <module>tashow-file-api</module>
     </modules>
 
 </project>

tashow-feign/tashow-file-api/pom.xml

@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>com.tashow.cloud</groupId>
+        <artifactId>tashow-feign</artifactId>
+        <version>${revision}</version>
+    </parent>
+    <artifactId>tashow-file-api</artifactId>
+    <packaging>jar</packaging>
+
+    <name>${project.artifactId}</name>
+    <description>
+        infra 模块 API，暴露给其它模块调用
+    </description>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.tashow.cloud</groupId>
+            <artifactId>tashow-common</artifactId>
+        </dependency>
+
+        <!-- 参数校验 -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-validation</artifactId>
+            <optional>true</optional>
+        </dependency>
+
+        <!-- RPC 远程调用相关 -->
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-openfeign</artifactId>
+            <optional>true</optional>
+        </dependency>
+    </dependencies>
+
+</project>

tashow-feign/tashow-file-api/src/main/java/com/tashow/cloud/fileapi/api/config/ConfigApi.java

@@ -0,0 +1,18 @@
+package com.tashow.cloud.fileapi.api.config;
+
+import com.tashow.cloud.common.pojo.CommonResult;
+import com.tashow.cloud.fileapi.enums.ApiConstants;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+@FeignClient(name = ApiConstants.NAME) // TODO 芋艿：fallbackFactory =
+/** RPC 服务 - 参数配置 */
+public interface ConfigApi {
+
+  String PREFIX = ApiConstants.PREFIX + "/config";
+
+  /** 根据参数键查询参数值 */
+  @GetMapping(PREFIX + "/get-value-by-key")
+  CommonResult<String> getConfigValueByKey(@RequestParam("key") String key);
+}

tashow-feign/tashow-file-api/src/main/java/com/tashow/cloud/fileapi/api/file/FileApi.java

@@ -0,0 +1,62 @@
+package com.tashow.cloud.fileapi.api.file;
+
+import com.tashow.cloud.common.pojo.CommonResult;
+import com.tashow.cloud.fileapi.api.file.dto.FileCreateReqDTO;
+import com.tashow.cloud.fileapi.enums.ApiConstants;
+import jakarta.validation.Valid;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+
+/**
+ * RPC 服务 - 文件
+ */
+@FeignClient(name = ApiConstants.NAME) // TODO 芋艿：fallbackFactory =
+public interface FileApi {
+
+    String PREFIX = ApiConstants.PREFIX + "/file";
+
+    /**
+     * 保存文件，并返回文件的访问路径
+     *
+     * @param content 文件内容
+     * @return 文件路径
+     */
+    default String createFile(byte[] content) {
+        return createFile(null, null, content);
+    }
+
+    /**
+     * 保存文件，并返回文件的访问路径
+     *
+     * @param path    文件路径
+     * @param content 文件内容
+     * @return 文件路径
+     */
+    default String createFile(String path, byte[] content) {
+        return createFile(null, path, content);
+    }
+
+    /**
+     * 保存文件，并返回文件的访问路径
+     *
+     * @param name    原文件名称
+     * @param path    文件路径
+     * @param content 文件内容
+     * @return 文件路径
+     */
+    default String createFile(
+            @RequestParam("name") String name,
+            @RequestParam("path") String path,
+            @RequestParam("content") byte[] content) {
+        return createFile(new FileCreateReqDTO().setName(name).setPath(path).setContent(content))
+                .getCheckedData();
+    }
+
+    /**
+     * 保存文件，并返回文件的访问路径
+     */
+    @PostMapping(PREFIX + "/create")
+    CommonResult<String> createFile(@Valid @RequestBody FileCreateReqDTO createReqDTO);
+}

tashow-feign/tashow-file-api/src/main/java/com/tashow/cloud/fileapi/api/file/dto/FileCreateReqDTO.java

@@ -0,0 +1,21 @@
+package com.tashow.cloud.fileapi.api.file.dto;
+
+import jakarta.validation.constraints.NotEmpty;
+import lombok.Data;
+
+/** RPC 服务 - 文件创建 Request DTO */
+@Data
+public class FileCreateReqDTO {
+
+  /** 原文件名称 */
+  private String name;
+
+  /** 文件路径 */
+  private String path;
+
+  /**
+     * 文件内容  
+     */
+  @NotEmpty(message = "文件内容不能为空")
+  private byte[] content;
+}

tashow-feign/tashow-file-api/src/main/java/com/tashow/cloud/fileapi/api/package-info.java

@@ -0,0 +1,4 @@
+/**
+ * infra API 包，定义暴露给其它模块的 API
+ */
+package com.tashow.cloud.fileapi.api;

tashow-feign/tashow-file-api/src/main/java/com/tashow/cloud/fileapi/enums/ApiConstants.java

@@ -1,4 +1,4 @@
-package com.tashow.cloud.memberapi.enums;
+package com.tashow.cloud.fileapi.enums;
 
 
 import com.tashow.cloud.common.enums.RpcConstants;
@@ -15,9 +15,9 @@ public class ApiConstants {
      *
      * 注意，需要保证和 spring.application.name 保持一致
      */
-    public static final String NAME = "member-server";
+    public static final String NAME = "file-server";
 
-    public static final String PREFIX = RpcConstants.RPC_API_PREFIX + "/member";
+    public static final String PREFIX = RpcConstants.RPC_API_PREFIX + "/file";
 
     public static final String VERSION = "1.0.0";
 

tashow-feign/tashow-file-api/src/main/java/com/tashow/cloud/fileapi/enums/ErrorCodeConstants.java

@@ -0,0 +1,72 @@
+package com.tashow.cloud.fileapi.enums;
+
+
+import com.tashow.cloud.common.exception.ErrorCode;
+
+/**
+ * Infra 错误码枚举类
+ *
+ * infra 系统，使用 1-001-000-000 段
+ */
+public interface ErrorCodeConstants {
+
+    // ========== 参数配置 1-001-000-000 ==========
+    ErrorCode CONFIG_NOT_EXISTS = new ErrorCode(1_001_000_001, "参数配置不存在");
+    ErrorCode CONFIG_KEY_DUPLICATE = new ErrorCode(1_001_000_002, "参数配置 key 重复");
+    ErrorCode CONFIG_CAN_NOT_DELETE_SYSTEM_TYPE = new ErrorCode(1_001_000_003, "不能删除类型为系统内置的参数配置");
+    ErrorCode CONFIG_GET_VALUE_ERROR_IF_VISIBLE = new ErrorCode(1_001_000_004, "获取参数配置失败，原因：不允许获取不可见配置");
+
+    // ========== 定时任务 1-001-001-000 ==========
+    ErrorCode JOB_NOT_EXISTS = new ErrorCode(1_001_001_000, "定时任务不存在");
+    ErrorCode JOB_HANDLER_EXISTS = new ErrorCode(1_001_001_001, "定时任务的处理器已经存在");
+    ErrorCode JOB_CHANGE_STATUS_INVALID = new ErrorCode(1_001_001_002, "只允许修改为开启或者关闭状态");
+    ErrorCode JOB_CHANGE_STATUS_EQUALS = new ErrorCode(1_001_001_003, "定时任务已经处于该状态，无需修改");
+    ErrorCode JOB_UPDATE_ONLY_NORMAL_STATUS = new ErrorCode(1_001_001_004, "只有开启状态的任务，才可以修改");
+    ErrorCode JOB_CRON_EXPRESSION_VALID = new ErrorCode(1_001_001_005, "CRON 表达式不正确");
+    ErrorCode JOB_HANDLER_BEAN_NOT_EXISTS = new ErrorCode(1_001_001_006, "定时任务的处理器 Bean 不存在，注意 Bean 默认首字母小写");
+    ErrorCode JOB_HANDLER_BEAN_TYPE_ERROR = new ErrorCode(1_001_001_007, "定时任务的处理器 Bean 类型不正确，未实现 JobHandler 接口");
+
+    // ========== API 错误日志 1-001-002-000 ==========
+    ErrorCode API_ERROR_LOG_NOT_FOUND = new ErrorCode(1_001_002_000, "API 错误日志不存在");
+    ErrorCode API_ERROR_LOG_PROCESSED = new ErrorCode(1_001_002_001, "API 错误日志已处理");
+
+    // ========= 文件相关 1-001-003-000 =================
+    ErrorCode FILE_PATH_EXISTS = new ErrorCode(1_001_003_000, "文件路径已存在");
+    ErrorCode FILE_NOT_EXISTS = new ErrorCode(1_001_003_001, "文件不存在");
+    ErrorCode FILE_IS_EMPTY = new ErrorCode(1_001_003_002, "文件为空");
+
+    // ========== 代码生成器 1-001-004-000 ==========
+    ErrorCode CODEGEN_TABLE_EXISTS = new ErrorCode(1_001_004_002, "表定义已经存在");
+    ErrorCode CODEGEN_IMPORT_TABLE_NULL = new ErrorCode(1_001_004_001, "导入的表不存在");
+    ErrorCode CODEGEN_IMPORT_COLUMNS_NULL = new ErrorCode(1_001_004_002, "导入的字段不存在");
+    ErrorCode CODEGEN_TABLE_NOT_EXISTS = new ErrorCode(1_001_004_004, "表定义不存在");
+    ErrorCode CODEGEN_COLUMN_NOT_EXISTS = new ErrorCode(1_001_004_005, "字段义不存在");
+    ErrorCode CODEGEN_SYNC_COLUMNS_NULL = new ErrorCode(1_001_004_006, "同步的字段不存在");
+    ErrorCode CODEGEN_SYNC_NONE_CHANGE = new ErrorCode(1_001_004_007, "同步失败，不存在改变");
+    ErrorCode CODEGEN_TABLE_INFO_TABLE_COMMENT_IS_NULL = new ErrorCode(1_001_004_008, "数据库的表注释未填写");
+    ErrorCode CODEGEN_TABLE_INFO_COLUMN_COMMENT_IS_NULL = new ErrorCode(1_001_004_009, "数据库的表字段({})注释未填写");
+    ErrorCode CODEGEN_MASTER_TABLE_NOT_EXISTS = new ErrorCode(1_001_004_010, "主表(id={})定义不存在，请检查");
+    ErrorCode CODEGEN_SUB_COLUMN_NOT_EXISTS = new ErrorCode(1_001_004_011, "子表的字段(id={})不存在，请检查");
+    ErrorCode CODEGEN_MASTER_GENERATION_FAIL_NO_SUB_TABLE = new ErrorCode(1_001_004_012, "主表生成代码失败，原因：它没有子表");
+
+    // ========== 文件配置 1-001-006-000 ==========
+    ErrorCode FILE_CONFIG_NOT_EXISTS = new ErrorCode(1_001_006_000, "文件配置不存在");
+    ErrorCode FILE_CONFIG_DELETE_FAIL_MASTER = new ErrorCode(1_001_006_001, "该文件配置不允许删除，原因：它是主配置，删除会导致无法上传文件");
+
+    // ========== 数据源配置 1-001-007-000 ==========
+    ErrorCode DATA_SOURCE_CONFIG_NOT_EXISTS = new ErrorCode(1_001_007_000, "数据源配置不存在");
+    ErrorCode DATA_SOURCE_CONFIG_NOT_OK = new ErrorCode(1_001_007_001, "数据源配置不正确，无法进行连接");
+
+    // ========== 学生 1-001-201-000 ==========
+    ErrorCode DEMO01_CONTACT_NOT_EXISTS = new ErrorCode(1_001_201_000, "示例联系人不存在");
+    ErrorCode DEMO02_CATEGORY_NOT_EXISTS = new ErrorCode(1_001_201_001, "示例分类不存在");
+    ErrorCode DEMO02_CATEGORY_EXITS_CHILDREN = new ErrorCode(1_001_201_002, "存在存在子示例分类，无法删除");
+    ErrorCode DEMO02_CATEGORY_PARENT_NOT_EXITS = new ErrorCode(1_001_201_003,"父级示例分类不存在");
+    ErrorCode DEMO02_CATEGORY_PARENT_ERROR = new ErrorCode(1_001_201_004, "不能设置自己为父示例分类");
+    ErrorCode DEMO02_CATEGORY_NAME_DUPLICATE = new ErrorCode(1_001_201_005, "已经存在该名字的示例分类");
+    ErrorCode DEMO02_CATEGORY_PARENT_IS_CHILD = new ErrorCode(1_001_201_006, "不能设置自己的子示例分类为父示例分类");
+    ErrorCode DEMO03_STUDENT_NOT_EXISTS = new ErrorCode(1_001_201_007, "学生不存在");
+    ErrorCode DEMO03_GRADE_NOT_EXISTS = new ErrorCode(1_001_201_008, "学生班级不存在");
+    ErrorCode DEMO03_GRADE_EXISTS = new ErrorCode(1_001_201_009, "学生班级已存在");
+
+}

tashow-feign/tashow-infra-api/src/main/java/com/tashow/cloud/infraapi/api/file/FileApi.java

@@ -9,50 +9,54 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
 
+/**
+ * RPC 服务 - 文件
+ */
 @FeignClient(name = ApiConstants.NAME) // TODO 芋艿：fallbackFactory =
-/** RPC 服务 - 文件 */
 public interface FileApi {
 
-  String PREFIX = ApiConstants.PREFIX + "/file";
+    String PREFIX = ApiConstants.PREFIX + "/file";
 
-  /**
+    /**
-   * 保存文件，并返回文件的访问路径
+     * 保存文件，并返回文件的访问路径
-   *
+     *
-   * @param content 文件内容
+     * @param content 文件内容
-   * @return 文件路径
+     * @return 文件路径
-   */
+     */
-  default String createFile(byte[] content) {
+    default String createFile(byte[] content) {
-    return createFile(null, null, content);
+        return createFile(null, null, content);
-  }
+    }
 
-  /**
+    /**
-   * 保存文件，并返回文件的访问路径
+     * 保存文件，并返回文件的访问路径
-   *
+     *
-   * @param path 文件路径
+     * @param path    文件路径
-   * @param content 文件内容
+     * @param content 文件内容
-   * @return 文件路径
+     * @return 文件路径
-   */
+     */
-  default String createFile(String path, byte[] content) {
+    default String createFile(String path, byte[] content) {
-    return createFile(null, path, content);
+        return createFile(null, path, content);
-  }
+    }
 
-  /**
+    /**
-   * 保存文件，并返回文件的访问路径
+     * 保存文件，并返回文件的访问路径
-   *
+     *
-   * @param name 原文件名称
+     * @param name    原文件名称
-   * @param path 文件路径
+     * @param path    文件路径
-   * @param content 文件内容
+     * @param content 文件内容
-   * @return 文件路径
+     * @return 文件路径
-   */
+     */
-  default String createFile(
+    default String createFile(
-      @RequestParam("name") String name,
+            @RequestParam("name") String name,
-      @RequestParam("path") String path,
+            @RequestParam("path") String path,
-      @RequestParam("content") byte[] content) {
+            @RequestParam("content") byte[] content) {
-    return createFile(new FileCreateReqDTO().setName(name).setPath(path).setContent(content))
+        return createFile(new FileCreateReqDTO().setName(name).setPath(path).setContent(content))
-        .getCheckedData();
+                .getCheckedData();
-  }
+    }
 
-  @PostMapping(PREFIX + "/create")
+    /**
-  /** 保存文件，并返回文件的访问路径 */
+     * 保存文件，并返回文件的访问路径
-  CommonResult<String> createFile(@Valid @RequestBody FileCreateReqDTO createReqDTO);
+     */
+    @PostMapping(PREFIX + "/create")
+    CommonResult<String> createFile(@Valid @RequestBody FileCreateReqDTO createReqDTO);
 }

tashow-feign/tashow-member-api/src/main/java/com/tashow/cloud/memberapi/message/package-info.java

@@ -1,4 +0,0 @@
-/**
- * 消息队列的消息
- */
-package com.tashow.cloud.memberapi.message;

tashow-feign/tashow-product-api/pom.xml

@@ -1,85 +1,90 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
+	<modelVersion>4.0.0</modelVersion>
-    <parent>
+	<parent>
-        <groupId>com.tashow.cloud</groupId>
+		<groupId>com.tashow.cloud</groupId>
-        <artifactId>tashow-feign</artifactId>
+		<artifactId>tashow-feign</artifactId>
-        <version>${revision}</version>
+		<version>${revision}</version>
-    </parent>
+	</parent>
-    <artifactId>tashow-product-api</artifactId>
+	<artifactId>tashow-product-api</artifactId>
-    <packaging>jar</packaging>
+	<packaging>jar</packaging>
 
-    <name>${project.artifactId}</name>
+	<name>${project.artifactId}</name>
-    <description>
+	<description>
-        infra 模块 API，暴露给其它模块调用
+		infra 模块 API，暴露给其它模块调用
-    </description>
+	</description>
 
-    <dependencies>
+	<dependencies>
-        <dependency>
+		<dependency>
-            <groupId>com.tashow.cloud</groupId>
+			<groupId>com.tashow.cloud</groupId>
-            <artifactId>tashow-common</artifactId>
+			<artifactId>tashow-common</artifactId>
-        </dependency>
+		</dependency>
 
-        <!-- 参数校验 -->
+		<!-- 参数校验 -->
-        <dependency>
+		<dependency>
-            <groupId>org.springframework.boot</groupId>
+			<groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-validation</artifactId>
+			<artifactId>spring-boot-starter-validation</artifactId>
-            <optional>true</optional>
+			<optional>true</optional>
-        </dependency>
+		</dependency>
 
-        <!-- RPC 远程调用相关 -->
+		<dependency>
-        <dependency>
+			<groupId>jakarta.validation</groupId>
-            <groupId>org.springframework.cloud</groupId>
+			<artifactId>jakarta.validation-api</artifactId>
-            <artifactId>spring-cloud-starter-openfeign</artifactId>
+		</dependency>
-            <optional>true</optional>
-        </dependency>
-        <dependency>
-            <groupId>org.mybatis</groupId>
-            <artifactId>mybatis</artifactId>
-            <version>3.5.13</version> <!-- 推荐使用最新稳定版本 -->
-        </dependency>
-        <!-- 防止进入swagger页面报类型转换错误，排除3.0.0中的引用，手动增加1.6.2版本 -->
-        <dependency>
-            <groupId>io.swagger</groupId>
-            <artifactId>swagger-models</artifactId>
-            <version>1.6.2</version>
-        </dependency>
-        <!-- Swagger Core -->
-        <dependency>
-            <groupId>io.swagger.core.v3</groupId>
-            <artifactId>swagger-core</artifactId>
-            <version>2.2.20</version>
-        </dependency>
 
-        <!-- Swagger Models -->
+		<!-- RPC 远程调用相关 -->
-        <dependency>
+		<dependency>
-            <groupId>io.swagger.core.v3</groupId>
+			<groupId>org.springframework.cloud</groupId>
-            <artifactId>swagger-models</artifactId>
+			<artifactId>spring-cloud-starter-openfeign</artifactId>
-            <version>2.2.20</version>
+			<optional>true</optional>
-        </dependency>
+		</dependency>
-        <!-- EasyExcel 核心库 -->
+		<dependency>
-        <dependency>
+			<groupId>org.mybatis</groupId>
-            <groupId>com.alibaba</groupId>
+			<artifactId>mybatis</artifactId>
-            <artifactId>easyexcel</artifactId>
+			<version>3.5.13</version> <!-- 推荐使用最新稳定版本 -->
-            <version>4.0.3</version>
+		</dependency>
-        </dependency>
+		<!-- 防止进入swagger页面报类型转换错误，排除3.0.0中的引用，手动增加1.6.2版本 -->
-        <dependency>
+		<dependency>
-            <groupId>org.mybatis</groupId>
+			<groupId>io.swagger</groupId>
-            <artifactId>mybatis</artifactId>
+			<artifactId>swagger-models</artifactId>
-            <version>3.5.9</version>
+			<version>1.6.2</version>
-        </dependency>
+		</dependency>
-        <dependency>
+		<!-- Swagger Core -->
-            <groupId>com.baomidou</groupId>
+		<dependency>
-            <artifactId>mybatis-plus-annotation</artifactId>
+			<groupId>io.swagger.core.v3</groupId>
-            <version>3.5.9</version>
+			<artifactId>swagger-core</artifactId>
-            <scope>compile</scope>
+			<version>2.2.20</version>
-        </dependency>
+		</dependency>
-        <dependency>
+
-            <groupId>com.tashow.cloud</groupId>
+		<!-- Swagger Models -->
-            <artifactId>tashow-data-mybatis</artifactId>
+		<dependency>
-        </dependency>
+			<groupId>io.swagger.core.v3</groupId>
-    </dependencies>
+			<artifactId>swagger-models</artifactId>
+			<version>2.2.20</version>
+		</dependency>
+		<!-- EasyExcel 核心库 -->
+		<dependency>
+			<groupId>com.alibaba</groupId>
+			<artifactId>easyexcel</artifactId>
+			<version>4.0.3</version>
+		</dependency>
+		<dependency>
+			<groupId>org.mybatis</groupId>
+			<artifactId>mybatis</artifactId>
+			<version>3.5.9</version>
+		</dependency>
+		<dependency>
+			<groupId>com.baomidou</groupId>
+			<artifactId>mybatis-plus-annotation</artifactId>
+			<version>3.5.9</version>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>com.tashow.cloud</groupId>
+			<artifactId>tashow-data-mybatis</artifactId>
+		</dependency>
+	</dependencies>
 
 </project>

tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/ProdApi.java

@@ -0,0 +1,69 @@
+package com.tashow.cloud.productapi.api.product;
+
+import com.tashow.cloud.common.pojo.CommonResult;
+import com.tashow.cloud.common.pojo.PageResult;
+import com.tashow.cloud.productapi.api.product.dto.ProdDO;
+import com.tashow.cloud.productapi.api.product.vo.prod.ProdListVO;
+import com.tashow.cloud.productapi.api.product.vo.prod.ProdPageReqVO;
+import com.tashow.cloud.productapi.api.product.vo.prod.ProdServiceVO;
+import com.tashow.cloud.productapi.enums.ApiConstants;
+import jakarta.annotation.security.PermitAll;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+@FeignClient(name = ApiConstants.NAME) // TODO 芋艿：fallbackFactory =
+/** RPC 服务 - 参数配置 */
+public interface ProdApi {
+
+    String PREFIX = ApiConstants.PREFIX + "/prod";
+    /**
+     * 获取商品详情
+     *
+     * @param id 商品id
+     * @return 编号
+     */
+
+    @GetMapping(PREFIX + "/getProdInfo")
+    @PermitAll
+    CommonResult<ProdDO> getProdInfo(@RequestParam(value = "id", required = false) Long id);
+
+    /**
+     * 获取商品服务配置
+     *
+     * @param id 商品id
+     * @return 编号
+     */
+    @GetMapping(PREFIX + "/getProdService")
+    ProdServiceVO getProdService(@RequestParam(value = "id", required = false) Long id);
+
+    /**
+     * 获得商品分页
+     *
+     * @param pageReqVO 分页查询
+     * @return 商品分页
+     */
+    @GetMapping(PREFIX + "/getProdPage")
+    PageResult<ProdListVO> getProdPage(ProdPageReqVO pageReqVO);
+
+    /**
+     * 扣减库存
+     * @param skuId 单品ID
+     * @param stocksNum 扣减数量
+     */
+    @PostMapping(PREFIX + "/reduceStocks")
+    CommonResult<Boolean> reduceStocks(@RequestParam(value = "skuId", required = false)Long skuId
+            ,@RequestParam(value = "stocksNum", required = false) Integer stocksNum
+    ) ;
+    /**
+     * 增加库存
+     * @param skuId 单品ID
+     * @param stocksNum 增加数量
+     */
+    @PostMapping(PREFIX + "/increaseStocks")
+    CommonResult<Boolean> increaseStocks(@RequestParam(value = "skuId", required = false)Long skuId
+            ,@RequestParam(value = "stocksNum", required = false) Integer stocksNum);
+
+
+}

tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/ShopDetailApi.java

@@ -0,0 +1,21 @@
+package com.tashow.cloud.productapi.api.product;
+
+import com.tashow.cloud.productapi.api.product.dto.CategoryDO;
+import com.tashow.cloud.productapi.api.product.dto.ShopDetailDO;
+import com.tashow.cloud.productapi.enums.ApiConstants;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.List;
+
+@FeignClient(name = ApiConstants.NAME) // TODO 芋艿：fallbackFactory =
+/** RPC 服务 - 参数配置 */
+public interface ShopDetailApi {
+
+  String PREFIX = ApiConstants.PREFIX + "/shop";
+
+  @GetMapping(PREFIX + "/getShopInfo")
+  ShopDetailDO getShopInfo(@RequestParam(value = "id", required = false) Long id);
+
+}

tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/dto/CategoryDto.java

@@ -12,7 +12,6 @@ import java.util.List;
  * @author 芋道源码
  */
 @Data
-
 public class CategoryDto {
 
     /**

tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/dto/ProdAdditionalFeeDatesDO.java

@@ -43,16 +43,22 @@ public class ProdAdditionalFeeDatesDO extends BaseDO {
      * 日期类型0：'自定义日期范围':1：'指定日期':2：'法定节假日',3：'固定休息日'
      */
     private Integer dateType;
+
     /**
-     * 自定义日期时间段
+     * 类型：1：特殊日期 2：可预约时段黑名单日期 3：紧急相应服务黑名单日期
+     */
+    private Integer type;
+
+    /**
+     * 日期
      */
     @TableField(typeHandler = StringListTypeHandler.class)
     private List<String> customTimeSlots;
-    /**
+/*    *//**
      * 指定日期
-     */
+     *//*
     @TableField(typeHandler = StringListTypeHandler.class)
-    private List<String> specificDates;
+    private List<String> specificDates;*/
     /**
      * 收费方式0：''固定金额'':1：''基准价上浮
      */
@@ -65,5 +71,7 @@ public class ProdAdditionalFeeDatesDO extends BaseDO {
      * 是否启用该规则是否启用该规则0关1开
      */
     private Integer isEnabled;
-
+    public boolean isEmpty() {
+        return id == null ;
+    }
 }

tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/dto/ProdAdditionalFeePeriodsDO.java

@@ -56,5 +56,7 @@ public class ProdAdditionalFeePeriodsDO extends BaseDO {
      * 浮动百分比
      */
     private BigDecimal floatingPercentage;
-
+    public boolean isEmpty() {
+        return id == null ;
+    }
 }

tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/dto/ProdEmergencyResponseDO.java

@@ -39,23 +39,5 @@ public class ProdEmergencyResponseDO extends BaseDO {
      */
     @TableField(typeHandler = StringListTypeHandler.class)
     private List<String> responseTimeSlots;
-    /**
-     * 黑名自定义日期
-     */
-    @TableField(typeHandler = StringListTypeHandler.class)
-    private List<String> blacklistedDates;
-    /**
-     * 黑名单指定日期
-     */
-    @TableField(typeHandler = StringListTypeHandler.class)
-    private List<String> blackAppointDates;
-    /**
-     * 法定节假日是否开启0:关闭1开启
-     */
-    private Integer blackHappy;
-    /**
-     * 固定休息日周末是否开启0关闭1开启
-     */
-    private Integer blackWeekend;
 
 }

tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/dto/ProdEmergencyResponseIntervalsDO.java

@@ -38,9 +38,9 @@ public class ProdEmergencyResponseIntervalsDO extends BaseDO {
     private Long prodId;
 
     /**
-     * 响应模式名称
+     * 响应模式名称modeName
      */
-    private String modeName;
+    private String name;
     /**
      * 响应时间（小时）
      */
@@ -58,4 +58,8 @@ public class ProdEmergencyResponseIntervalsDO extends BaseDO {
      */
     private BigDecimal price;
 
+
+    public boolean isEmpty() {
+        return id == null;
+    }
 }

tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/dto/ProdExtendDO.java

@@ -41,4 +41,9 @@ public class ProdExtendDO {
      */
     private Integer isDisable;
 
+    /**
+     * 体重是否收费0否1是
+     */
+    private Integer isWeightCharge;
+
 }

tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/dto/ProdReservationConfigDO.java

@@ -66,37 +66,6 @@ public class ProdReservationConfigDO extends BaseDO {
      * 允许更改预约时间的最大次数
      */
     private Integer maxChangeTimes;
-    /**
-     * 黑名自定义日期
-     */
-    @TableField(typeHandler = StringListTypeHandler.class)
-    private List<String> blacklistedDates;
-
-    /**
-     * '是否开启黑名单自定义0关1开'
-     */
-    private Integer isBlacklisted;
-
-    /**
-     * '是否开启黑名单指定日期0关1开'
-     */
-    private Integer isBlackAppoint;
-
-    /**
-     * 黑名单指定日期
-     */
-    //private String blackAppointDates;
-    @TableField(typeHandler = StringListTypeHandler.class)
-    private List<String> blackAppointDates;
-    /**
-     * 法定节假日是否开启0:关闭1开启
-     */
-    private Integer blackHappy;
-    /**
-     * 固定休息日周末是否开启0关闭1开启
-     */
-    private Integer blackWeekend;
-
     /**
      * 预约时间区间设置
      */

tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/CategorySaveReqVO.java

@@ -1,8 +1,6 @@
 package com.tashow.cloud.productapi.api.product.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotEmpty;
-import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 
 import java.util.List;

tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prod/ProdListVO.java

@@ -63,12 +63,17 @@ public class ProdListVO {
     /**
      * 服务时段
      */
-    private BigDecimal reservationTimeSlots;
+    @TableField(typeHandler = StringListTypeHandler.class)
+    private List<String> reservationTimeSlots;
 
     /**
      * 还剩多少天
      */
     private Long remainingDays;
+    /**
+     * 图片
+     */
+    private String pic;
 
     /**
      * 审核备注

tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prod/ProdRestoreListVO.java

@@ -1,7 +1,9 @@
 package com.tashow.cloud.productapi.api.product.vo.prod;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.tashow.cloud.productapi.general.StringListTypeHandler;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
@@ -49,7 +51,8 @@ public class ProdRestoreListVO {
     /**
      * 服务时段
      */
-    private BigDecimal reservationTimeSlots;
+    @TableField(typeHandler = StringListTypeHandler.class)
+    private List<String> reservationTimeSlots;
 
     /**
      * 还剩多少天

tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prod/ProdSaveReqVO.java

@@ -3,7 +3,6 @@ package com.tashow.cloud.productapi.api.product.vo.prod;
 import com.tashow.cloud.productapi.api.product.dto.SkuDO;
 import com.tashow.cloud.productapi.api.product.vo.prodprop.ProdPropSaveReqVO;
 import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotEmpty;
 import lombok.Data;
 
 import java.util.List;

tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prod/ProdServiceInfoVO.java

@@ -0,0 +1,84 @@
+package com.tashow.cloud.productapi.api.product.vo.prod;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.tashow.cloud.productapi.api.product.dto.ProdAdditionalFeeDatesDO;
+import com.tashow.cloud.productapi.api.product.dto.ProdAdditionalFeePeriodsDO;
+import com.tashow.cloud.productapi.api.product.dto.ProdWeightRangePricesDO;
+import com.tashow.cloud.productapi.api.product.dto.ProductOrderLimitDO;
+import com.tashow.cloud.productapi.api.product.vo.prodemergencyresponse.ProdEmergencyInfoReqVO;
+import com.tashow.cloud.productapi.api.product.vo.prodemergencyresponse.ProdEmergencyInfoVO;
+import com.tashow.cloud.productapi.api.product.vo.prodreservationconfig.ProdReservationInfoReqVO;
+import com.tashow.cloud.productapi.api.product.vo.prodreservationconfig.ProdReservationInfoVO;
+import com.tashow.cloud.productapi.api.product.vo.prodserviceareas.ProdServiceAreasInfoVO;
+import com.tashow.cloud.productapi.api.product.vo.prodweightrangeprices.ProdWeightRangePricesSaveInfoVO;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Schema(description = "商品服务配置 VO")
+@Data
+public class ProdServiceInfoVO {
+
+    @Schema(description = "产品ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "6943")
+    private Long prodId;
+
+    @Schema(description = "创建时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date createTime;
+
+    @Schema(description = "修改时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date updateTime;
+
+    @Schema(description = "新建人")
+    private String creator;
+
+    @Schema(description = "修改人")
+    private String updater;
+
+    @Schema(description = "分类名称")
+    private String categoryName;
+
+    @Schema(description = "是否开启服务区域配置0关1开")
+    private Integer regionSwitch;
+    @Schema(description = "服务区域配置")
+    public  ProdServiceAreasInfoVO prodServiceAreasInfo;
+
+
+    @Schema(description = "是否预约0关1开")
+    private Integer reservationSwitch;
+    @Schema(description = "预约配置")
+    public ProdReservationInfoReqVO prodReservationConfig;
+
+    @Schema(description = "是否紧急响应服务0关1开")
+    private Integer emergencySwitch;
+    @Schema(description = "急响应服务配置")
+    public ProdEmergencyInfoReqVO prodEmergencyInfoVO;
+
+    @Schema(description = "是否接单上线0关1开")
+    private Integer orderLimitSwitch;
+    @Schema(description = "接单上线配置")
+    public ProductOrderLimitDO productOrderLimitVO;
+
+
+    @Schema(description = "是否特殊日期（节假日周末什么的）0关1开 ")
+    private Integer additionalSwitch;
+    @Schema(description = "特殊日期规则配置")
+    public List<ProdAdditionalFeeDatesDO> prodAdditionalFeeDatesList;
+
+    @Schema(description = "是否特殊时段0关1开")
+    private Integer additionalFeeSwitch;
+    @Schema(description = "特殊时段规则配置 ")
+    public List<ProdAdditionalFeePeriodsDO> prodAdditionalFeePeriodsList;
+
+
+    @Schema(description = "是否开启体重配置0关1开")
+    private Integer weightSwitch;
+    @Schema(description = "体重配置")
+    public ProdWeightRangePricesSaveInfoVO prodWeightConfig;
+
+
+}

tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prod/ProdServiceVO.java

@@ -1,14 +1,20 @@
 package com.tashow.cloud.productapi.api.product.vo.prod;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.tashow.cloud.productapi.api.product.vo.prodadditionalfeedates.ProdAdditionalFeeBlackVO;
 import com.tashow.cloud.productapi.api.product.vo.prodemergencyresponse.ProdEmergencyInfoVO;
+import com.tashow.cloud.productapi.api.product.vo.prodreservationconfig.ProdReservationInfoVO;
 import com.tashow.cloud.productapi.api.product.vo.prodserviceareas.ProdServiceAreasInfoVO;
 import com.tashow.cloud.productapi.api.product.dto.*;
+import com.tashow.cloud.productapi.api.product.vo.prodweightrangeprices.ProdWeightRangePricesSaveInfoVO;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
 
 @Schema(description = "商品服务配置 VO")
 @Data
@@ -43,7 +49,23 @@ public class ProdServiceVO {
     @Schema(description = "是否预约0关1开")
     private Integer reservationSwitch;
     @Schema(description = "预约配置")
-    public  ProdReservationConfigDO prodReservationConfig;
+    public ProdReservationInfoVO prodReservationConfig;
+
+   /* public List<ProdAdditionalFeeBlackVO> getProdReservationBlackList() {
+        if (prodReservationBlackList == null || prodReservationBlackList.isEmpty()) {
+            return prodReservationBlackList;
+        }
+        return prodReservationBlackList.stream()
+                .filter(Objects::nonNull)
+                .collect(Collectors.toList());
+    }
+
+    public void setProdReservationBlackList(List<ProdAdditionalFeeBlackVO> prodReservationBlackList) {
+        this.prodReservationBlackList = prodReservationBlackList;
+    }*/
+
+
+
 
     @Schema(description = "是否紧急响应服务0关1开")
     private Integer emergencySwitch;
@@ -56,20 +78,42 @@ public class ProdServiceVO {
     public ProductOrderLimitDO productOrderLimitVO;
 
 
-    @Schema(description = "是否特殊时段0关1开")
+    @Schema(description = "是否特殊日期（节假日周末什么的）0关1开")
     private Integer additionalSwitch;
-    @Schema(description = "特殊时段规则配置")
+    @Schema(description = "特殊日期规则配置")
     public List<ProdAdditionalFeeDatesDO> prodAdditionalFeeDatesList;
 
-    @Schema(description = "是否特殊日期（节假日周末什么的）0关1开")
+    @Schema(description = "是否特殊时段0关1开 ")
     private Integer additionalFeeSwitch;
-    @Schema(description = "特殊日期规则配置")
+    @Schema(description = "特殊时段规则配置 ")
     public List<ProdAdditionalFeePeriodsDO> prodAdditionalFeePeriodsList;
 
 
     @Schema(description = "是否开启体重配置0关1开")
     private Integer weightSwitch;
     @Schema(description = "体重配置")
-    public ProdWeightRangePricesDO prodWeightConfig;
+    public ProdWeightRangePricesSaveInfoVO prodWeightConfig;
 
+
+    public ProdReservationInfoVO getProdReservationConfig() {
+
+        if (this.prodReservationConfig == null) {
+            return null;
+        }
+        // 判断是否“逻辑上为空”
+        if (isProdReservationInfoEmpty(this.prodReservationConfig)) {
+            return null;
+        }
+        return this.prodReservationConfig;
+    }
+
+    public void setProdReservationConfig(ProdReservationInfoVO prodReservationConfig) {
+        this.prodReservationConfig = prodReservationConfig;
+    }
+
+    private boolean isProdReservationInfoEmpty(ProdReservationInfoVO config) {
+        if (config == null) return true;
+        // 判断所有字段是否都为 null 或空
+        return config.getId() == null;
+    }
 }

tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prodadditionalfeedates/ProdAdditionalFeeBlackVO.java

@@ -0,0 +1,42 @@
+package com.tashow.cloud.productapi.api.product.vo.prodadditionalfeedates;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.tashow.cloud.productapi.general.StringListTypeHandler;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+@Schema(description = "管理后台 - 特殊日期附加费用规则 Response VO")
+@Data
+@ExcelIgnoreUnannotated
+public class ProdAdditionalFeeBlackVO {
+
+    @Schema(description = "特殊日期规则的唯一标识符")
+    @ExcelProperty("特殊日期规则的唯一标识符")
+    private Long id;
+
+    @Schema(description = "日期类型0：'自定义日期范围':1：'指定日期':2：'法定节假日',3：'固定休息日'")
+    @ExcelProperty("日期类型0：'自定义日期范围':1：'指定日期':2：'法定节假日',3：'固定休息日'")
+    private Integer dateType;
+
+    @Schema(description = "黑名单日期设置")
+    @ExcelProperty("黑名单日期设置")
+    @TableField(typeHandler = StringListTypeHandler.class)
+    private List<String> customTimeSlots;
+
+
+    @Schema(description = "类型：1：特殊日期 2：可预约时段黑名单日期 3：紧急相应服务黑名单日期")
+    @ExcelProperty("类型：1：特殊日期 2：可预约时段黑名单日期 3：紧急相应服务黑名单日期")
+    private Integer type;
+
+    @Schema(description = "是否启用该规则是否启用该规则0关1开", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("是否启用该规则是否启用该规则0关1开")
+    private Integer isEnabled;
+    public boolean isEmpty() {
+        return id == null ;
+    }
+}

tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prodemergencyresponse/ProdEmergencyInfoReqVO.java

@@ -0,0 +1,40 @@
+package com.tashow.cloud.productapi.api.product.vo.prodemergencyresponse;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.tashow.cloud.productapi.api.product.dto.ProdEmergencyResponseIntervalsDO;
+import com.tashow.cloud.productapi.api.product.vo.prodadditionalfeedates.ProdAdditionalFeeBlackVO;
+import com.tashow.cloud.productapi.general.StringListTypeHandler;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Schema(description = "管理后台 - 商品紧急响应服务设置 Response VO")
+@Data
+@ExcelIgnoreUnannotated
+public class ProdEmergencyInfoReqVO {
+
+
+    /**
+     * 紧急响应服务配置的唯一标识符
+     */
+    private Long id;
+    /**
+     * 关联的商品ID
+     */
+    private Long prodId;
+    /**
+     * 可响应时间段
+     */
+    @TableField(typeHandler = StringListTypeHandler.class)
+    private List<String> responseTimeSlots;
+
+    @Schema(description = "紧急响应时间区间设置")
+    public List<ProdEmergencyResponseIntervalsDO> prodEmergencyResponseIntervalsList;
+
+    @Schema(description = "紧急响应黑名单日期设置")
+    public List<ProdAdditionalFeeBlackVO> prodEmergencyResponseBlackList;
+
+}

tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prodemergencyresponse/ProdEmergencyInfoVO.java

@@ -1,11 +1,15 @@
 package com.tashow.cloud.productapi.api.product.vo.prodemergencyresponse;
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.tashow.cloud.productapi.api.product.dto.ProdEmergencyResponseIntervalsDO;
+import com.tashow.cloud.productapi.api.product.vo.prodadditionalfeedates.ProdAdditionalFeeBlackVO;
+import com.tashow.cloud.productapi.general.StringListTypeHandler;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.util.List;
+import java.util.stream.Collectors;
 
 @Schema(description = "管理后台 - 商品紧急响应服务设置 Response VO")
 @Data
@@ -24,27 +28,12 @@ public class ProdEmergencyInfoVO {
     /**
      * 可响应时间段
      */
+    @TableField(typeHandler = StringListTypeHandler.class)
     private List<String> responseTimeSlots;
-    /**
-     * 黑名自定义日期
-     */
-    private List<String> blacklistedDates;
-    /**
-     * 黑名单指定日期
-     */
-    private List<String> blackAppointDates;
-    /**
-     * 法定节假日是否开启0:关闭1开启
-     */
-    private Integer blackHappy;
-    /**
-     * 固定休息日周末是否开启0关闭1开启
-     */
-    private Integer blackWeekend;
-
-
 
     @Schema(description = "紧急响应时间区间设置")
     public List<ProdEmergencyResponseIntervalsDO> prodEmergencyResponseIntervalsList;
 
+    @Schema(description = "紧急响应黑名单日期设置")
+    public List<ProdAdditionalFeeBlackVO> prodEmergencyResponseBlackList;
 }

tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prodemergencyresponseintervals/ProdEmergencyResponseIntervalsPageReqVO.java

@@ -19,7 +19,7 @@ public class ProdEmergencyResponseIntervalsPageReqVO extends PageParam {
     private Long configId;
 
     @Schema(description = "响应模式名称", example = "王五")
-    private String modeName;
+    private String name;
 
     @Schema(description = "响应时间（小时）")
     private BigDecimal responseHours;

tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prodemergencyresponseintervals/ProdEmergencyResponseIntervalsRespVO.java

@@ -23,7 +23,7 @@ public class ProdEmergencyResponseIntervalsRespVO {
 
     @Schema(description = "响应模式名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "王五")
     @ExcelProperty("响应模式名称")
-    private String modeName;
+    private String name;
 
     @Schema(description = "响应时间（小时）", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("响应时间（小时）")

tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prodemergencyresponseintervals/ProdEmergencyResponseIntervalsSaveReqVO.java

@@ -21,7 +21,7 @@ public class ProdEmergencyResponseIntervalsSaveReqVO {
 
     @Schema(description = "响应模式名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "王五")
     @NotEmpty(message = "响应模式名称不能为空")
-    private String modeName;
+    private String name;
 
     @Schema(description = "响应时间（小时）", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotNull(message = "响应时间（小时）不能为空")

tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prodpropvalue/ProPageReqVO.java

@@ -0,0 +1,25 @@
+package com.tashow.cloud.productapi.api.product.vo.prodpropvalue;
+
+import com.tashow.cloud.common.pojo.PageParam;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+
+@Schema(description = "")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class ProPageReqVO extends PageParam {
+
+    /**
+     * 属性规格名称
+     */
+    private String propValue;
+
+    /**
+     * 商品id
+     */
+    private Long prodId;
+
+}

tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prodpropvalue/ProPropRecycleBinVO.java

@@ -0,0 +1,32 @@
+package com.tashow.cloud.productapi.api.product.vo.prodpropvalue;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class ProPropRecycleBinVO {
+    @Schema(description = "规格值id")
+    private Long id;
+
+    /**
+     * 属性规格名称
+     */
+    private String propValue;
+    /**
+     * 关联规格属性id
+     */
+    private Long propId;
+
+    /**
+     * 还剩多少天
+     */
+    private Long remainingDays;
+    /**
+     * 删除时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date deleteTime;
+}

tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prodreservationconfig/ProdReservationInfoReqVO.java

@@ -0,0 +1,84 @@
+package com.tashow.cloud.productapi.api.product.vo.prodreservationconfig;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.tashow.cloud.productapi.api.product.vo.prodadditionalfeedates.ProdAdditionalFeeBlackVO;
+import com.tashow.cloud.productapi.general.StringListTypeHandler;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
+@Schema(description = "管理后台 - 商品紧急响应服务设置 Response VO")
+@Data
+@ExcelIgnoreUnannotated
+public class ProdReservationInfoReqVO {
+
+    /**
+     * 预约配置的唯一标识符
+     */
+    @TableId
+    private Long id;
+    /**
+     * 关联的商品ID
+     */
+    private Long prodId;
+    /**
+     * 预约时段设置
+     */
+    @TableField(typeHandler = StringListTypeHandler.class)
+    private List<String> reservationTimeSlots;
+    /**
+     * 需提前多少小时预约
+     */
+    private Integer advanceHours;
+    /**
+     * 预约日期范围 7天 10天 15天 30天
+     */
+    private Integer reservationDateRange;
+    /**
+     * 是否允许更改预约时间 1可以 0不可以
+     */
+    private Integer allowChange;
+
+    /**
+     * 时间段
+     */
+    private Integer timeSlot;
+
+    /**
+     * 更改预约时间的时间规则（如服务开始前1小时可更改）
+     */
+    private Integer changeTimeRule;
+    /**
+     * 允许更改预约时间的最大次数
+     */
+    private Integer maxChangeTimes;
+
+    /**
+     * 预约时间区间设置
+     */
+    @TableField(exist=false)
+    private TimeBookVO timeBook;
+
+    public TimeBookVO getTimeBook() {
+        if (this.timeBook == null) {
+            this.timeBook = new TimeBookVO();
+            this.timeBook.setTimeSlot(this.timeSlot);
+            this.timeBook.setReservationTimeSlots(this.reservationTimeSlots);
+        }
+        return this.timeBook;
+    }
+
+    public void setTimeBook(TimeBookVO timeBook) {
+        this.timeBook = timeBook;
+    }
+
+    @Schema(description = "预约黑名单日期设置")
+    public List<ProdAdditionalFeeBlackVO> prodReservationBlackList = new ArrayList<>();
+
+}

tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prodreservationconfig/ProdReservationInfoVO.java

@@ -0,0 +1,103 @@
+package com.tashow.cloud.productapi.api.product.vo.prodreservationconfig;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.tashow.cloud.productapi.api.product.dto.ProdEmergencyResponseIntervalsDO;
+import com.tashow.cloud.productapi.api.product.vo.prodadditionalfeedates.ProdAdditionalFeeBlackVO;
+import com.tashow.cloud.productapi.general.StringListTypeHandler;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
+@Schema(description = "管理后台 - 商品紧急响应服务设置 Response VO")
+@Data
+@ExcelIgnoreUnannotated
+public class ProdReservationInfoVO {
+
+    /**
+     * 预约配置的唯一标识符
+     */
+    @TableId
+    private Long id;
+    /**
+     * 关联的商品ID
+     */
+    private Long prodId;
+    /**
+     * 预约时段设置
+     */
+    @TableField(typeHandler = StringListTypeHandler.class)
+    private List<String> reservationTimeSlots;
+    /**
+     * 需提前多少小时预约
+     */
+    private Integer advanceHours;
+    /**
+     * 预约日期范围 7天 10天 15天 30天
+     */
+    private Integer reservationDateRange;
+    /**
+     * 是否允许更改预约时间 1可以 0不可以
+     */
+    private Integer allowChange;
+
+    /**
+     * 时间段
+     */
+    private Integer timeSlot;
+
+    /**
+     * 更改预约时间的时间规则（如服务开始前1小时可更改）
+     */
+    private Integer changeTimeRule;
+    /**
+     * 允许更改预约时间的最大次数
+     */
+    private Integer maxChangeTimes;
+
+    /**
+     * 预约时间区间设置
+     */
+    @TableField(exist=false)
+    private TimeBookVO timeBook;
+
+    public TimeBookVO getTimeBook() {
+        if (this.timeBook == null) {
+            this.timeBook = new TimeBookVO();
+            this.timeBook.setTimeSlot(this.timeSlot);
+            this.timeBook.setReservationTimeSlots(this.reservationTimeSlots);
+        }
+        return this.timeBook;
+    }
+
+    public void setTimeBook(TimeBookVO timeBook) {
+        this.timeBook = timeBook;
+    }
+
+    @Schema(description = "预约黑名单日期设置")
+    public List<ProdAdditionalFeeBlackVO> prodReservationBlackList;
+
+
+/*    public List<ProdAdditionalFeeBlackVO> getProdReservationBlackList() {
+        if (prodReservationBlackList == null || prodReservationBlackList.isEmpty()) {
+            return prodReservationBlackList;
+        }
+        return prodReservationBlackList.stream()
+                .filter(black -> black != null && !black.isEmpty())
+                .collect(Collectors.toList());
+    }
+
+    public void setProdReservationBlackList(List<ProdAdditionalFeeBlackVO> prodReservationBlackList) {
+        this.prodReservationBlackList = prodReservationBlackList;
+    }*/
+
+
+
+
+
+}

tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prodweightrangeprices/ProdWeightRangePricesSaveInfoVO.java

@@ -0,0 +1,23 @@
+package com.tashow.cloud.productapi.api.product.vo.prodweightrangeprices;
+
+import com.tashow.cloud.productapi.api.product.dto.ProdWeightRangePricesDO;
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+@Schema(description = "管理后台 - 体重区间价格新增/修改 Request VO")
+@Data
+public class ProdWeightRangePricesSaveInfoVO {
+
+    @Schema(description = "体重是否收费0否1是")
+    private Integer isWeightCharge;
+
+    @Schema(description = "体重配置")
+    public List<ProdWeightRangePricesDO> prodWeightConfigList;
+
+
+}

tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/sku/SkuRecycleBinVO.java

@@ -1,9 +1,12 @@
 package com.tashow.cloud.productapi.api.product.vo.sku;
 
+import com.alibaba.excel.annotation.ExcelProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
 import java.util.Date;
 
 @Data
@@ -12,9 +15,13 @@ public class SkuRecycleBinVO {
     private Long skuId;
 
     /**
-     * 是否显示失效规格值 0否1是
+     * 属性规格名称
      */
     private String properties;
+    /**
+     * 是否显示失效规格值 0否1是
+     */
+    private String skuName;
 
     /**
      * 还剩多少天
@@ -25,4 +32,140 @@ public class SkuRecycleBinVO {
      */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date deleteTime;
+
+
+
+
+    @Schema(description = "商品ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "18784")
+    @ExcelProperty("商品ID")
+    private Long prodId;
+
+    @Schema(description = "别名")
+    @ExcelProperty("别名")
+    private String alias;
+
+    @Schema(description = "当前价格", example = "32405")
+    @ExcelProperty("价格")
+    private BigDecimal price;
+
+    /**
+     * 基准价
+     */
+    private BigDecimal basePrice;
+
+    @Schema(description = "最低价格", example = "5040")
+    @ExcelProperty("最低价格")
+    private BigDecimal minPrice;
+
+    @Schema(description = "最高价格", example = "11547")
+    @ExcelProperty("最高价格")
+    private BigDecimal maxPrice;
+
+    @Schema(description = "成本价", example = "28062")
+    @ExcelProperty("成本价")
+    private BigDecimal originalPrice;
+
+    @Schema(description = "市场价", example = "11547")
+    @ExcelProperty("市场价")
+    private BigDecimal marketPrice;
+
+    @Schema(description = "单位")
+    @ExcelProperty("单位")
+    private String unit;
+
+    @Schema(description = "0:主服务1:待定", example = "1")
+    @ExcelProperty("0:主服务1:待定")
+    private Integer type;
+
+    @Schema(description = "概述")
+    @ExcelProperty("概述")
+    private String overview;
+
+    @Schema(description = "库存")
+    @ExcelProperty("库存")
+    private Integer stocks;
+
+
+    @Schema(description = "总库存是0 无线库存是1")
+    @ExcelProperty("总库存是0 无线库存是1")
+    private Integer stocksFlg;
+
+    /**
+     * 锁定库存数
+     */
+    @Schema(description = "锁定库存数")
+    @ExcelProperty("锁定库存数")
+    private Integer stocksLockNum;
+
+    @Schema(description = "预警库存")
+    @ExcelProperty("预警库存")
+    private Integer warnStocks;
+
+    @Schema(description = "库存扣款时机0:付款扣1：下单扣", example = "1")
+    @ExcelProperty("库存扣款时机0:付款扣1：下单扣")
+    private Boolean stocksType;
+
+    @Schema(description = "sku编码")
+    @ExcelProperty("sku编码")
+    private String skuCode;
+
+    @Schema(description = "商品条形码", example = "14390")
+    @ExcelProperty("商品条形码")
+    private String modelId;
+
+    @Schema(description = "sku图片")
+    @ExcelProperty("sku图片")
+    private String pic;
+
+
+    @Schema(description = "商品名称", example = "芋艿")
+    @ExcelProperty("商品名称")
+    private String prodName;
+
+    @Schema(description = "版本号", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("版本号")
+    private Integer version;
+
+    @Schema(description = "商品重量")
+    @ExcelProperty("商品重量")
+    private Double weight;
+
+    @Schema(description = "商品体积")
+    @ExcelProperty("商品体积")
+    private Double volume;
+
+    @Schema(description = "0 禁用 1 启用", example = "1")
+    @ExcelProperty("0 禁用 1 启用")
+    private Integer status;
+
+    @Schema(description = "0 正常 1 已被删除")
+    @ExcelProperty("0 正常 1 已被删除")
+    private Integer isDelete;
+
+    @Schema(description = "最小购买数量")
+    @ExcelProperty("最小购买数量")
+    private Integer moq;
+
+    @Schema(description = "创建时间")
+    @ExcelProperty("创建时间")
+    private LocalDateTime createTime;
+    /**
+     * 是否上下架0下架1上架
+     */
+    private Integer isShelf;
+
+    /**
+     * 是否默认规则0否1是
+     */
+    private Integer isSpecs;
+
+    /**
+     * 服务内容
+     */
+    private String serviceContent;
+    /**
+     * 规格id 多个用逗号分隔（1,2,3）
+     */
+    private String propIds;
+
 }

tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/sku/SkuSaveReqVO.java

@@ -15,7 +15,6 @@ public class SkuSaveReqVO {
     private Long skuId;
 
     @Schema(description = "商品ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "18784")
-    @NotNull(message = "商品ID不能为空")
     private Long prodId;
 
     @Schema(description = "销售属性组合字符串 格式是p1:v1;p2:v2")
@@ -86,7 +85,6 @@ public class SkuSaveReqVO {
     private String prodName;
 
     @Schema(description = "版本号", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "版本号不能为空")
     private Integer version;
 
     @Schema(description = "商品重量")
@@ -103,6 +101,11 @@ public class SkuSaveReqVO {
 
     @Schema(description = "最小购买数量")
     private Integer moq;
+    /**
+     * 是否默认规则0否1是
+     */
+    private Integer isSpecs;
+
     /**
      * 扩展服务表单id
      */

tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/enums/ApiConstants.java

@@ -17,7 +17,7 @@ public class ApiConstants {
      */
     public static final String NAME = "product-server";
 
-    public static final String PREFIX = RpcConstants.RPC_API_PREFIX + "/infra";
+    public static final String PREFIX = RpcConstants.RPC_API_PREFIX + "/product";
 
     public static final String VERSION = "1.0.0";
 

tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/enums/ErrorCodeConstants.java

@@ -32,4 +32,10 @@ public interface ErrorCodeConstants {
     ErrorCode SKU_SERVICES_FORM_NOT_EXISTS = new ErrorCode(10021, "商品SKU扩展服务表单不存在");
     ErrorCode SKU_SERVICE_TRANSPORT_NOT_EXISTS = new ErrorCode(10022, "服务遗体运输不存在");
     ErrorCode SKU_SERVICE_DETAILS_NOT_EXISTS = new ErrorCode(10023, "服务详情不存在");
+
+    ErrorCode SKU_DOES_NOT_EXIST = new ErrorCode(10030, "商品不存在");
+    ErrorCode SKU_DELETE = new ErrorCode(10030, "商品已删除");
+    ErrorCode SKU_DISABLE = new ErrorCode(10031, "商品已禁用");
+
+
 }

tashow-feign/tashow-trade-api/src/main/java/com/tashow/cloud/tradeapi/api/order/dto/TradeOrderRespDTO.java

@@ -18,7 +18,7 @@ public class TradeOrderRespDTO {
     private Long id;
 
     //订单流水号
-    private String no;
+    private String orderNum;
 
     //订单类型
     private Integer type; // 参见 TradeOrderTypeEnum 枚举

tashow-feign/tashow-trade-api/src/main/java/com/tashow/cloud/tradeapi/enums/ErrorCodeConstants.java

@@ -16,6 +16,7 @@ public interface ErrorCodeConstants {
     ErrorCode ORDER_ITEM_NOT_FOUND = new ErrorCode(1_011_000_010, "交易订单项不存在");
     ErrorCode ORDER_NOT_FOUND = new ErrorCode(1_011_000_011, "交易订单不存在");
     ErrorCode ORDER_ITEM_UPDATE_AFTER_SALE_STATUS_FAIL = new ErrorCode(1_011_000_012, "交易订单项更新售后状态失败，请重试");
+    ErrorCode ORDER_UPDATE_UNWAITACCEPT_FAIL = new ErrorCode(1_011_000_012, "交易订单更新状态失败，当前订单不处于待验收状态");
     ErrorCode ORDER_UPDATE_PAID_STATUS_NOT_UNPAID = new ErrorCode(1_011_000_013, "交易订单更新支付状态失败，订单不是【未支付】状态");
     ErrorCode ORDER_UPDATE_PAID_FAIL_PAY_ORDER_ID_ERROR = new ErrorCode(1_011_000_014, "交易订单更新支付状态失败，支付单编号不匹配");
     ErrorCode ORDER_UPDATE_PAID_FAIL_PAY_ORDER_STATUS_NOT_SUCCESS = new ErrorCode(1_011_000_015, "交易订单更新支付状态失败，支付单状态不是【支付成功】状态");

tashow-feign/tashow-trade-api/src/main/java/com/tashow/cloud/tradeapi/enums/aftersale/AfterSaleStatusEnum.java

@@ -20,40 +20,15 @@ import static cn.hutool.core.util.ArrayUtil.firstMatch;
 @Getter
 public enum AfterSaleStatusEnum implements ArrayValuable<Integer> {
 
-    /**
+    APPLY(10,"等待审核", ""), // 有赞的状态提示：退款申请待商家处理
-     * 【申请售后】
+    SELLER_AGREE(20, "审核通过", ""), // 有赞的状态提示：请退货并填写物流信息
-     */
+    BUYER_DELIVERY(30,"已完成", ""), // 有赞的状态提示：退货退款申请待商家处理
-    APPLY(10,"申请中", "会员申请退款"), // 有赞的状态提示：退款申请待商家处理
+    WAIT_REFUND(40, "已取消", ""), // 有赞的状态提示：无（有赞无该状态）
-    /**
+    COMPLETE(50, "已拒绝", ""), // 有赞的状态提示：退款成功
-     * 卖家通过售后；【商品待退货】
+
-     */
-    SELLER_AGREE(20, "卖家通过", "商家同意退款"), // 有赞的状态提示：请退货并填写物流信息
-    /**
-     * 买家已退货，等待卖家收货；【商家待收货】
-     */
-    BUYER_DELIVERY(30,"待卖家收货", "会员填写退货物流信息"), // 有赞的状态提示：退货退款申请待商家处理
-    /**
-     * 卖家已收货，等待平台退款；等待退款【等待退款】
-     */
-    WAIT_REFUND(40, "等待平台退款", "商家收货"), // 有赞的状态提示：无（有赞无该状态）
-    /**
-     * 完成退款【退款成功】
-     */
-    COMPLETE(50, "完成", "商家确认退款"), // 有赞的状态提示：退款成功
-    /**
-     * 【买家取消】
-     */
-    BUYER_CANCEL(61, "买家取消售后", "会员取消退款"), // 有赞的状态提示：退款关闭
-    /**
-     * 卖家拒绝售后；商家拒绝【商家拒绝】
-     */
-    SELLER_DISAGREE(62,"卖家拒绝", "商家拒绝退款"), // 有赞的状态提示：商家不同意退款申请
-    /**
-     * 卖家拒绝收货，终止售后；【商家拒收货】
-     */
-    SELLER_REFUSE(63,"卖家拒绝收货", "商家拒绝收货"), // 有赞的状态提示：商家拒绝收货，不同意退款
     ;
 
+
     public static final Integer[] ARRAYS = Arrays.stream(values()).map(AfterSaleStatusEnum::getStatus).toArray(Integer[]::new);
 
     /**

tashow-feign/tashow-trade-api/src/main/java/com/tashow/cloud/tradeapi/enums/order/TradeOrderOperateTypeEnum.java

@@ -25,6 +25,7 @@ public enum TradeOrderOperateTypeEnum {
     SYSTEM_COMMENT(34, "到期未评价，系统自动评价"),
     MEMBER_CANCEL(40, "取消订单"),
     SYSTEM_CANCEL(41, "到期未支付，系统自动取消订单"),
+    ADMIN_CANCEL(42, "管理员取消订单"),
     // 42 预留：管理员取消订单
     ADMIN_CANCEL_AFTER_SALE(43, "订单全部售后，管理员自动取消订单"),
     MEMBER_DELETE(49, "删除订单"),

tashow-feign/tashow-trade-api/src/main/java/com/tashow/cloud/tradeapi/enums/order/TradeOrderStatusEnum.java

@@ -17,11 +17,15 @@ import java.util.Arrays;
 @Getter
 public enum TradeOrderStatusEnum implements ArrayValuable<Integer> {
 
-    UNPAID(0, "待支付"),
+    WAITPAID(10, "等待付款"),
-    UNDELIVERED(10, "待发货"),
+    WAITCONFIRM(20, "等待确定"),
-    DELIVERED(20, "已发货"),
+    WAITSERVE(30, "等待服务"),
-    COMPLETED(30, "已完成"),
+    WAITACCEPT(40, "等待验收"),
-    CANCELED(40, "已取消");
+    COMPLETED(50, "已完成"),
+    CANCELED(60, "已取消"),
+    DELIVERED(70, "已退款"),
+    WAITDELIVERED(80, "待发货"),
+    ;
 
     public static final Integer[] ARRAYS = Arrays.stream(values()).map(TradeOrderStatusEnum::getStatus).toArray(Integer[]::new);
 
@@ -49,7 +53,16 @@ public enum TradeOrderStatusEnum implements ArrayValuable<Integer> {
      * @return 是否
      */
     public static boolean isUnpaid(Integer status) {
-        return ObjectUtil.equal(UNPAID.getStatus(), status);
+        return ObjectUtil.equal(WAITPAID.getStatus(), status);
+    }
+    /**
+     * 判断指定状态，是否正处于【待验收】状态
+     *
+     * @param status 指定状态
+     * @return 是否
+     */
+    public static boolean isWaitAccept(Integer status) {
+        return ObjectUtil.equal(WAITACCEPT.getStatus(), status);
     }
 
     /**
@@ -59,7 +72,7 @@ public enum TradeOrderStatusEnum implements ArrayValuable<Integer> {
      * @return 是否
      */
     public static boolean isUndelivered(Integer status) {
-        return ObjectUtil.equal(UNDELIVERED.getStatus(), status);
+        return ObjectUtil.equal(WAITDELIVERED.getStatus(), status);
     }
 
     /**
@@ -99,7 +112,7 @@ public enum TradeOrderStatusEnum implements ArrayValuable<Integer> {
      * @return 是否
      */
     public static boolean havePaid(Integer status) {
-        return ObjectUtils.equalsAny(status, UNDELIVERED.getStatus(),
+        return ObjectUtils.equalsAny(status, WAITCONFIRM.getStatus(),
                 DELIVERED.getStatus(), COMPLETED.getStatus());
     }
 

tashow-feign/tashow-user-api/pom.xml

@@ -8,7 +8,7 @@
         <version>${revision}</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>tashow-member-api</artifactId>
+    <artifactId>tashow-user-api</artifactId>
     <packaging>jar</packaging>
 
     <name>${project.artifactId}</name>

tashow-feign/tashow-user-api/src/main/java/com/tashow/cloud/userapi/api/address/MemberAddressApi.java

@@ -1,8 +1,8 @@
-package com.tashow.cloud.memberapi.api.address;
+package com.tashow.cloud.userapi.api.address;
 
 import com.tashow.cloud.common.pojo.CommonResult;
-import com.tashow.cloud.memberapi.api.address.dto.MemberAddressRespDTO;
+import com.tashow.cloud.userapi.api.address.dto.MemberAddressRespDTO;
-import com.tashow.cloud.memberapi.enums.ApiConstants;
+import com.tashow.cloud.userapi.enums.ApiConstants;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestParam;

tashow-feign/tashow-user-api/src/main/java/com/tashow/cloud/userapi/api/address/dto/MemberAddressRespDTO.java

@@ -1,4 +1,4 @@
-package com.tashow.cloud.memberapi.api.address.dto;
+package com.tashow.cloud.userapi.api.address.dto;
 
 import lombok.Data;
 

tashow-feign/tashow-user-api/src/main/java/com/tashow/cloud/userapi/api/package-info.java

@@ -1,4 +1,4 @@
 /**
  * member API 包，定义暴露给其它模块的 API
  */
-package com.tashow.cloud.memberapi.api;
+package com.tashow.cloud.userapi.api;

tashow-feign/tashow-user-api/src/main/java/com/tashow/cloud/userapi/api/user/UserMemberApi.java

@@ -1,8 +1,8 @@
-package com.tashow.cloud.memberapi.api.user;
+package com.tashow.cloud.userapi.api.user;
 
 import com.tashow.cloud.common.pojo.CommonResult;
-import com.tashow.cloud.memberapi.api.user.dto.MemberUserRespDTO;
+import com.tashow.cloud.userapi.api.user.dto.UserMemberRespDTO;
-import com.tashow.cloud.memberapi.enums.ApiConstants;
+import com.tashow.cloud.userapi.enums.ApiConstants;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -17,9 +17,9 @@ import static com.tashow.cloud.common.util.collection.CollectionUtils.convertMap
  * RPC 服务 - 会员用户
  */
 @FeignClient(name = ApiConstants.NAME) // TODO 芋艿：fallbackFactory =
-public interface MemberUserApi {
+public interface UserMemberApi {
 
-    String PREFIX = ApiConstants.PREFIX + "/user";
+    String PREFIX = ApiConstants.PREFIX + "/member";
 
 
     /**
@@ -28,9 +28,9 @@ public interface MemberUserApi {
      * @param ids 用户编号的数组
      * @return 会员用户 Map
      */
-    default Map<Long, MemberUserRespDTO> getUserMap(Collection<Long> ids) {
+    default Map<Long, UserMemberRespDTO> getUserMap(Collection<Long> ids) {
-        List<MemberUserRespDTO> list = getUserList(ids).getCheckedData();
+        List<UserMemberRespDTO> list = getUserList(ids).getCheckedData();
-        return convertMap(list, MemberUserRespDTO::getId);
+        return convertMap(list, UserMemberRespDTO::getId);
     }
 
     /**
@@ -39,7 +39,7 @@ public interface MemberUserApi {
      * @return
      */
     @GetMapping(PREFIX + "/get")
-    CommonResult<MemberUserRespDTO> getUser(@RequestParam("id") Long id);
+    CommonResult<UserMemberRespDTO> getUser(@RequestParam("id") Long id);
 
     /**
      * 获得会员用户信息们
@@ -47,7 +47,7 @@ public interface MemberUserApi {
      * @return
      */
     @GetMapping(PREFIX + "/list")
-    CommonResult<List<MemberUserRespDTO>> getUserList(@RequestParam("ids") Collection<Long> ids);
+    CommonResult<List<UserMemberRespDTO>> getUserList(@RequestParam("ids") Collection<Long> ids);
 
     /**
      * 基于用户昵称，模糊匹配用户列表
@@ -55,7 +55,7 @@ public interface MemberUserApi {
      * @return
      */
     @GetMapping(PREFIX + "/list-by-nickname")
-    CommonResult<List<MemberUserRespDTO>> getUserListByNickname(@RequestParam("nickname") String nickname);
+    CommonResult<List<UserMemberRespDTO>> getUserListByNickname(@RequestParam("nickname") String nickname);
 
     /**
      * 基于手机号，精准匹配用户
@@ -63,7 +63,7 @@ public interface MemberUserApi {
      * @return
      */
     @GetMapping(PREFIX + "/get-by-mobile")
-    CommonResult<MemberUserRespDTO> getUserByMobile(@RequestParam("mobile") String mobile);
+    CommonResult<UserMemberRespDTO> getUserByMobile(@RequestParam("mobile") String mobile);
 
     /**
      * 校验用户是否存在

tashow-feign/tashow-user-api/src/main/java/com/tashow/cloud/userapi/api/user/dto/UserMemberRespDTO.java

@@ -1,4 +1,4 @@
-package com.tashow.cloud.memberapi.api.user.dto;
+package com.tashow.cloud.userapi.api.user.dto;
 
 import lombok.Data;
 
@@ -8,13 +8,15 @@ import java.time.LocalDateTime;
  * RPC 服务 - 用户信息 Response DTO
  */
 @Data
-public class MemberUserRespDTO {
+public class UserMemberRespDTO {
 
     //用户编号
     private Long id;
 
     //昵称
     private String nickname;
+    //姓名
+    private String name;
 
     //帐号状态
     private Integer status; // 参见 CommonStatusEnum 枚举

tashow-feign/tashow-user-api/src/main/java/com/tashow/cloud/userapi/enums/ApiConstants.java

@@ -0,0 +1,24 @@
+package com.tashow.cloud.userapi.enums;
+
+
+import com.tashow.cloud.common.enums.RpcConstants;
+
+/**
+ * API 相关的枚举
+ *
+ * @author 芋道源码
+ */
+public class ApiConstants {
+
+    /**
+     * 服务名
+     *
+     * 注意，需要保证和 spring.application.name 保持一致
+     */
+    public static final String NAME = "user-server";
+
+    public static final String PREFIX = RpcConstants.RPC_API_PREFIX + "/user";
+
+    public static final String VERSION = "1.0.0";
+
+}

tashow-feign/tashow-user-api/src/main/java/com/tashow/cloud/userapi/enums/DictTypeConstants.java

@@ -1,4 +1,4 @@
-package com.tashow.cloud.memberapi.enums;
+package com.tashow.cloud.userapi.enums;
 
 /**
  * Member 字典类型的枚举类

tashow-feign/tashow-user-api/src/main/java/com/tashow/cloud/userapi/enums/ErrorCodeConstants.java

@@ -1,4 +1,4 @@
-package com.tashow.cloud.memberapi.enums;
+package com.tashow.cloud.userapi.enums;
 
 
 import com.tashow.cloud.common.exception.ErrorCode;

tashow-feign/tashow-user-api/src/main/java/com/tashow/cloud/userapi/enums/MemberExperienceBizTypeEnum.java

@@ -1,4 +1,4 @@
-package com.tashow.cloud.memberapi.enums;
+package com.tashow.cloud.userapi.enums;
 
 import cn.hutool.core.util.EnumUtil;
 import lombok.AllArgsConstructor;

tashow-feign/tashow-user-api/src/main/java/com/tashow/cloud/userapi/enums/point/MemberPointBizTypeEnum.java

@@ -1,4 +1,4 @@
-package com.tashow.cloud.memberapi.enums.point;
+package com.tashow.cloud.userapi.enums.point;
 
 import cn.hutool.core.util.EnumUtil;
 import com.tashow.cloud.common.core.ArrayValuable;

tashow-feign/tashow-user-api/src/main/java/com/tashow/cloud/userapi/message/package-info.java

@@ -0,0 +1,4 @@
+/**
+ * 消息队列的消息
+ */
+package com.tashow.cloud.userapi.message;

tashow-feign/tashow-user-api/src/main/java/com/tashow/cloud/userapi/message/user/MemberUserCreateMessage.java

@@ -1,4 +1,4 @@
-package com.tashow.cloud.memberapi.message.user;
+package com.tashow.cloud.userapi.message.user;
 
 import lombok.Data;
 

tashow-framework/tashow-common/pom.xml

@@ -126,6 +126,10 @@
             <artifactId>commons-lang3</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.apache.tika</groupId>
+            <artifactId>tika-core</artifactId> <!-- 文件客户端：文件类型的识别 -->
+        </dependency>
 
 
         <dependency>

tashow-framework/tashow-common/src/main/java/com/tashow/cloud/common/enums/DocumentEnum.java

@@ -1,21 +0,0 @@
-package com.tashow.cloud.common.enums;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-/**
- * 文档地址
- *
- * @author 芋道源码
- */
-@Getter
-@AllArgsConstructor
-public enum DocumentEnum {
-
-    REDIS_INSTALL("https://gitee.com/zhijiantianya/ruoyi-vue-pro/issues/I4VCSJ", "Redis 安装文档"),
-    TENANT("https://doc.iocoder.cn", "SaaS 多租户文档");
-
-    private final String url;
-    private final String memo;
-
-}

tashow-framework/tashow-common/src/main/java/com/tashow/cloud/common/pojo/PageParam.java

@@ -14,8 +14,7 @@ import java.io.Serializable;
 @Data
 public class PageParam implements Serializable {
 
-    private static final Integer PAGE_NO = 1;
+
-    private static final Integer PAGE_SIZE = 10;
 
     /**
      * 每页条数 - 不分页
@@ -29,7 +28,7 @@ public class PageParam implements Serializable {
      */
     @NotNull(message = "页码不能为空")
     @Min(value = 1, message = "页码最小值为 1")
-    private Integer pageNo = PAGE_NO;
+    private Integer pageNo = 1;
 
     /**
      * 每页条数，最大值为 100"
@@ -37,6 +36,6 @@ public class PageParam implements Serializable {
     @NotNull(message = "每页条数不能为空")
     @Min(value = 1, message = "每页条数最小值为 1")
     @Max(value = 100, message = "每页条数最大值为 100")
-    private Integer pageSize = PAGE_SIZE;
+    private Integer pageSize = 10;
 
 }

tashow-framework/tashow-common/src/main/java/com/tashow/cloud/common/util/date/LocalDateTimeUtils.java

@@ -177,6 +177,15 @@ public class LocalDateTimeUtils {
     public static Long between(LocalDateTime dateTime) {
         return LocalDateTimeUtil.between(dateTime, LocalDateTime.now(), ChronoUnit.DAYS);
     }
+    /**
+     * 获取指定日期到现在过了几天，如果指定日期在当前日期之后，获取结果为负
+     *
+     * @param dateTime 日期
+     * @return 相差天数
+     */
+    public static Long betweenWithNow(LocalDateTime dateTime) {
+        return LocalDateTimeUtil.between(dateTime, LocalDateTime.now(), ChronoUnit.SECONDS);
+    }
 
     /**
      * 获取今天的开始时间
@@ -196,6 +205,15 @@ public class LocalDateTimeUtils {
         return LocalDateTimeUtil.beginOfDay(LocalDateTime.now().minusDays(1));
     }
 
+    /**
+     * 获取day 天后的日期
+     *
+     * @return 昨天
+     */
+    public static LocalDateTime getPlusDay(Integer day) {
+        return LocalDateTimeUtil.beginOfDay(LocalDateTime.now().plusDays(day));
+    }
+
     /**
      * 获取本月的开始时间
      *

tashow-framework/tashow-common/src/main/java/com/tashow/cloud/common/util/io/FileTypeUtils.java

@@ -1,4 +1,4 @@
-package com.tashow.cloud.infra.framework.file.core.utils;
+package com.tashow.cloud.common.util.io;
 
 import cn.hutool.core.io.IoUtil;
 import cn.hutool.core.util.StrUtil;
@@ -64,7 +64,7 @@ public class FileTypeUtils {
         String contentType = getMineType(content, filename);
         response.setContentType(contentType);
         // 针对 video 的特殊处理，解决视频地址在移动端播放的兼容性问题
-        if (StrUtil.containsIgnoreCase(contentType, "video")) {
+        if (StrUtil.containsIgnoreCase(contentType, "video")||StrUtil.containsIgnoreCase(contentType, "audio")) {
             response.setHeader("Content-Length", String.valueOf(content.length - 1));
             response.setHeader("Content-Range", String.valueOf(content.length - 1));
             response.setHeader("Accept-Ranges", "bytes");
@@ -72,5 +72,4 @@ public class FileTypeUtils {
         // 输出附件
         IoUtil.write(response.getOutputStream(), false, content);
     }
-
 }

tashow-framework/tashow-common/src/main/java/com/tashow/cloud/common/util/json/databind/FileJsonSerializer.java

@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved.
+ *
+ * https://www.mall4j.com/
+ *
+ * 未经允许，不可做商业用途！
+ *
+ * 版权所有，侵权必究！
+ */
+
+package com.tashow.cloud.common.util.json.databind;
+
+import cn.hutool.core.util.StrUtil;
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.databind.JsonSerializer;
+import com.fasterxml.jackson.databind.SerializerProvider;
+
+import java.io.IOException;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * 文件序列化
+ */
+public class FileJsonSerializer extends JsonSerializer<String> {
+
+    @Override
+    public void serialize(String value, JsonGenerator gen, SerializerProvider serializers) throws IOException {
+        if (StrUtil.isBlank(value)) {
+            gen.writeString(StrUtil.EMPTY);
+            return;
+        }
+        String[] imgs = value.split(StrUtil.COMMA);
+        StringBuilder sb = new StringBuilder();
+        String resourceUrl = "";
+        String rule="^((http[s]{0,1})://)";
+        Pattern pattern= Pattern.compile(rule);
+//        if (Objects.equals(imgUploadUtil.getUploadType(), 2)) {
+//            resourceUrl = qiniu.getResourcesUrl();
+//        } else if (Objects.equals(imgUploadUtil.getUploadType(), 1)) {
+//            resourceUrl = imgUploadUtil.getResourceUrl();
+//        }
+        for (String img : imgs) {
+            Matcher matcher = pattern.matcher(img);
+            //若图片以http或https开头，直接返回
+            if (matcher.find()){
+                sb.append(img).append(StrUtil.COMMA);
+            }else {
+                sb.append(resourceUrl).append(img).append(StrUtil.COMMA);
+            }
+        }
+        sb.deleteCharAt(sb.length()-1);
+        gen.writeString(sb.toString());
+    }
+}

tashow-framework/tashow-common/src/main/java/com/tashow/cloud/common/util/json/databind/StringLocalDateTimeSerializer.java

@@ -0,0 +1,27 @@
+package com.tashow.cloud.common.util.json.databind;
+
+import cn.hutool.core.date.DatePattern;
+import cn.hutool.core.date.LocalDateTimeUtil;
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.databind.JsonSerializer;
+import com.fasterxml.jackson.databind.SerializerProvider;
+
+import java.io.IOException;
+import java.time.LocalDateTime;
+
+/**
+ * 基于字符串的 LocalDateTime 序列化器
+ *
+ * @author 老五
+ */
+public class StringLocalDateTimeSerializer extends JsonSerializer<LocalDateTime> {
+
+    public static final StringLocalDateTimeSerializer INSTANCE = new StringLocalDateTimeSerializer();
+
+    @Override
+    public void serialize(LocalDateTime value, JsonGenerator gen, SerializerProvider serializers) throws IOException {
+        // 将 LocalDateTime 对象，转换为 Long 时间戳
+        gen.writeString(LocalDateTimeUtil.format(value, DatePattern.NORM_DATETIME_FORMATTER) );
+    }
+
+}

tashow-framework/tashow-data-mybatis/src/main/java/com/tashow/cloud/mybatis/mybatis/core/mapper/BaseMapperX.java

@@ -29,7 +29,7 @@ import java.util.List;
  * 1. {@link BaseMapper} 为 MyBatis Plus 的基础接口，提供基础的 CRUD 能力
  * 2. {@link MPJBaseMapper} 为 MyBatis Plus Join 的基础接口，提供连表 Join 能力
  */
-public interface BaseMapperX<T> extends MPJBaseMapper<T> {
+public interface BaseMapperX<T> extends MPJBaseMapper<T>,BaseMapper<T> {
 
     default PageResult<T> selectPage(SortablePageParam pageParam, @Param("ew") Wrapper<T> queryWrapper) {
         return selectPage(pageParam, pageParam.getSortingFields(), queryWrapper);

tashow-framework/tashow-framework-env/src/main/java/com/tashow/cloud/env/config/EnvEnvironmentPostProcessor.java

@@ -33,7 +33,7 @@ public class EnvEnvironmentPostProcessor implements EnvironmentPostProcessor {
             environment.getSystemProperties().put(hostNameKey, EnvUtils.getHostName());
         }
 
-        // 1.1 如果没有 yudao.env.tag 配置项，则不进行配置项的修改
+        // 1.1 如果没有 tashow.env.tag 配置项，则不进行配置项的修改
         String tag = EnvUtils.getTag(environment);
         if (StrUtil.isEmpty(tag)) {
             return;

tashow-framework/tashow-framework-security/src/main/java/com/tashow/cloud/security/security/config/SecurityProperties.java

@@ -9,7 +9,7 @@ import jakarta.validation.constraints.NotNull;
 import java.util.Collections;
 import java.util.List;
 
-@ConfigurationProperties(prefix = "yudao.security")
+@ConfigurationProperties(prefix = "tashow.security")
 @Validated
 @Data
 public class SecurityProperties {

tashow-framework/tashow-framework-security/src/main/java/com/tashow/cloud/security/security/config/WebSecurityConfigurerAdapter.java

@@ -136,9 +136,12 @@ public class WebSecurityConfigurerAdapter {
                     .requestMatchers(HttpMethod.DELETE, permitAllUrls.get(HttpMethod.DELETE).toArray(new String[0])).permitAll()
                     .requestMatchers(HttpMethod.HEAD, permitAllUrls.get(HttpMethod.HEAD).toArray(new String[0])).permitAll()
                     .requestMatchers(HttpMethod.PATCH, permitAllUrls.get(HttpMethod.PATCH).toArray(new String[0])).permitAll()
-                    // 1.3 基于 yudao.security.permit-all-urls 无需认证
+                    // 1.3 基于 tashow.security.permit-all-urls 无需认证
                     .requestMatchers(securityProperties.getPermitAllUrls().toArray(new String[0])).permitAll()
+
                 )
+                //app-api 不在security控制权限
+                .authorizeHttpRequests(c->c.requestMatchers(webProperties.getAppApi().getPrefix()+"/**").permitAll())
                 // ②：每个项目的自定义规则
                 .authorizeHttpRequests(c -> authorizeRequestsCustomizers.forEach(customizer -> customizer.customize(c)))
                 // ③：兜底规则，必须认证

tashow-framework/tashow-framework-tenant/src/main/java/com/tashow/cloud/tenant/config/TenantAutoConfiguration.java

@@ -8,7 +8,6 @@ import com.tashow.cloud.redis.config.TashowCacheProperties;
 import com.tashow.cloud.systemapi.api.tenant.TenantApi;
 import com.tashow.cloud.tenant.core.aop.TenantIgnoreAspect;
 import com.tashow.cloud.tenant.core.db.TenantDatabaseInterceptor;
-import com.tashow.cloud.tenant.core.job.TenantJobAspect;
 import com.tashow.cloud.tenant.core.mq.rabbitmq.TenantRabbitMQInitializer;
 import com.tashow.cloud.tenant.core.redis.TenantRedisCacheManager;
 import com.tashow.cloud.tenant.core.security.TenantSecurityWebFilter;
@@ -86,14 +85,6 @@ public class TenantAutoConfiguration {
         return registrationBean;
     }
 
-    // ========== Job ==========
-
-    @Bean
-    @ConditionalOnClass(name = "com.xxl.job.core.handler.annotation.XxlJob")
-    public TenantJobAspect tenantJobAspect(TenantFrameworkService tenantFrameworkService) {
-        return new TenantJobAspect(tenantFrameworkService);
-    }
-
 
     @Bean
     @ConditionalOnClass(name = "org.springframework.amqp.rabbit.core.RabbitTemplate")

tashow-framework/tashow-framework-tenant/src/main/java/com/tashow/cloud/tenant/config/TenantRpcAutoConfiguration.java

@@ -2,14 +2,13 @@ package com.tashow.cloud.tenant.config;
 
 import com.tashow.cloud.systemapi.api.tenant.TenantApi;
 import com.tashow.cloud.tenant.core.rpc.TenantRequestInterceptor;
-import com.tashow.cloud.tenant.core.rpc.TenantRequestInterceptor;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.context.annotation.Bean;
 
 @AutoConfiguration
-@ConditionalOnProperty(prefix = "tashow.tenant", value = "enable", matchIfMissing = true) // 允许使用 yudao.tenant.enable=false 禁用多租户
+@ConditionalOnProperty(prefix = "tashow.tenant", value = "enable", matchIfMissing = true)
 @EnableFeignClients(clients = TenantApi.class) // 主要是引入相关的 API 服务
 public class TenantRpcAutoConfiguration {
 

tashow-framework/tashow-framework-tenant/src/main/java/com/tashow/cloud/tenant/core/context/TenantContextHolder.java

@@ -1,7 +1,6 @@
 package com.tashow.cloud.tenant.core.context;
 
 import com.alibaba.ttl.TransmittableThreadLocal;
-import com.tashow.cloud.common.enums.DocumentEnum;
 
 /**
  * 多租户上下文 Holder
@@ -37,8 +36,7 @@ public class TenantContextHolder {
     public static Long getRequiredTenantId() {
         Long tenantId = getTenantId();
         if (tenantId == null) {
-            throw new NullPointerException("TenantContextHolder 不存在租户编号！可参考文档："
+            throw new NullPointerException("TenantContextHolder 不存在租户编号！");
-                + DocumentEnum.TENANT.getUrl());
         }
         return tenantId;
     }

tashow-framework/tashow-framework-tenant/src/main/java/com/tashow/cloud/tenant/core/job/TenantJob.java

@@ -1,14 +0,0 @@
-package com.tashow.cloud.tenant.core.job;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * 多租户 Job 注解
- */
-@Target({ElementType.METHOD})
-@Retention(RetentionPolicy.RUNTIME)
-public @interface TenantJob {
-}

tashow-framework/tashow-framework-tenant/src/main/java/com/tashow/cloud/tenant/core/job/TenantJobAspect.java

@@ -1,75 +0,0 @@
-package com.tashow.cloud.tenant.core.job;
-
-import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.exceptions.ExceptionUtil;
-import cn.hutool.core.util.StrUtil;
-import com.tashow.cloud.common.util.json.JsonUtils;
-import com.tashow.cloud.tenant.core.service.TenantFrameworkService;
-import com.tashow.cloud.tenant.core.util.TenantUtils;
-import com.xxl.job.core.context.XxlJobContext;
-import com.xxl.job.core.context.XxlJobHelper;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.exception.ExceptionUtils;
-import org.aspectj.lang.ProceedingJoinPoint;
-import org.aspectj.lang.annotation.Around;
-import org.aspectj.lang.annotation.Aspect;
-
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.atomic.AtomicBoolean;
-
-/**
- * 多租户 JobHandler AOP
- * 任务执行时，会按照租户逐个执行 Job 的逻辑
- *
- * 注意，需要保证 JobHandler 的幂等性。因为 Job 因为某个租户执行失败重试时，之前执行成功的租户也会再次执行。
- *
- * @author 芋道源码
- */
-@Aspect
-@RequiredArgsConstructor
-@Slf4j
-public class TenantJobAspect {
-
-    private final TenantFrameworkService tenantFrameworkService;
-
-    @Around("@annotation(tenantJob)")
-    public void around(ProceedingJoinPoint joinPoint, TenantJob tenantJob) {
-        // 获得租户列表
-        List<Long> tenantIds = tenantFrameworkService.getTenantIds();
-        if (CollUtil.isEmpty(tenantIds)) {
-            return;
-        }
-
-        // 逐个租户，执行 Job
-        Map<Long, String> results = new ConcurrentHashMap<>();
-        AtomicBoolean success = new AtomicBoolean(true); // 标记，是否存在失败的情况
-        XxlJobContext xxlJobContext = XxlJobContext.getXxlJobContext(); // XXL-Job 上下文
-        tenantIds.parallelStream().forEach(tenantId -> {
-            // TODO 芋艿：先通过 parallel 实现并行；1）多个租户，是一条执行日志；2）异常的情况
-            TenantUtils.execute(tenantId, () -> {
-                try {
-                    XxlJobContext.setXxlJobContext(xxlJobContext);
-                    // 执行 Job
-                    Object result = joinPoint.proceed();
-                    results.put(tenantId, StrUtil.toStringOrEmpty(result));
-                } catch (Throwable e) {
-                    results.put(tenantId, ExceptionUtil.getRootCauseMessage(e));
-                    success.set(false);
-                    // 打印异常
-                    XxlJobHelper.log(StrUtil.format("[多租户({}) 执行任务({})，发生异常：{}]",
-                            tenantId, joinPoint.getSignature(), ExceptionUtils.getStackTrace(e)));
-                }
-            });
-        });
-        // 记录执行结果
-        if (success.get()) {
-            XxlJobHelper.handleSuccess(JsonUtils.toJsonString(results));
-        } else {
-            XxlJobHelper.handleFail(JsonUtils.toJsonString(results));
-        }
-    }
-
-}

tashow-framework/tashow-framework-web/pom.xml

@@ -27,6 +27,15 @@
             <optional>true</optional>
         </dependency>
 
+        <dependency>
+            <groupId>com.github.xingfudeshi</groupId>
+            <artifactId>knife4j-openapi3-jakarta-spring-boot-starter</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springdoc</groupId>
+            <artifactId>springdoc-openapi-starter-webmvc-api</artifactId>
+        </dependency>
+
         <!-- Web 相关 -->
         <dependency>
             <groupId>org.springframework.boot</groupId>

tashow-framework/tashow-framework-web/src/main/java/com/tashow/cloud/web/web/config/WebAutoConfiguration.java

@@ -3,7 +3,6 @@ package com.tashow.cloud.web.web.config;
 import com.tashow.cloud.common.enums.WebFilterOrderEnum;
 import com.tashow.cloud.infraapi.api.logger.ApiErrorLogApi;
 import com.tashow.cloud.web.web.core.filter.CacheRequestBodyFilter;
-import com.tashow.cloud.web.web.core.filter.DemoFilter;
 import com.tashow.cloud.web.web.core.handler.GlobalExceptionHandler;
 import com.tashow.cloud.web.web.core.handler.GlobalResponseBodyHandler;
 import com.tashow.cloud.web.web.core.util.WebFrameworkUtils;
@@ -12,7 +11,6 @@ import jakarta.servlet.Filter;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.autoconfigure.web.client.RestTemplateAutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.boot.web.client.RestTemplateBuilder;
@@ -53,8 +51,10 @@ public class WebAutoConfiguration implements WebMvcConfigurer {
      */
     private void configurePathMatch(PathMatchConfigurer configurer, WebProperties.Api api) {
         AntPathMatcher antPathMatcher = new AntPathMatcher(".");
-        configurer.addPathPrefix(api.getPrefix(), clazz -> clazz.isAnnotationPresent(RestController.class)
+        configurer.addPathPrefix(api.getPrefix(),
-                && antPathMatcher.match(api.getController(), clazz.getPackage().getName())); // 仅仅匹配 controller 包
+                clazz -> clazz.isAnnotationPresent(RestController.class)
+                && antPathMatcher.match(api.getController(), clazz.getPackage().getName())
+        ); // 仅仅匹配 controller 包
     }
 
     @Bean
@@ -102,15 +102,6 @@ public class WebAutoConfiguration implements WebMvcConfigurer {
         return createFilterBean(new CacheRequestBodyFilter(), WebFilterOrderEnum.REQUEST_BODY_CACHE_FILTER);
     }
 
-    /**
-     * 创建 DemoFilter Bean，演示模式
-     */
-    @Bean
-    @ConditionalOnProperty(value = "yudao.demo", havingValue = "true")
-    public FilterRegistrationBean<DemoFilter> demoFilter() {
-        return createFilterBean(new DemoFilter(), WebFilterOrderEnum.DEMO_FILTER);
-    }
-
     public static <T extends Filter> FilterRegistrationBean<T> createFilterBean(T filter, Integer order) {
         FilterRegistrationBean<T> bean = new FilterRegistrationBean<>(filter);
         bean.setOrder(order);

tashow-framework/tashow-framework-web/src/main/java/com/tashow/cloud/web/web/core/filter/DemoFilter.java

@@ -1,35 +0,0 @@
-package com.tashow.cloud.web.web.core.filter;
-
-import cn.hutool.core.util.StrUtil;
-import com.tashow.cloud.common.pojo.CommonResult;
-import com.tashow.cloud.common.util.servlet.ServletUtils;
-import com.tashow.cloud.web.web.core.util.WebFrameworkUtils;
-import jakarta.servlet.FilterChain;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
-import org.springframework.web.filter.OncePerRequestFilter;
-
-import static com.tashow.cloud.common.exception.enums.GlobalErrorCodeConstants.DEMO_DENY;
-
-
-/**
- * 演示 Filter，禁止用户发起写操作，避免影响测试数据
- *
- * @author 芋道源码
- */
-public class DemoFilter extends OncePerRequestFilter {
-
-    @Override
-    protected boolean shouldNotFilter(HttpServletRequest request) {
-        String method = request.getMethod();
-        return !StrUtil.equalsAnyIgnoreCase(method, "POST", "PUT", "DELETE")  // 写操作时，不进行过滤率
-                || WebFrameworkUtils.getLoginUserId(request) == null; // 非登录用户时，不进行过滤
-    }
-
-    @Override
-    protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain chain) {
-        // 直接返回 DEMO_DENY 的结果。即，请求不继续
-        ServletUtils.writeJSON(response, CommonResult.error(DEMO_DENY));
-    }
-
-}

tashow-framework/tashow-framework-web/src/main/java/com/tashow/cloud/web/xss/config/TashowXssAutoConfiguration.java

@@ -22,8 +22,8 @@ import static com.tashow.cloud.web.web.config.WebAutoConfiguration.createFilterB
 
 @AutoConfiguration
 @EnableConfigurationProperties(XssProperties.class)
-@ConditionalOnProperty(prefix = "yudao.xss", name = "enable", havingValue = "true", matchIfMissing = true) // 设置为 false 时，禁用
+@ConditionalOnProperty(prefix = "tashow.xss", name = "enable", havingValue = "true", matchIfMissing = true) // 设置为 false 时，禁用
-public class YudaoXssAutoConfiguration implements WebMvcConfigurer {
+public class TashowXssAutoConfiguration implements WebMvcConfigurer {
 
     /**
      * Xss 清理者

tashow-framework/tashow-framework-web/src/main/java/com/tashow/cloud/web/xss/config/XssProperties.java

@@ -12,7 +12,7 @@ import java.util.List;
  *
  * @author 芋道源码
  */
-@ConfigurationProperties(prefix = "yudao.xss")
+@ConfigurationProperties(prefix = "tashow.xss")
 @Validated
 @Data
 public class XssProperties {

tashow-gateway/pom.xml

@@ -61,7 +61,6 @@
 
     </dependencies>
 
-
     <build>
         <!-- 设置构建的 jar 包名 -->
         <finalName>${project.artifactId}</finalName>

tashow-gateway/src/main/java/com/tashow/cloud/gateway/GatewayServerApplication.java

@@ -8,6 +8,7 @@ public class GatewayServerApplication {
     public static void main(String[] args) {
         // 启动 Spring Boot 应用
         SpringApplication.run(GatewayServerApplication.class, args);
+        System.out.println("网关启动成功");
     }
 
 }

tashow-gateway/src/main/resources/application-local.yaml

@@ -3,9 +3,9 @@
 spring:
   cloud:
     nacos:
-      server-addr: localhost:8848 # Nacos 服务器地址
+      server-addr: 43.139.42.137:8848 # Nacos 服务器地址
-      username:  # Nacos 账号
+      username: nacos # Nacos 账号
-      password:  # Nacos 密码
+      password: nacos # Nacos 密码
       discovery: # 【配置中心】配置项
         namespace: dev # 命名空间。这里使用 dev 开发环境
         group: DEFAULT_GROUP # 使用的 Nacos 配置分组，默认为 DEFAULT_GROUP

tashow-module/pom.xml

@@ -15,9 +15,11 @@
         <module>tashow-module-infra</module>
         <module>tashow-module-app</module>
         <module>tashow-module-product</module>
+        <module>tashow-module-ai</module>
         <module>tashow-module-pay</module>
         <module>tashow-module-trade</module>
-        <module>tashow-module-member</module>
+        <module>tashow-module-user</module>
+        <module>tashow-module-file</module>
     </modules>
 
 </project>