添加订单sql文件

.cursor/rules/1.mdc

@@ -1,48 +0,0 @@
----
-description: 
-globs: 
-alwaysApply: false
----
----
-description: 
-globs: 
-alwaysApply: false
----
-
-# Your rule content
-#角色
-你是一名精通开发的高级工程师，拥有10年以上的应用开发经验，熟悉*等开发工具和技术栈。
-你的任务是帮助用户设计和开发易用且易于推护的 *** 应用。始终遵循最佳实践，并坚持干净代码和健壮架构的原则。
-
-#目标
-你的目标是以用户容易理解的方式帮助他们完成“应用的设计和开发工作，确保应用功能完善、性能优异、用户体验良好。
-
-#要求
-在理解用户需求、设计UI、编写代码、解决问题和项目选代优化时，你应该始终遵循以下原则:
-
-
-##需求理解
--充分理解用户需求，站在用户角度思考，分析需求是否存在缺漏，并与用户讨论完善需求;
--选择最简单的解决方案来满足用户需求，避免过度设计。
-##UI和样式设计
--使用现代UI框架进行样式设计(例如***，这里可以根据不同开发项目仔纽展开，比如使用哪些视觉规范或者UI框架，没有的话也可以不用过多展开);
--在不同平台上实现一致的设计和响应式模式
-##代码编写
-技术选型:根据项目需求选择合适的技术栈(例如***，这里需要仔细展开，比如介招某个技术栈用在什么地方，以及要遵循什么最佳实践)
-代码结构:强调代码的清晰性、模块化、可维护性，遵循最佳实践(如DRY原则、最小权限原则、响应式设计等)
--代码安全性:在编写代码时，始终考虑安全性，避免引入漏洞，确保用户输入的安全处理
--性能优化:优化代码的性能，减少资源占用，提升加载速度，确保项目的高效运行
--测试与文档:编写单元测试，确保代码的健壮性，并提供清晰的中文注释和文档。方便后续阅读和维护
-##问题解决
--全面阅读相关代码，理解***应用的工作原理
--根据用户的反馈分析问题的原因，提出解决问题的思路
--确保每次代码变更不会破坏现有功能，且尽可能保持最小的改动
-##迭代优化
-与用户保持密切沟通，根据反读调整功能和设计，确保应用符合用户需求
-在不确定需求时，主动询问用户以澄清需求或技术细节
-##方法论
--系统2思维:以分析严谨的方式解决问题。将需求分解为更小、可管理的部分，并在实施前仔细考虑每一步
-思维树:评估多种可能的解决方案及其后果。使用结构化的方法探索不同的路径。并选择最优的解决方案
--选代改进:在最终确定代码之前，考虑改进、边缘情况和优化。通过潜在增强的迭代，确保最终解决方案是健壮的
-
-

.gitignore

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

.lingma/rules/project_rule.md

@@ -1,2 +0,0 @@
-**添加规则文件可帮助模型精准理解你的编码偏好，如框架、代码风格等**
-**规则文件只对当前工程生效，单文件限制10000字符。如果无需将该文件提交到远程 Git 仓库，请将其添加到 .gitignore**

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/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,6 +152,11 @@
                 <artifactId>tashow-data-permission</artifactId>
                 <version>${revision}</version>
             </dependency>
+            <dependency>
+                <groupId>com.tashow.cloud</groupId>
+                <artifactId>tashow-sdk-file</artifactId>
+                <version>${revision}</version>
+            </dependency>
 
             <!-- Spring 核心 -->
             <dependency>
@@ -397,6 +404,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/tashow-infra-api/src/main/java/com/tashow/cloud/infraapi/api/file/FileApi.java

@@ -9,8 +9,10 @@ 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";
@@ -52,7 +54,9 @@ public interface FileApi {
                 .getCheckedData();
     }
 
+    /**
+     * 保存文件，并返回文件的访问路径
+     */
     @PostMapping(PREFIX + "/create")
-  /** 保存文件，并返回文件的访问路径 */
     CommonResult<String> createFile(@Valid @RequestBody FileCreateReqDTO createReqDTO);
 }

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

@@ -29,6 +29,11 @@
 			<optional>true</optional>
 		</dependency>
 
+		<dependency>
+			<groupId>jakarta.validation</groupId>
+			<artifactId>jakarta.validation-api</artifactId>
+		</dependency>
+
 		<!-- RPC 远程调用相关 -->
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
@@ -40,6 +45,46 @@
 			<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 -->
+		<dependency>
+			<groupId>io.swagger.core.v3</groupId>
+			<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/CategoryApi.java

@@ -0,0 +1,24 @@
+package com.tashow.cloud.productapi.api.product;
+
+import com.tashow.cloud.productapi.api.product.dto.CategoryDO;
+import com.tashow.cloud.productapi.api.product.dto.CategoryDto;
+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 CategoryApi {
+
+  String PREFIX = ApiConstants.PREFIX + "/category";
+
+  /** 根据参数键查询参数值 */
+  @GetMapping(PREFIX + "/categoryList")
+  List<CategoryDO> categoryList(@RequestParam(value = "grade", required = false) Integer grade,
+                                @RequestParam(value = "categoryId", required = false) Long categoryId,
+                                @RequestParam(value = "categoryName", required = false) String categoryName,
+                                @RequestParam(value = "status", required = false) Integer status);
+}

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

@@ -1,11 +1,14 @@
-package com.tashow.cloud.product.dto;
+package com.tashow.cloud.productapi.api.product.dto;
 
-import lombok.*;
-import java.util.*;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.*;
 import com.tashow.cloud.mybatis.mybatis.core.dataobject.BaseDO;
+import com.tashow.cloud.productapi.general.StringListTypeHandler;
+import lombok.*;
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.util.List;
 
 /**
  * 产品类目 DO
@@ -35,6 +38,12 @@ public class CategoryDO extends BaseDO {
      * 父节点
      */
     private Long parentId;
+
+    /**
+     * 父节名称
+     */
+    private String parentName;
+
     /**
      * 产品类目名称
      */
@@ -54,11 +63,12 @@ public class CategoryDO extends BaseDO {
     /**
      * 标签
      */
-    private String tag;
+    @TableField(typeHandler = StringListTypeHandler.class)
+    private List<String> tag;
     /**
      * 排序
      */
-    private Integer seq;
+    private Integer sort;
     /**
      * 默认是1，表示正常状态,0为下线状态
      */
@@ -68,4 +78,6 @@ public class CategoryDO extends BaseDO {
      */
     private Integer grade;
 
+
+
 }

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

@@ -0,0 +1,72 @@
+package com.tashow.cloud.productapi.api.product.dto;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.tashow.cloud.productapi.general.StringListTypeHandler;
+import lombok.*;
+
+import java.util.List;
+
+/**
+ * 产品类目 DO
+ *
+ * @author 芋道源码
+ */
+@Data
+
+public class CategoryDto {
+
+    /**
+     * 类目ID
+     */
+    private Long categoryId;
+    /**
+     * 店铺ID
+     */
+    private Long shopId;
+    /**
+     * 父节点
+     */
+    private Long parentId;
+
+    /**
+     * 父节名称
+     */
+    private String parentName;
+
+    /**
+     * 产品类目名称
+     */
+    private String categoryName;
+    /**
+     * 类目图标
+     */
+    private String icon;
+    /**
+     * 类目的显示图片
+     */
+    private String pic;
+    /**
+     * 类目描述
+     */
+    private String description;
+    /**
+     * 标签
+     */
+    @TableField(typeHandler = StringListTypeHandler.class)
+    private List<String> tag;
+    /**
+     * 排序
+     */
+    private Integer sort;
+    /**
+     * 默认是1，表示正常状态,0为下线状态
+     */
+    private Integer status;
+    /**
+     * 分类层级 1、2、3级
+     */
+    private Integer grade;
+
+
+
+}

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

@@ -1,12 +1,15 @@
-package com.tashow.cloud.product.dto;
+package com.tashow.cloud.productapi.api.product.dto;
 
-import lombok.*;
+import com.baomidou.mybatisplus.annotation.KeySequence;
-import java.util.*;
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.*;
 import com.tashow.cloud.mybatis.mybatis.core.dataobject.BaseDO;
+import com.tashow.cloud.productapi.general.StringListTypeHandler;
+import lombok.*;
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.math.BigDecimal;
+import java.util.List;
 
 /**
  * 特殊日期附加费用规则 DO
@@ -40,14 +43,22 @@ public class ProdAdditionalFeeDatesDO extends BaseDO {
      * 日期类型0：'自定义日期范围':1：'指定日期':2：'法定节假日',3：'固定休息日'
      */
     private Integer dateType;
+
     /**
-     * 自定义日期时间段（JSON格式存储）
+     * 类型：1：特殊日期 2：可预约时段黑名单日期 3：紧急相应服务黑名单日期
      */
-    private String customTimeSlots;
+    private Integer type;
+
     /**
-     * 指定日期（JSON格式存储）
+     * 日期
      */
-    private String specificDates;
+    @TableField(typeHandler = StringListTypeHandler.class)
+    private List<String> customTimeSlots;
+/*    *//**
+     * 指定日期
+     *//*
+    @TableField(typeHandler = StringListTypeHandler.class)
+    private List<String> specificDates;*/
     /**
      * 收费方式0：''固定金额'':1：''基准价上浮
      */
@@ -60,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

@@ -1,14 +1,16 @@
-package com.tashow.cloud.product.dto;
+package com.tashow.cloud.productapi.api.product.dto;
 
-import lombok.*;
-import java.util.*;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.*;
 import com.tashow.cloud.mybatis.mybatis.core.dataobject.BaseDO;
+import com.tashow.cloud.productapi.general.StringListTypeHandler;
+import lombok.*;
 
+import java.math.BigDecimal;
+import java.util.List;
+
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 /**
  * 特殊时段附加费用规则 DO
  *
@@ -38,9 +40,10 @@ public class ProdAdditionalFeePeriodsDO extends BaseDO {
      */
     private String name;
     /**
-     * 特殊时段设置（JSON格式存储）
+     * 特殊时段设置
      */
-    private String specialTimeSlots;
+    @TableField(typeHandler = StringListTypeHandler.class)
+    private List<String> specialTimeSlots;
     /**
      * 收费方式0:'固定金额',1:'基准价上浮'
      */
@@ -53,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/ProdDO.java

@@ -1,13 +1,15 @@
-package com.tashow.cloud.product.dto;
+package com.tashow.cloud.productapi.api.product.dto;
 
-import com.tashow.cloud.productapi.general.StringListTypeHandler;
+import com.baomidou.mybatisplus.annotation.KeySequence;
-import io.swagger.v3.oas.annotations.media.Schema;
+import com.baomidou.mybatisplus.annotation.TableField;
-import lombok.*;
+import com.baomidou.mybatisplus.annotation.TableId;
-import java.util.*;
+import com.baomidou.mybatisplus.annotation.TableName;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.*;
 import com.tashow.cloud.mybatis.mybatis.core.dataobject.BaseDO;
+import com.tashow.cloud.productapi.general.StringListTypeHandler;
+import lombok.*;
+
+import java.util.Date;
+import java.util.List;
 
 /**
  * 商品 DO
@@ -110,9 +112,15 @@ public class ProdDO extends BaseDO {
      */
     private Integer status;
     /**
-     * 商品分类
+     * 商品分类id
      */
     private Long categoryId;
+
+    /**
+     * 商品分类名称
+     */
+    private String categoryName;
+
     /**
      * 销量
      */
@@ -162,4 +170,9 @@ public class ProdDO extends BaseDO {
      */
     private Integer top;
 
+    /**
+     * 删除时间
+     */
+    private Date deleteTime;
+
 }

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

@@ -1,11 +1,14 @@
-package com.tashow.cloud.product.dto;
+package com.tashow.cloud.productapi.api.product.dto;
 
-import lombok.*;
-import java.util.*;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.*;
 import com.tashow.cloud.mybatis.mybatis.core.dataobject.BaseDO;
+import com.tashow.cloud.productapi.general.StringListTypeHandler;
+import lombok.*;
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.util.List;
 
 /**
  * 商品紧急响应服务设置 DO
@@ -32,24 +35,9 @@ public class ProdEmergencyResponseDO extends BaseDO {
      */
     private Long prodId;
     /**
-     * 可响应时间段（JSON格式存储）
+     * 可响应时间段
      */
-    private String responseTimeSlots;
+    @TableField(typeHandler = StringListTypeHandler.class)
-    /**
+    private List<String> responseTimeSlots;
-     * 黑名自定义日期（JSON格式存储）
-     */
-    private String blacklistedDates;
-    /**
-     * 黑名单指定日期（JSON格式存储）
-     */
-    private 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

@@ -1,14 +1,13 @@
-package com.tashow.cloud.product.dto;
+package com.tashow.cloud.productapi.api.product.dto;
 
-import lombok.*;
-import java.util.*;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.*;
 import com.tashow.cloud.mybatis.mybatis.core.dataobject.BaseDO;
+import lombok.*;
 
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 /**
  * 紧急响应时间区间设置 DO
  *
@@ -34,13 +33,18 @@ public class ProdEmergencyResponseIntervalsDO extends BaseDO {
      */
     private Long configId;
     /**
-     * 响应模式名称
+     * 商品ID
      */
-    private String modeName;
+    private Long prodId;
+
+    /**
+     * 响应模式名称modeName
+     */
+    private String name;
     /**
      * 响应时间（小时）
      */
-    private Integer responseHours;
+    private BigDecimal responseHours;
     /**
      * 收费模式0：固定收费 1：浮动收费
      */
@@ -54,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

@@ -1,11 +1,13 @@
-package com.tashow.cloud.product.dto;
+package com.tashow.cloud.productapi.api.product.dto;
 
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.*;
 import com.baomidou.mybatisplus.annotation.KeySequence;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.*;
-
 /**
  * 属性规则 DO
  *
@@ -39,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/ProdPropDO.java

@@ -1,10 +1,15 @@
-package com.tashow.cloud.product.dto;
+package com.tashow.cloud.productapi.api.product.dto;
 
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.tashow.cloud.productapi.api.product.dto.ProdPropValueDO;
 import lombok.*;
-import java.util.*;
-import com.baomidou.mybatisplus.annotation.*;
-import com.tashow.cloud.mybatis.mybatis.core.dataobject.BaseDO;
 
+import java.util.List;
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 /**
  * 商品属性 DO
  *

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

@@ -1,9 +1,12 @@
-package com.tashow.cloud.product.dto;
+package com.tashow.cloud.productapi.api.product.dto;
 
 import lombok.*;
-import java.util.*;
+import com.baomidou.mybatisplus.annotation.KeySequence;
-import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.annotation.TableField;
-import com.tashow.cloud.mybatis.mybatis.core.dataobject.BaseDO;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.util.Date;
 
 /**
  * 属性规则 DO
@@ -59,4 +62,8 @@ public class ProdPropValueDO {
     @TableField(exist=false)
     private Integer isExist;
 
+    /**
+     * 删除时间
+     */
+    private Date deleteTime;
 }

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

@@ -1,11 +1,15 @@
-package com.tashow.cloud.product.dto;
+package com.tashow.cloud.productapi.api.product.dto;
 
-import lombok.*;
-import java.util.*;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.*;
 import com.tashow.cloud.mybatis.mybatis.core.dataobject.BaseDO;
+import com.tashow.cloud.productapi.api.product.vo.prodreservationconfig.TimeBookVO;
+import com.tashow.cloud.productapi.general.StringListTypeHandler;
+import lombok.*;
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.util.List;
 
 /**
  * 商品预约配置 DO
@@ -32,9 +36,10 @@ public class ProdReservationConfigDO extends BaseDO {
      */
     private Long prodId;
     /**
-     * 预约时段设置（JSON格式存储）
+     * 预约时段设置
      */
-    private String reservationTimeSlots;
+    @TableField(typeHandler = StringListTypeHandler.class)
+    private List<String> reservationTimeSlots;
     /**
      * 需提前多少小时预约
      */
@@ -47,6 +52,12 @@ public class ProdReservationConfigDO extends BaseDO {
      * 是否允许更改预约时间 1可以 0不可以
      */
     private Integer allowChange;
+
+    /**
+     * 时间段
+     */
+    private Integer timeSlot;
+
     /**
      * 更改预约时间的时间规则（如服务开始前1小时可更改）
      */
@@ -56,31 +67,21 @@ public class ProdReservationConfigDO extends BaseDO {
      */
     private Integer maxChangeTimes;
     /**
-     * 黑名自定义日期（JSON格式存储）
+     * 预约时间区间设置
      */
-    private String blacklistedDates;
+    @TableField(exist=false)
-
+    private TimeBookVO timeBook;
-    /**
-     * '是否开启黑名单自定义0关1开'
-     */
-    private Integer isBlacklisted;
-
-    /**
-     * '是否开启黑名单指定日期0关1开'
-     */
-    private Integer isBlackAppoint;
-
-    /**
-     * 黑名单指定日期（JSON格式存储）
-     */
-    private String blackAppointDates;
-    /**
-     * 法定节假日是否开启0:关闭1开启
-     */
-    private Integer blackHappy;
-    /**
-     * 固定休息日周末是否开启0关闭1开启
-     */
-    private Integer blackWeekend;
 
+    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;
+    }
 }

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

@@ -1,10 +1,10 @@
-package com.tashow.cloud.product.dto;
+package com.tashow.cloud.productapi.api.product.dto;
 
 import lombok.*;
-import java.util.*;
+import com.baomidou.mybatisplus.annotation.KeySequence;
-import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.annotation.TableField;
-import com.tashow.cloud.mybatis.mybatis.core.dataobject.BaseDO;
+import com.baomidou.mybatisplus.annotation.TableId;
-
+import com.baomidou.mybatisplus.annotation.TableName;
 /**
  * 商品与服务区域关联 DO
  *

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

@@ -1,11 +1,11 @@
-package com.tashow.cloud.product.dto;
+package com.tashow.cloud.productapi.api.product.dto;
 
-import lombok.*;
-import java.util.*;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.*;
 import com.tashow.cloud.mybatis.mybatis.core.dataobject.BaseDO;
-
+import lombok.*;
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 /**
  * 服务区域 DO
  *

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

@@ -1,13 +1,13 @@
-package com.tashow.cloud.product.dto;
+package com.tashow.cloud.productapi.api.product.dto;
 
-import lombok.*;
-import java.util.*;
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.*;
 import com.tashow.cloud.mybatis.mybatis.core.dataobject.BaseDO;
+import lombok.*;
 
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 /**
  * 超区规则 DO
  *

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

@@ -1,11 +1,11 @@
-package com.tashow.cloud.product.dto;
+package com.tashow.cloud.productapi.api.product.dto;
 
-import lombok.*;
-import java.util.*;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.*;
 import com.tashow.cloud.mybatis.mybatis.core.dataobject.BaseDO;
-
+import lombok.*;
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 /**
  * 商品和标签管理 DO
  *

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

@@ -1,13 +1,13 @@
-package com.tashow.cloud.product.dto;
+package com.tashow.cloud.productapi.api.product.dto;
 
-import lombok.*;
-import java.util.*;
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.*;
 import com.tashow.cloud.mybatis.mybatis.core.dataobject.BaseDO;
+import lombok.*;
 
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 /**
  * 体重区间价格 DO
  *
@@ -41,7 +41,7 @@ public class ProdWeightRangePricesDO extends BaseDO {
      */
     private BigDecimal price;
     /**
-     * 是否启用该规则0否1是
+     * 是否收费0否1是
      */
     private Integer isEnabled;
 

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

@@ -1,12 +1,11 @@
-package com.tashow.cloud.product.dto;
+package com.tashow.cloud.productapi.api.product.dto;
 
-import lombok.*;
-import java.util.*;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.*;
 import com.tashow.cloud.mybatis.mybatis.core.dataobject.BaseDO;
-
+import lombok.*;
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 /**
  * 商品接单上限设置 DO
  *

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

@@ -1,14 +1,13 @@
-package com.tashow.cloud.product.dto;
+package com.tashow.cloud.productapi.api.product.dto;
 
-import lombok.*;
-import java.util.*;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.*;
 import com.tashow.cloud.mybatis.mybatis.core.dataobject.BaseDO;
+import lombok.*;
 
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 /**
  * 店铺信息 DO
  *

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

@@ -1,17 +1,14 @@
-package com.tashow.cloud.product.dto;
+package com.tashow.cloud.productapi.api.product.dto;
 
-import lombok.*;
-import java.util.*;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.*;
 import com.tashow.cloud.mybatis.mybatis.core.dataobject.BaseDO;
+import lombok.*;
 
+import java.math.BigDecimal;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 /**
  * 单品SKU DO
  *
@@ -90,9 +87,21 @@ public class SkuDO extends BaseDO {
      */
     private String overview;
     /**
-     * 库存(-1代表无限库存)
+     * 库存
      */
     private Integer stocks;
+
+
+    /**
+     * 总库存是0 无线库存是1
+     */
+    private Integer stocksFlg;
+
+    /**
+     * 锁定库存数
+     */
+    @TableField(exist=false)
+    private Integer stocksLockNum;
     /**
      * 预警库存
      */
@@ -166,5 +175,5 @@ public class SkuDO extends BaseDO {
     /**
      * 删除时间
      */
-    private LocalDateTime delete_time;
+    private Date deleteTime;
 }

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

@@ -1,13 +1,13 @@
-package com.tashow.cloud.product.dto;
+package com.tashow.cloud.productapi.api.product.dto;
 
-import lombok.*;
-import java.util.*;
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.*;
 import com.tashow.cloud.mybatis.mybatis.core.dataobject.BaseDO;
+import lombok.*;
 
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 /**
  * 服务交付方式 DO
  *

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

@@ -1,13 +1,13 @@
-package com.tashow.cloud.product.dto;
+package com.tashow.cloud.productapi.api.product.dto;
 
-import lombok.*;
-import java.util.*;
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.*;
 import com.tashow.cloud.mybatis.mybatis.core.dataobject.BaseDO;
+import lombok.*;
 
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 /**
  * 服务详情 DO
  *

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

@@ -1,12 +1,11 @@
-package com.tashow.cloud.product.dto;
+package com.tashow.cloud.productapi.api.product.dto;
 
-import lombok.*;
-import java.util.*;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.*;
 import com.tashow.cloud.mybatis.mybatis.core.dataobject.BaseDO;
-
+import lombok.*;
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 /**
  * 服务物料详情 DO
  *

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

@@ -1,12 +1,11 @@
-package com.tashow.cloud.product.dto;
+package com.tashow.cloud.productapi.api.product.dto;
 
-import lombok.*;
-import java.util.*;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.*;
 import com.tashow.cloud.mybatis.mybatis.core.dataobject.BaseDO;
-
+import lombok.*;
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 /**
  * 服务遗体运输 DO
  *

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

@@ -1,12 +1,11 @@
-package com.tashow.cloud.product.dto;
+package com.tashow.cloud.productapi.api.product.dto;
 
-import lombok.*;
-import java.util.*;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.*;
 import com.tashow.cloud.mybatis.mybatis.core.dataobject.BaseDO;
-
+import lombok.*;
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 /**
  * 商品SKU扩展服务表单 DO
  *

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

@@ -1,11 +1,14 @@
-package com.tashow.cloud.product.vo.category;
+package com.tashow.cloud.productapi.api.product.vo;
 
-import lombok.*;
-import java.util.*;
-import io.swagger.v3.oas.annotations.media.Schema;
 import com.tashow.cloud.common.pojo.PageParam;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 import org.springframework.format.annotation.DateTimeFormat;
+
 import java.time.LocalDateTime;
+import java.util.List;
 
 import static com.tashow.cloud.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
 
@@ -34,10 +37,10 @@ public class CategoryPageReqVO extends PageParam {
     private String description;
 
     @Schema(description = "标签")
-    private String tag;
+    private List<String> tag;
 
     @Schema(description = "排序")
-    private Integer seq;
+    private Integer sort;
 
     @Schema(description = "默认是1，表示正常状态,0为下线状态", example = "1")
     private Integer status;

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

@@ -1,11 +1,12 @@
-package com.tashow.cloud.product.vo.category;
+package com.tashow.cloud.productapi.api.product.vo;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
+import lombok.Data;
-import java.util.*;
+
-import org.springframework.format.annotation.DateTimeFormat;
 import java.time.LocalDateTime;
-import com.alibaba.excel.annotation.*;
+import java.util.List;
 
 @Schema(description = "管理后台 - 产品类目 Response VO")
 @Data
@@ -42,11 +43,11 @@ public class CategoryRespVO {
 
     @Schema(description = "标签")
     @ExcelProperty("标签")
-    private String tag;
+    private List<String> tag;
 
     @Schema(description = "排序", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("排序")
-    private Integer seq;
+    private Integer sort;
 
     @Schema(description = "默认是1，表示正常状态,0为下线状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
     @ExcelProperty("默认是1，表示正常状态,0为下线状态")

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

@@ -1,9 +1,9 @@
-package com.tashow.cloud.product.vo.category;
+package com.tashow.cloud.productapi.api.product.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
+import lombok.Data;
-import java.util.*;
+
-import jakarta.validation.constraints.*;
+import java.util.List;
 
 @Schema(description = "管理后台 - 产品类目新增/修改 Request VO")
 @Data
@@ -16,11 +16,16 @@ public class CategorySaveReqVO {
     private Long shopId;
 
     @Schema(description = "父节点", requiredMode = Schema.RequiredMode.REQUIRED, example = "16509")
-    @NotNull(message = "父节点不能为空")
+    //@NotNull(message = "父节点不能为空")
     private Long parentId;
 
+    /**
+     * 父节名称
+     */
+    private String parentName;
+
     @Schema(description = "产品类目名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "王五")
-    @NotEmpty(message = "产品类目名称不能为空")
+    //@NotEmpty(message = "产品类目名称不能为空")
     private String categoryName;
 
     @Schema(description = "类目图标")
@@ -33,16 +38,16 @@ public class CategorySaveReqVO {
     private String description;
 
     @Schema(description = "标签")
-    private String tag;
+    private List<String> tag;
 
     @Schema(description = "排序", requiredMode = Schema.RequiredMode.REQUIRED)
-    private Integer seq;
+    private Integer sort;
 
     @Schema(description = "默认是1，表示正常状态,0为下线状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
     private Integer status;
 
     @Schema(description = "分类层级 1级 2级 3级", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "分类层级不能为空")
+    //@NotNull(message = "分类层级不能为空")
     private Integer grade;
 
 }

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

@@ -0,0 +1,95 @@
+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.api.product.dto.*;
+import com.tashow.cloud.productapi.api.product.vo.prodemergencyresponse.ProdEmergencyInfoVO;
+import com.tashow.cloud.productapi.api.product.vo.prodserviceareas.ProdServiceAreasInfoVO;
+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.Date;
+import java.util.List;
+
+@Schema(description = "商品服务配置 VO")
+@Data
+public class ProdListVO {
+
+    /**
+     * 产品ID
+     */
+    @TableId
+    private Long prodId;
+    /**
+     * 商品名称
+     */
+    private String prodName;
+    /**
+     * 分类名称
+     */
+    private String categoryName;
+
+    /**
+     * 店铺id
+     */
+    private Long shopId;
+
+    /**
+     * 店铺id
+     */
+    private String shopName;
+
+    /**
+     * 默认是1，正常状态（出售中）, 0：下架（仓库中） 2：待审核
+     */
+    private Integer status;
+
+    /**
+     * 是否置灰0否1是
+     */
+    private Integer isProhibit;
+    /**
+     * 服务区域地址名称集合
+     */
+    private List<String> areaNameList;
+
+    /**
+     * 紧急服务最快响应时间（小时）
+     */
+    private BigDecimal responseHours;
+    /**
+     * 服务时段
+     */
+    @TableField(typeHandler = StringListTypeHandler.class)
+    private List<String> reservationTimeSlots;
+
+    /**
+     * 还剩多少天
+     */
+    private Long remainingDays;
+
+    /**
+     * 审核备注
+     */
+    private String processNotes;
+    /**
+     * 删除时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date deleteTime;
+    /**
+     * 创建时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date updateTime;
+
+}

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

@@ -0,0 +1,42 @@
+package com.tashow.cloud.productapi.api.product.vo.prod;
+
+import com.tashow.cloud.common.pojo.PageParam;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+import static com.tashow.cloud.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+@Schema(description = "管理后台 - 商品分页 Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class ProdPageReqVO extends PageParam {
+
+    @Schema(description = "商品名称", example = "赵六")
+    private String prodName;
+
+    @Schema(description = "店铺id", example = "10843")
+    private Long shopId;
+
+    @Schema(description = "默认是1，正常状态（出售中）, 0：下架（仓库中） 2：待审核", example = "2")
+    private Integer status;
+
+    @Schema(description = "商品分类", example = "14895")
+    private Long categoryId;
+
+    /**
+     * 商品分类名称
+     */
+    private String categoryName;
+
+    @Schema(description = "创建时间")
+    //@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private String[] createTime;
+
+}

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

@@ -0,0 +1,22 @@
+package com.tashow.cloud.productapi.api.product.vo.prod;
+
+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 ProdRecycleBinVO extends PageParam {
+
+    @Schema(description = "商品名称", example = "18784")
+    private String prodName;
+
+    @Schema(description = "删除时间")
+    //@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private String[] deleteTime;
+
+}

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

@@ -1,4 +1,4 @@
-package com.tashow.cloud.product.vo.prod;
+package com.tashow.cloud.productapi.api.product.vo.prod;
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
@@ -84,6 +84,11 @@ public class ProdRespVO {
     @ExcelProperty("商品分类")
     private Long categoryId;
 
+    /**
+     * 商品分类名称
+     */
+    private String categoryName;
+
     @Schema(description = "销量")
     @ExcelProperty("销量")
     private Integer soldNum;

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

@@ -0,0 +1,74 @@
+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;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+@Schema(description = "商品服务配置 VO")
+@Data
+public class ProdRestoreListVO {
+
+    /**
+     * 产品ID
+     */
+    @TableId
+    private Long prodId;
+    /**
+     * 商品名称
+     */
+    private String prodName;
+    /**
+     * 分类名称
+     */
+    private String categoryName;
+
+    /**
+     * 店铺id
+     */
+    private Long shopId;
+
+    /**
+     * 店铺id
+     */
+    private String shopName;
+
+    /**
+     * 服务区域地址名称集合
+     */
+    private List<String> areaNameList;
+
+    /**
+     * 紧急服务最快响应时间（小时）
+     */
+    private BigDecimal responseHours;
+    /**
+     * 服务时段
+     */
+    @TableField(typeHandler = StringListTypeHandler.class)
+    private List<String> reservationTimeSlots;
+
+    /**
+     * 还剩多少天
+     */
+    private Long remainingDays;
+
+    /**
+     * 删除时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date deleteTime;
+    /**
+     * 创建时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date createTime;
+
+
+}

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

@@ -1,13 +1,10 @@
-package com.tashow.cloud.product.vo.prod;
+package com.tashow.cloud.productapi.api.product.vo.prod;
 
-import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
+import com.tashow.cloud.productapi.api.product.dto.SkuDO;
-import com.tashow.cloud.product.dto.SkuDO;
+import com.tashow.cloud.productapi.api.product.vo.prodprop.ProdPropSaveReqVO;
-import com.tashow.cloud.product.vo.prodprop.ProdPropSaveReqVO;
-//import com.tashow.cloud.productapi.general.StringListTypeHandler;
 import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotEmpty;
 import lombok.Data;
-import org.apache.ibatis.type.TypeHandler;
+
 import java.util.List;
 
 @Schema(description = "管理后台 - 商品新增/修改 Request VO")
@@ -17,8 +14,8 @@ public class ProdSaveReqVO {
     @Schema(description = "产品ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "6943")
     private Long prodId;
 
-    @Schema(description = "商品名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "赵六")
+    //@Schema(description = "商品名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "赵六")
-    @NotEmpty(message = "商品名称不能为空")
+    //@NotEmpty(message = "商品名称不能为空")
     private String prodName;
 
     @Schema(description = "商品简称")
@@ -33,6 +30,11 @@ public class ProdSaveReqVO {
     @Schema(description = "关键词")
     private String keyword;
 
+    /**
+     * 商品分类名称
+     */
+    private String categoryName;
+
     @Schema(description = "店铺id", example = "10843")
     private Long shopId;
 

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

@@ -0,0 +1,119 @@
+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
+public class ProdServiceVO {
+
+    @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 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;
+    @Schema(description = "急响应服务配置")
+    public ProdEmergencyInfoVO 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;
+
+
+    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/prodadditionalfeedates/ProdAdditionalFeeDatesPageReqVO.java

@@ -1,14 +1,12 @@
-package com.tashow.cloud.product.vo.prodadditionalfeedates;
+package com.tashow.cloud.productapi.api.product.vo.prodadditionalfeedates;
 
-import lombok.*;
-import java.util.*;
-import io.swagger.v3.oas.annotations.media.Schema;
 import com.tashow.cloud.common.pojo.PageParam;
-import java.math.BigDecimal;
+import io.swagger.v3.oas.annotations.media.Schema;
-import org.springframework.format.annotation.DateTimeFormat;
+import lombok.Data;
-import java.time.LocalDateTime;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
-import static com.tashow.cloud.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+import java.math.BigDecimal;
 
 @Schema(description = "管理后台 - 特殊日期附加费用规则分页 Request VO")
 @Data

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

@@ -1,12 +1,11 @@
-package com.tashow.cloud.product.vo.prodadditionalfeedates;
+package com.tashow.cloud.productapi.api.product.vo.prodadditionalfeedates;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
+import lombok.Data;
-import java.util.*;
+
 import java.math.BigDecimal;
-import org.springframework.format.annotation.DateTimeFormat;
-import java.time.LocalDateTime;
-import com.alibaba.excel.annotation.*;
 
 @Schema(description = "管理后台 - 特殊日期附加费用规则 Response VO")
 @Data

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

@@ -1,12 +1,11 @@
-package com.tashow.cloud.product.vo.prodadditionalfeedates;
+package com.tashow.cloud.productapi.api.product.vo.prodadditionalfeedates;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
+import jakarta.validation.constraints.NotEmpty;
-import java.util.*;
+import jakarta.validation.constraints.NotNull;
-import jakarta.validation.constraints.*;
+import lombok.Data;
+
 import java.math.BigDecimal;
-import org.springframework.format.annotation.DateTimeFormat;
-import java.time.LocalDateTime;
 
 @Schema(description = "管理后台 - 特殊日期附加费用规则新增/修改 Request VO")
 @Data

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

@@ -1,14 +1,12 @@
-package com.tashow.cloud.product.vo.prodadditionalfeeperiods;
+package com.tashow.cloud.productapi.api.product.vo.prodadditionalfeeperiods;
 
-import lombok.*;
-import java.util.*;
-import io.swagger.v3.oas.annotations.media.Schema;
 import com.tashow.cloud.common.pojo.PageParam;
-import java.math.BigDecimal;
+import io.swagger.v3.oas.annotations.media.Schema;
-import org.springframework.format.annotation.DateTimeFormat;
+import lombok.Data;
-import java.time.LocalDateTime;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
-import static com.tashow.cloud.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+import java.math.BigDecimal;
 
 @Schema(description = "管理后台 - 特殊时段附加费用规则分页 Request VO")
 @Data

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

@@ -1,12 +1,12 @@
-package com.tashow.cloud.product.vo.prodadditionalfeeperiods;
+package com.tashow.cloud.productapi.api.product.vo.prodadditionalfeeperiods;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
+import lombok.Data;
-import java.util.*;
+
 import java.math.BigDecimal;
-import org.springframework.format.annotation.DateTimeFormat;
+import java.util.List;
-import java.time.LocalDateTime;
-import com.alibaba.excel.annotation.*;
 
 @Schema(description = "管理后台 - 特殊时段附加费用规则 Response VO")
 @Data
@@ -27,7 +27,7 @@ public class ProdAdditionalFeePeriodsRespVO {
 
     @Schema(description = "特殊时段设置（JSON格式存储）", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("特殊时段设置（JSON格式存储）")
-    private String specialTimeSlots;
+    private List<String> specialTimeSlots;
 
     @Schema(description = "收费方式0:'固定金额',1:'基准价上浮'", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("收费方式0:'固定金额',1:'基准价上浮'")

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

@@ -1,12 +1,12 @@
-package com.tashow.cloud.product.vo.prodadditionalfeeperiods;
+package com.tashow.cloud.productapi.api.product.vo.prodadditionalfeeperiods;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
+import jakarta.validation.constraints.NotEmpty;
-import java.util.*;
+import jakarta.validation.constraints.NotNull;
-import jakarta.validation.constraints.*;
+import lombok.Data;
+
 import java.math.BigDecimal;
-import org.springframework.format.annotation.DateTimeFormat;
+import java.util.List;
-import java.time.LocalDateTime;
 
 @Schema(description = "管理后台 - 特殊时段附加费用规则新增/修改 Request VO")
 @Data
@@ -25,7 +25,7 @@ public class ProdAdditionalFeePeriodsSaveReqVO {
 
     @Schema(description = "特殊时段设置（JSON格式存储）", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotEmpty(message = "特殊时段设置（JSON格式存储）不能为空")
-    private String specialTimeSlots;
+    private List<String> specialTimeSlots;
 
     @Schema(description = "收费方式0:'固定金额',1:'基准价上浮'", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotNull(message = "收费方式0:'固定金额',1:'基准价上浮'不能为空")

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

@@ -0,0 +1,39 @@
+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 ProdEmergencyInfoVO {
+
+
+    /**
+     * 紧急响应服务配置的唯一标识符
+     */
+    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/ProdEmergencyResponsePageReqVO.java

@@ -1,13 +1,13 @@
-package com.tashow.cloud.product.vo.prodemergencyresponse;
+package com.tashow.cloud.productapi.api.product.vo.prodemergencyresponse;
 
-import lombok.*;
-import java.util.*;
-import io.swagger.v3.oas.annotations.media.Schema;
 import com.tashow.cloud.common.pojo.PageParam;
-import org.springframework.format.annotation.DateTimeFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
-import java.time.LocalDateTime;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
-import static com.tashow.cloud.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+import java.time.LocalDateTime;
+import java.util.List;
 
 @Schema(description = "管理后台 - 商品紧急响应服务设置分页 Request VO")
 @Data
@@ -18,14 +18,14 @@ public class ProdEmergencyResponsePageReqVO extends PageParam {
     @Schema(description = "关联的商品ID", example = "29152")
     private Long prodId;
 
-    @Schema(description = "可响应时间段（JSON格式存储）")
+    @Schema(description = "可响应时间段")
-    private String responseTimeSlots;
+    private List<String> responseTimeSlots;
 
-    @Schema(description = "黑名自定义日期（JSON格式存储）")
+    @Schema(description = "黑名自定义日期")
-    private String blacklistedDates;
+    private List<String> blacklistedDates;
 
-    @Schema(description = "黑名单指定日期（JSON格式存储）")
+    @Schema(description = "黑名单指定日期")
-    private String blackAppointDates;
+    private List<String> blackAppointDates;
 
     @Schema(description = "法定节假日是否开启0:关闭1开启")
     private Integer blackHappy;

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

@@ -1,11 +1,11 @@
-package com.tashow.cloud.product.vo.prodemergencyresponse;
+package com.tashow.cloud.productapi.api.product.vo.prodemergencyresponse;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
+import lombok.Data;
-import java.util.*;
+
-import org.springframework.format.annotation.DateTimeFormat;
 import java.time.LocalDateTime;
-import com.alibaba.excel.annotation.*;
 
 @Schema(description = "管理后台 - 商品紧急响应服务设置 Response VO")
 @Data

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

@@ -1,11 +1,13 @@
-package com.tashow.cloud.product.vo.prodemergencyresponse;
+package com.tashow.cloud.productapi.api.product.vo.prodemergencyresponse;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.tashow.cloud.productapi.general.StringListTypeHandler;
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
+import jakarta.validation.constraints.NotNull;
-import java.util.*;
+import lombok.Data;
-import jakarta.validation.constraints.*;
+
-import org.springframework.format.annotation.DateTimeFormat;
 import java.time.LocalDateTime;
+import java.util.List;
 
 @Schema(description = "管理后台 - 商品紧急响应服务设置新增/修改 Request VO")
 @Data
@@ -18,14 +20,14 @@ public class ProdEmergencyResponseSaveReqVO {
     @NotNull(message = "关联的商品ID不能为空")
     private Long prodId;
 
-    @Schema(description = "可响应时间段（JSON格式存储）")
+    @Schema(description = "可响应时间段")
-    private String responseTimeSlots;
+    private List<String> responseTimeSlots;
 
-    @Schema(description = "黑名自定义日期（JSON格式存储）")
+    @Schema(description = "黑名自定义日期")
-    private String blacklistedDates;
+    private List<String>blacklistedDates;
 
-    @Schema(description = "黑名单指定日期（JSON格式存储）")
+    @Schema(description = "黑名单指定日期")
-    private String blackAppointDates;
+    private List<String>  blackAppointDates;
 
     @Schema(description = "法定节假日是否开启0:关闭1开启")
     private Integer blackHappy;

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

@@ -1,14 +1,13 @@
-package com.tashow.cloud.product.vo.prodemergencyresponseintervals;
+package com.tashow.cloud.productapi.api.product.vo.prodemergencyresponseintervals;
 
-import lombok.*;
-import java.util.*;
-import io.swagger.v3.oas.annotations.media.Schema;
 import com.tashow.cloud.common.pojo.PageParam;
-import java.math.BigDecimal;
+import io.swagger.v3.oas.annotations.media.Schema;
-import org.springframework.format.annotation.DateTimeFormat;
+import lombok.Data;
-import java.time.LocalDateTime;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
-import static com.tashow.cloud.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
 
 @Schema(description = "管理后台 - 紧急响应时间区间设置分页 Request VO")
 @Data
@@ -20,10 +19,10 @@ public class ProdEmergencyResponseIntervalsPageReqVO extends PageParam {
     private Long configId;
 
     @Schema(description = "响应模式名称", example = "王五")
-    private String modeName;
+    private String name;
 
     @Schema(description = "响应时间（小时）")
-    private Integer responseHours;
+    private BigDecimal responseHours;
 
     @Schema(description = "收费模式0：固定收费 1：浮动收费")
     private Integer chargeMode;

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

@@ -1,12 +1,12 @@
-package com.tashow.cloud.product.vo.prodemergencyresponseintervals;
+package com.tashow.cloud.productapi.api.product.vo.prodemergencyresponseintervals;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
+import lombok.Data;
-import java.util.*;
+
 import java.math.BigDecimal;
-import org.springframework.format.annotation.DateTimeFormat;
 import java.time.LocalDateTime;
-import com.alibaba.excel.annotation.*;
 
 @Schema(description = "管理后台 - 紧急响应时间区间设置 Response VO")
 @Data
@@ -23,11 +23,11 @@ public class ProdEmergencyResponseIntervalsRespVO {
 
     @Schema(description = "响应模式名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "王五")
     @ExcelProperty("响应模式名称")
-    private String modeName;
+    private String name;
 
     @Schema(description = "响应时间（小时）", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("响应时间（小时）")
-    private Integer responseHours;
+    private BigDecimal responseHours;
 
     @Schema(description = "收费模式0：固定收费 1：浮动收费", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("收费模式0：固定收费 1：浮动收费")

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

@@ -1,11 +1,11 @@
-package com.tashow.cloud.product.vo.prodemergencyresponseintervals;
+package com.tashow.cloud.productapi.api.product.vo.prodemergencyresponseintervals;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
+import jakarta.validation.constraints.NotEmpty;
-import java.util.*;
+import jakarta.validation.constraints.NotNull;
-import jakarta.validation.constraints.*;
+import lombok.Data;
+
 import java.math.BigDecimal;
-import org.springframework.format.annotation.DateTimeFormat;
 import java.time.LocalDateTime;
 
 @Schema(description = "管理后台 - 紧急响应时间区间设置新增/修改 Request VO")
@@ -21,11 +21,11 @@ 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 = "响应时间（小时）不能为空")
-    private Integer responseHours;
+    private BigDecimal responseHours;
 
     @Schema(description = "收费模式0：固定收费 1：浮动收费", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotNull(message = "收费模式0：固定收费 1：浮动收费不能为空")

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

@@ -1,9 +1,10 @@
-package com.tashow.cloud.product.vo.prodprop;
+package com.tashow.cloud.productapi.api.product.vo.prodprop;
 
-import lombok.*;
-import java.util.*;
-import io.swagger.v3.oas.annotations.media.Schema;
 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 = "管理后台 - 商品属性分页 Request VO")
 @Data

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

@@ -1,9 +1,9 @@
-package com.tashow.cloud.product.vo.prodprop;
+package com.tashow.cloud.productapi.api.product.vo.prodprop;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
+import lombok.Data;
-import java.util.*;
-import com.alibaba.excel.annotation.*;
 
 @Schema(description = "管理后台 - 商品属性 Response VO")
 @Data

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

@@ -1,15 +1,17 @@
-package com.tashow.cloud.product.vo.prodprop;
+package com.tashow.cloud.productapi.api.product.vo.prodprop;
 
 import com.baomidou.mybatisplus.annotation.TableField;
-import com.tashow.cloud.product.dto.ProdPropValueDO;
+import com.tashow.cloud.productapi.api.product.dto.ProdPropValueDO;
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
+import jakarta.validation.constraints.NotEmpty;
-import java.util.*;
+import lombok.Data;
-import jakarta.validation.constraints.*;
+
+import java.util.List;
 
 @Schema(description = "管理后台 - 商品属性新增/修改 Request VO")
 @Data
 public class ProdPropSaveReqVO {
+    private Long id;
 
     @Schema(description = "属性id", requiredMode = Schema.RequiredMode.REQUIRED, example = "14271")
     private Long propId;

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

@@ -1,23 +1,24 @@
-package com.tashow.cloud.product.vo.sku;
+package com.tashow.cloud.productapi.api.product.vo.prodpropvalue;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.tashow.cloud.product.dto.ProdPropDO;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
-import java.time.LocalDateTime;
 import java.util.Date;
-import java.util.List;
 
 @Data
-public class SkuRecycleBinVO {
+public class ProPropRecycleBinVO {
-    @Schema(description = "单品ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "32230")
+    @Schema(description = "规格值id")
-    private Long skuId;
+    private Long id;
 
     /**
-     * 是否显示失效规格值 0否1是
+     * 属性规格名称
      */
-    private String properties;
+    private String propValue;
+    /**
+     * 关联规格属性id
+     */
+    private Long propId;
 
     /**
      * 还剩多少天

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

@@ -1,9 +1,10 @@
-package com.tashow.cloud.product.vo.prodpropvalue;
+package com.tashow.cloud.productapi.api.product.vo.prodpropvalue;
 
-import lombok.*;
-import java.util.*;
-import io.swagger.v3.oas.annotations.media.Schema;
 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 = "管理后台 - 属性规则分页 Request VO")
 @Data

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

@@ -1,9 +1,9 @@
-package com.tashow.cloud.product.vo.prodpropvalue;
+package com.tashow.cloud.productapi.api.product.vo.prodpropvalue;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
+import lombok.Data;
-import java.util.*;
-import com.alibaba.excel.annotation.*;
 
 @Schema(description = "管理后台 - 属性规则 Response VO")
 @Data

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

@@ -1,9 +1,7 @@
-package com.tashow.cloud.product.vo.prodpropvalue;
+package com.tashow.cloud.productapi.api.product.vo.prodpropvalue;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
+import lombok.Data;
-import java.util.*;
-import jakarta.validation.constraints.*;
 
 @Schema(description = "管理后台 - 属性规则新增/修改 Request VO")
 @Data

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

@@ -1,13 +1,13 @@
-package com.tashow.cloud.product.vo.prodreservationconfig;
+package com.tashow.cloud.productapi.api.product.vo.prodreservationconfig;
 
-import lombok.*;
-import java.util.*;
-import io.swagger.v3.oas.annotations.media.Schema;
 import com.tashow.cloud.common.pojo.PageParam;
-import org.springframework.format.annotation.DateTimeFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
-import java.time.LocalDateTime;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
-import static com.tashow.cloud.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+import java.time.LocalDateTime;
+import java.util.List;
 
 @Schema(description = "管理后台 - 商品预约配置分页 Request VO")
 @Data
@@ -18,8 +18,8 @@ public class ProdReservationConfigPageReqVO extends PageParam {
     @Schema(description = "关联的商品ID", example = "19369")
     private Long prodId;
 
-    @Schema(description = "预约时段设置（JSON格式存储）")
+    @Schema(description = "预约时段设置")
-    private String reservationTimeSlots;
+    private List<String> reservationTimeSlots;
 
     @Schema(description = "需提前多少小时预约")
     private Integer advanceHours;
@@ -36,8 +36,8 @@ public class ProdReservationConfigPageReqVO extends PageParam {
     @Schema(description = "允许更改预约时间的最大次数")
     private Integer maxChangeTimes;
 
-    @Schema(description = "黑名自定义日期（JSON格式存储）")
+    @Schema(description = "黑名自定义日期")
-    private String blacklistedDates;
+    private List<String> blacklistedDates;
 
     /**
      * '是否开启黑名单自定义0关1开'
@@ -49,8 +49,8 @@ public class ProdReservationConfigPageReqVO extends PageParam {
      */
     private Integer isBlackAppoint;
 
-    @Schema(description = "黑名单指定日期（JSON格式存储）")
+    @Schema(description = "黑名单指定日期")
-    private String blackAppointDates;
+    private List<String> blackAppointDates;
 
     @Schema(description = "法定节假日是否开启0:关闭1开启")
     private Boolean blackHappy;

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

@@ -1,11 +1,12 @@
-package com.tashow.cloud.product.vo.prodreservationconfig;
+package com.tashow.cloud.productapi.api.product.vo.prodreservationconfig;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
+import lombok.Data;
-import java.util.*;
+
-import org.springframework.format.annotation.DateTimeFormat;
 import java.time.LocalDateTime;
-import com.alibaba.excel.annotation.*;
+import java.util.List;
 
 @Schema(description = "管理后台 - 商品预约配置 Response VO")
 @Data
@@ -20,9 +21,9 @@ public class ProdReservationConfigRespVO {
     @ExcelProperty("关联的商品ID")
     private Long prodId;
 
-    @Schema(description = "预约时段设置（JSON格式存储）", requiredMode = Schema.RequiredMode.REQUIRED)
+    @Schema(description = "预约时段设置", requiredMode = Schema.RequiredMode.REQUIRED)
-    @ExcelProperty("预约时段设置（JSON格式存储）")
+    @ExcelProperty("预约时段设置")
-    private String reservationTimeSlots;
+    private List<String> reservationTimeSlots;
 
     @Schema(description = "需提前多少小时预约", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("需提前多少小时预约")
@@ -44,9 +45,9 @@ public class ProdReservationConfigRespVO {
     @ExcelProperty("允许更改预约时间的最大次数")
     private Integer maxChangeTimes;
 
-    @Schema(description = "黑名自定义日期（JSON格式存储）")
+    @Schema(description = "黑名自定义日期")
-    @ExcelProperty("黑名自定义日期（JSON格式存储）")
+    @ExcelProperty("黑名自定义日期")
-    private String blacklistedDates;
+    private List<String> blacklistedDates;
 
     /**
      * '是否开启黑名单自定义0关1开'
@@ -58,9 +59,9 @@ public class ProdReservationConfigRespVO {
      */
     private Integer isBlackAppoint;
 
-    @Schema(description = "黑名单指定日期（JSON格式存储）")
+    @Schema(description = "黑名单指定日期")
-    @ExcelProperty("黑名单指定日期（JSON格式存储）")
+    @ExcelProperty("黑名单指定日期")
-    private String blackAppointDates;
+    private List<String> blackAppointDates;
 
     @Schema(description = "法定节假日是否开启0:关闭1开启")
     @ExcelProperty("法定节假日是否开启0:关闭1开启")

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

@@ -1,11 +1,12 @@
-package com.tashow.cloud.product.vo.prodreservationconfig;
+package com.tashow.cloud.productapi.api.product.vo.prodreservationconfig;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
+import jakarta.validation.constraints.NotEmpty;
-import java.util.*;
+import jakarta.validation.constraints.NotNull;
-import jakarta.validation.constraints.*;
+import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
+
 import java.time.LocalDateTime;
+import java.util.List;
 
 @Schema(description = "管理后台 - 商品预约配置新增/修改 Request VO")
 @Data
@@ -18,9 +19,9 @@ public class ProdReservationConfigSaveReqVO {
     @NotNull(message = "关联的商品ID不能为空")
     private Long prodId;
 
-    @Schema(description = "预约时段设置（JSON格式存储）", requiredMode = Schema.RequiredMode.REQUIRED)
+    @Schema(description = "预约时段设置", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotEmpty(message = "预约时段设置（JSON格式存储）不能为空")
+    @NotEmpty(message = "预约时段设置不能为空")
-    private String reservationTimeSlots;
+    private List<String> reservationTimeSlots;
 
     @Schema(description = "需提前多少小时预约", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotNull(message = "需提前多少小时预约不能为空")
@@ -40,8 +41,8 @@ public class ProdReservationConfigSaveReqVO {
     @Schema(description = "允许更改预约时间的最大次数")
     private Integer maxChangeTimes;
 
-    @Schema(description = "黑名自定义日期（JSON格式存储）")
+    @Schema(description = "黑名自定义日期")
-    private String blacklistedDates;
+    private List<String> blacklistedDates;
 
     /**
      * '是否开启黑名单自定义0关1开'
@@ -53,8 +54,8 @@ public class ProdReservationConfigSaveReqVO {
      */
     private Integer isBlackAppoint;
 
-    @Schema(description = "黑名单指定日期（JSON格式存储）")
+    @Schema(description = "黑名单指定日期")
-    private String blackAppointDates;
+    private List<String> blackAppointDates;
 
     @Schema(description = "法定节假日是否开启0:关闭1开启")
     private Boolean blackHappy;

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/prodreservationconfig/TimeBookVO.java

@@ -0,0 +1,23 @@
+package com.tashow.cloud.productapi.api.product.vo.prodreservationconfig;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.util.List;
+
+@Schema(description = "管理后台 - 商品预约配置 Response VO")
+@Data
+@ExcelIgnoreUnannotated
+public class TimeBookVO {
+
+    /**
+     * 预约时段设置
+     */
+    private List<String> reservationTimeSlots;
+    /**
+     * 时间段
+     */
+    private Integer timeSlot;
+}

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

@@ -1,9 +1,10 @@
-package com.tashow.cloud.product.vo.prodservicearearelevance;
+package com.tashow.cloud.productapi.api.product.vo.prodservicearearelevance;
 
-import lombok.*;
-import java.util.*;
-import io.swagger.v3.oas.annotations.media.Schema;
 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 = "管理后台 - 商品与服务区域关联分页 Request VO")
 @Data

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

@@ -1,9 +1,9 @@
-package com.tashow.cloud.product.vo.prodservicearearelevance;
+package com.tashow.cloud.productapi.api.product.vo.prodservicearearelevance;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
+import lombok.Data;
-import java.util.*;
-import com.alibaba.excel.annotation.*;
 
 @Schema(description = "管理后台 - 商品与服务区域关联 Response VO")
 @Data

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

@@ -1,9 +1,7 @@
-package com.tashow.cloud.product.vo.prodservicearearelevance;
+package com.tashow.cloud.productapi.api.product.vo.prodservicearearelevance;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
+import lombok.Data;
-import java.util.*;
-import jakarta.validation.constraints.*;
 
 @Schema(description = "管理后台 - 商品与服务区域关联新增/修改 Request VO")
 @Data

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

@@ -1,15 +1,10 @@
-package com.tashow.cloud.product.vo.prodserviceareas;
+package com.tashow.cloud.productapi.api.product.vo.prodserviceareas;
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
-import com.alibaba.excel.annotation.ExcelProperty;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.tashow.cloud.product.dto.ProdServiceOverAreaRulesDO;
-import com.tashow.cloud.product.vo.prodserviceoverarearules.ProdServiceOverAreaRulesRespVO;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.math.BigDecimal;
-import java.time.LocalDateTime;
 import java.util.List;
 
 @Schema(description = "管理后台 - 服务区域 Response VO")

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

@@ -1,10 +1,12 @@
-package com.tashow.cloud.product.vo.prodserviceareas;
+package com.tashow.cloud.productapi.api.product.vo.prodserviceareas;
 
-import lombok.*;
-import java.util.*;
-import io.swagger.v3.oas.annotations.media.Schema;
 import com.tashow.cloud.common.pojo.PageParam;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 import org.springframework.format.annotation.DateTimeFormat;
+
 import java.time.LocalDateTime;
 
 import static com.tashow.cloud.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;

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

@@ -1,11 +1,11 @@
-package com.tashow.cloud.product.vo.prodserviceareas;
+package com.tashow.cloud.productapi.api.product.vo.prodserviceareas;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
+import lombok.Data;
-import java.util.*;
+
-import org.springframework.format.annotation.DateTimeFormat;
 import java.time.LocalDateTime;
-import com.alibaba.excel.annotation.*;
 
 @Schema(description = "管理后台 - 服务区域 Response VO")
 @Data

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

@@ -1,9 +1,8 @@
-package com.tashow.cloud.product.vo.prodserviceareas;
+package com.tashow.cloud.productapi.api.product.vo.prodserviceareas;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
+import jakarta.validation.constraints.NotEmpty;
-import java.util.*;
+import lombok.Data;
-import jakarta.validation.constraints.*;
 
 @Schema(description = "管理后台 - 服务区域新增/修改 Request VO")
 @Data