feat(app): 完善应用凭证、事件和用户管理功能

- 新增应用密钥凭证的创建、重置和状态管理功能
- 实现AppSecret自动生成功能并添加脱敏显示机制
- 增加应用操作动态的最新记录查询和批量清理功能
- 添加应用成员邀请和角色修改功能
- 优化查询条件支持精确匹配和租户隔离
- 集成网站信息关联查询并完善数据脱敏处理

.gitignore

@@ -42,3 +42,4 @@ ehthumbs.db
 Thumbs.db
 /file/
 /websoft-modules.log
+/tmp/

README.md

@@ -284,3 +284,5 @@ docker run -d -p 9200:9200 websoft-api
 ---
 
 ⭐ 如果这个项目对您有帮助，请给我们一个星标！
+
+

com/wechat/pay/java/core/exception/ServiceException.java

@@ -0,0 +1,86 @@
+package com.wechat.pay.java.core.exception;
+
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.wechat.pay.java.core.http.HttpRequest;
+import com.wechat.pay.java.core.util.GsonUtil;
+
+/** 发送HTTP请求成功，返回异常时抛出。例如返回状态码小于200或大于等于300、返回体参数不完整。 */
+public class ServiceException extends WechatPayException {
+
+  private static final long serialVersionUID = -7174975090366956652L;
+
+  private final HttpRequest httpRequest;
+  private final int httpStatusCode;
+  private final String responseBody;
+  private String errorCode;
+  private String errorMessage;
+
+  /**
+   * 返回状态码小于200或大于300调用
+   *
+   * @param httpRequest http请求
+   * @param httpStatusCode http状态码
+   * @param responseBody http返回体
+   */
+  public ServiceException(HttpRequest httpRequest, int httpStatusCode, String responseBody) {
+    super(
+        String.format(
+            "Wrong HttpStatusCode[%d]%nhttpResponseBody[%.1024s]\tHttpRequest[%s]",
+            httpStatusCode, responseBody, httpRequest));
+    this.httpRequest = httpRequest;
+    this.httpStatusCode = httpStatusCode;
+    this.responseBody = responseBody;
+    if (responseBody != null && !responseBody.isEmpty()) {
+      JsonObject jsonObject = GsonUtil.getGson().fromJson(responseBody, JsonObject.class);
+      JsonElement code = jsonObject.get("code");
+      JsonElement message = jsonObject.get("message");
+      this.errorCode = code == null ? null : code.getAsString();
+      this.errorMessage = message == null ? null : message.getAsString();
+    }
+  }
+
+  /**
+   * 获取序列化版本UID
+   *
+   * @return UID
+   */
+  public static long getSerialVersionUID() {
+    return serialVersionUID;
+  }
+
+  /**
+   * 获取HTTP请求
+   *
+   * @return HTTP请求
+   */
+  public HttpRequest getHttpRequest() {
+    return httpRequest;
+  }
+
+  /**
+   * 获取HTTP返回体
+   *
+   * @return HTTP返回体
+   */
+  public String getResponseBody() {
+    return responseBody;
+  }
+
+  /**
+   * 获取HTTP状态码
+   *
+   * @return HTTP状态码
+   */
+  public int getHttpStatusCode() {
+    return httpStatusCode;
+  }
+
+  public String getErrorCode() {
+    return errorCode;
+  }
+
+  public String getErrorMessage() {
+    return errorMessage;
+  }
+}

com/wechat/pay/java/core/http/AbstractHttpClient.java

@@ -0,0 +1,151 @@
+package com.wechat.pay.java.core.http;
+
+import static com.wechat.pay.java.core.http.Constant.ACCEPT;
+import static com.wechat.pay.java.core.http.Constant.AUTHORIZATION;
+import static com.wechat.pay.java.core.http.Constant.OS;
+import static com.wechat.pay.java.core.http.Constant.REQUEST_ID;
+import static com.wechat.pay.java.core.http.Constant.USER_AGENT;
+import static com.wechat.pay.java.core.http.Constant.USER_AGENT_FORMAT;
+import static com.wechat.pay.java.core.http.Constant.VERSION;
+import static com.wechat.pay.java.core.http.Constant.WECHAT_PAY_SERIAL;
+import static java.net.HttpURLConnection.HTTP_MULT_CHOICE;
+import static java.net.HttpURLConnection.HTTP_OK;
+import static java.util.Objects.requireNonNull;
+
+import com.wechat.pay.java.core.auth.Credential;
+import com.wechat.pay.java.core.auth.Validator;
+import com.wechat.pay.java.core.exception.MalformedMessageException;
+import com.wechat.pay.java.core.exception.ServiceException;
+import com.wechat.pay.java.core.exception.ValidationException;
+import com.wechat.pay.java.core.http.HttpRequest.Builder;
+import java.io.InputStream;
+
+/** 请求客户端抽象基类 */
+public abstract class AbstractHttpClient implements HttpClient {
+
+  protected final Credential credential;
+  protected final Validator validator;
+
+  public AbstractHttpClient(Credential credential, Validator validator) {
+    this.credential = requireNonNull(credential);
+    this.validator = requireNonNull(validator);
+  }
+
+  @Override
+  public <T> HttpResponse<T> execute(HttpRequest httpRequest, Class<T> responseClass) {
+    HttpRequest innerRequest =
+        new Builder()
+            .url(httpRequest.getUrl())
+            .httpMethod(httpRequest.getHttpMethod())
+            .headers(httpRequest.getHeaders())
+            .addHeader(AUTHORIZATION, getAuthorization(httpRequest))
+            .addHeader(USER_AGENT, getUserAgent())
+            .addHeader(WECHAT_PAY_SERIAL, getWechatPaySerial())
+            .body(httpRequest.getBody())
+            .build();
+    OriginalResponse originalResponse = innerExecute(innerRequest);
+    validateResponse(originalResponse);
+    return assembleHttpResponse(originalResponse, responseClass);
+  }
+
+  @Override
+  public InputStream download(String url) {
+    HttpRequest originRequest =
+        new HttpRequest.Builder().httpMethod(HttpMethod.GET).url(url).build();
+    HttpRequest httpRequest =
+        new HttpRequest.Builder()
+            .url(url)
+            .httpMethod(HttpMethod.GET)
+            .addHeader(AUTHORIZATION, getAuthorization(originRequest))
+            .addHeader(ACCEPT, "*/*")
+            .addHeader(USER_AGENT, getUserAgent())
+            .addHeader(WECHAT_PAY_SERIAL, getWechatPaySerial())
+            .build();
+    return innerDownload(httpRequest);
+  }
+
+  protected abstract InputStream innerDownload(HttpRequest httpRequest);
+
+  protected abstract OriginalResponse innerExecute(HttpRequest httpRequest);
+
+  private void validateResponse(OriginalResponse originalResponse) {
+
+    if (isInvalidHttpCode(originalResponse.getStatusCode())) {
+      throw new ServiceException(
+          originalResponse.getRequest(),
+          originalResponse.getStatusCode(),
+          originalResponse.getBody());
+    }
+
+    if (originalResponse.getBody() != null
+        && !originalResponse.getBody().isEmpty()
+        && !MediaType.APPLICATION_JSON.equalsWith(originalResponse.getContentType())) {
+      throw new MalformedMessageException(
+          String.format(
+              "Unsupported content-type[%s]%nhttpRequest[%s]",
+              originalResponse.getContentType(), originalResponse.getRequest()));
+    }
+
+    if (!validator.validate(originalResponse.getHeaders(), originalResponse.getBody())) {
+      String requestId = originalResponse.getHeaders().getHeader(REQUEST_ID);
+      throw new ValidationException(
+          String.format(
+              "Validate response failed,the WechatPay signature is incorrect.%n"
+                  + "Request-ID[%s]\tresponseHeader[%s]\tresponseBody[%.1024s]",
+              requestId, originalResponse.getHeaders(), originalResponse.getBody()));
+    }
+  }
+
+  protected boolean isInvalidHttpCode(int httpCode) {
+    return httpCode < HTTP_OK || httpCode >= HTTP_MULT_CHOICE;
+  }
+
+  private <T> HttpResponse<T> assembleHttpResponse(
+      OriginalResponse originalResponse, Class<T> responseClass) {
+    return new HttpResponse.Builder<T>()
+        .originalResponse(originalResponse)
+        .serviceResponseType(responseClass)
+        .build();
+  }
+
+  private String getSignBody(RequestBody requestBody) {
+    if (requestBody == null) {
+      return "";
+    }
+    if (requestBody instanceof JsonRequestBody) {
+      return ((JsonRequestBody) requestBody).getBody();
+    }
+    if (requestBody instanceof FileRequestBody) {
+      return ((FileRequestBody) requestBody).getMeta();
+    }
+    throw new UnsupportedOperationException(
+        String.format("Unsupported RequestBody Type[%s]", requestBody.getClass().getName()));
+  }
+
+  private String getUserAgent() {
+    return String.format(
+        USER_AGENT_FORMAT,
+        getClass().getPackage().getImplementationVersion(),
+        OS,
+        VERSION == null ? "Unknown" : VERSION,
+        credential.getClass().getSimpleName(),
+        validator.getClass().getSimpleName(),
+        getHttpClientInfo());
+  }
+
+  private String getWechatPaySerial() {
+    return this.validator.getSerialNumber();
+  }
+
+  /**
+   * 获取http客户端信息，用于User-Agent。 格式：客户端名称/版本 示例：okhttp3/4.9.3
+   *
+   * @return 客户端信息
+   */
+  protected abstract String getHttpClientInfo();
+
+  private String getAuthorization(HttpRequest request) {
+    return credential.getAuthorization(
+        request.getUri(), request.getHttpMethod().name(), getSignBody(request.getBody()));
+  }
+}

docs/SHOP_DEALER_REFEREE_BINDING.md

@@ -0,0 +1,26 @@
+# ShopDealerReferee 绑定接口规则与索引建议
+
+接口：`POST /api/shop/shop-dealer-referee`
+
+## 业务规则(后端)
+
+- 邀请人(dealerId)必须存在且有效：以 `shop_dealer_user` 记录存在且 `is_delete=0` 为准
+- 当前用户(userId)仅从 token 获取；若 body.userId 存在且与 token 不一致则拒绝
+- 禁止自己绑定自己：`dealerId == userId`
+- 仅首次绑定生效：若已存在(同一 tenant、同一 user、`level=1`)则直接返回成功(幂等，不改绑)
+- 记录溯源字段：`source`、`scene`
+
+## 并发幂等(数据库建议)
+
+建议在 `shop_dealer_referee` 增加溯源字段，并加唯一索引保证并发下不重复写入：
+
+```sql
+ALTER TABLE shop_dealer_referee
+  ADD COLUMN source VARCHAR(32) NULL COMMENT '来源(如 goods_share)',
+  ADD COLUMN scene  VARCHAR(255) NULL COMMENT '场景参数(溯源统计)';
+
+-- 约束：同一 tenant 下，一个用户每个 level 只能有一条推荐关系
+ALTER TABLE shop_dealer_referee
+  ADD UNIQUE KEY uk_shop_dealer_referee_tenant_user_level (tenant_id, user_id, level);
+```
+

docs/TICKET_PACKAGE_FEATURE_PLAN.md

@@ -0,0 +1,31 @@
+# 套票（冻结/可用、分期释放）功能开发计划
+
+## 目标
+- 为“买N送M（例如买1送4）、起售（例如20桶起售）、按月释放（例如每月释放10桶）、可用未用完叠加”的套票/权益，提供后端可配置、可发放、可释放、可消费的能力。
+
+## 核心概念
+- 套票模板：按商品(goodsId)配置买赠规则、起售/起送、释放规则（每期释放数或释放期数）、首期释放时机。
+- 用户套票账户：记录总量、可用量、冻结量、已用量、已释放量；绑定订单（用于幂等与追溯）。
+- 释放计划：每期一条，到期后把冻结转可用（可用未用完自然叠加）。
+- 变更流水：发放/释放/消费等都记录流水，便于对账与排查。
+
+## 关键默认规则（可在模板里改）
+- 仅赠送量进入套票账户（默认不包含“购买量”本身）；如需“买20送80=总100”，可在模板设置 `includeBuyQty=true`。
+- 首期释放：默认“支付成功当日/当刻”释放（`firstReleaseMode=0`）；如需“下个月同日释放”，设 `firstReleaseMode=1`。
+- 每期释放：默认按 `monthlyReleaseQty`；如配置了 `releasePeriods`，则平均分摊并处理余数。
+
+## 开发步骤（建议按顺序）
+1. 需求确认与接入点确认（订单哪个节点发放、桶票如何消费/核销、退款是否回滚、释放日期规则）。
+2. 数据表设计与SQL输出（模板/账户/释放计划/流水）。
+3. 实现套票模板后台CRUD接口。
+4. 支付成功接入：在订单支付成功后发放套票账户+生成释放计划（幂等）。
+5. 定时任务释放：扫描到期释放计划，执行“冻结->可用”转账（幂等）。
+6. 消费扣减：对用户可用量做扣减（支持跨多套票账户FIFO扣减），并落流水。
+7. 测试与验收：至少覆盖（买赠计算、分期拆分、叠加逻辑、幂等、并发扣减）。
+
+## 待确认点（不确认也可先按默认实现）
+- 套票数量=赠送量？还是（购买量+赠送量）？
+- “释放日期”是按支付时间的“日”还是固定每月某一天？（31号跨月如何处理？）
+- 退款/取消：是否回滚未使用的可用/冻结？已释放但未用如何处理？
+- 消费场景：在哪个业务点扣减（下单抵扣/提货核销/线下核销）？
+

docs/TICKET_PACKAGE_TABLES.sql

@@ -0,0 +1,121 @@
+-- 套票（冻结/可用、分期释放）相关表
+-- 说明：项目使用了 MyBatis-Plus 的 tenant 拦截；表内显式保留 tenant_id 字段并建议建立联合唯一索引。
+
+-- 1) 套票模板（按商品配置）
+CREATE TABLE IF NOT EXISTS shop_ticket_template (
+  id INT AUTO_INCREMENT PRIMARY KEY,
+  goods_id INT NOT NULL,
+  name VARCHAR(100) NOT NULL,
+
+  enabled TINYINT(1) NOT NULL DEFAULT 1,
+  unit_name VARCHAR(20) NOT NULL DEFAULT '桶',
+
+  -- 起售/起送
+  min_buy_qty INT NOT NULL DEFAULT 1,
+  start_send_qty INT NOT NULL DEFAULT 1,
+
+  -- 买赠：买1送4 => gift_multiplier=4
+  gift_multiplier INT NOT NULL DEFAULT 0,
+  -- 是否把购买量也计入套票总量（默认仅计入赠送量）
+  include_buy_qty TINYINT(1) NOT NULL DEFAULT 0,
+
+  -- 释放规则：二选一
+  -- A) 每期释放数量（默认每月释放10）
+  monthly_release_qty INT NOT NULL DEFAULT 10,
+  -- B) 总共释放多少期（若配置>0，则按期数平均分摊）
+  release_periods INT NULL,
+
+  -- 首期释放时机：0=支付成功当刻；1=下个月同日
+  first_release_mode INT NOT NULL DEFAULT 0,
+
+  comments VARCHAR(255) NULL,
+  sort_number INT NOT NULL DEFAULT 0,
+  user_id INT NULL,
+
+  deleted INT NOT NULL DEFAULT 0,
+  tenant_id INT NOT NULL,
+  create_time DATETIME NULL,
+  update_time DATETIME NULL,
+
+  UNIQUE KEY uk_ticket_template_tenant_goods (tenant_id, goods_id),
+  KEY idx_ticket_template_tenant (tenant_id)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+-- 2) 用户套票账户（一次购买通常生成一条）
+CREATE TABLE IF NOT EXISTS shop_user_ticket (
+  id BIGINT AUTO_INCREMENT PRIMARY KEY,
+  template_id INT NOT NULL,
+  goods_id INT NOT NULL,
+
+  user_id INT NOT NULL,
+  order_id INT NULL,
+  order_no VARCHAR(64) NULL,
+  order_goods_id INT NULL,
+
+  total_qty INT NOT NULL DEFAULT 0,
+  available_qty INT NOT NULL DEFAULT 0,
+  frozen_qty INT NOT NULL DEFAULT 0,
+  used_qty INT NOT NULL DEFAULT 0,
+  released_qty INT NOT NULL DEFAULT 0,
+
+  status INT NOT NULL DEFAULT 0,
+
+  deleted INT NOT NULL DEFAULT 0,
+  tenant_id INT NOT NULL,
+  create_time DATETIME NULL,
+  update_time DATETIME NULL,
+
+  KEY idx_user_ticket_user (tenant_id, user_id),
+  KEY idx_user_ticket_order (tenant_id, order_no),
+  UNIQUE KEY uk_user_ticket_order_goods (tenant_id, template_id, order_no, order_goods_id)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+-- 3) 释放计划/释放记录（每期一条，幂等执行）
+CREATE TABLE IF NOT EXISTS shop_user_ticket_release (
+  id BIGINT AUTO_INCREMENT PRIMARY KEY,
+  user_ticket_id BIGINT NOT NULL,
+  user_id INT NOT NULL,
+  period_no INT NOT NULL,
+
+  release_qty INT NOT NULL,
+  release_time DATETIME NOT NULL,
+
+  status INT NOT NULL DEFAULT 0, -- 0待释放 1已释放 2作废
+  released_time DATETIME NULL,
+
+  tenant_id INT NOT NULL,
+  create_time DATETIME NULL,
+  update_time DATETIME NULL,
+
+  UNIQUE KEY uk_ticket_release_period (tenant_id, user_ticket_id, period_no),
+  KEY idx_ticket_release_due (status, release_time),
+  KEY idx_ticket_release_user (tenant_id, user_id)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+-- 4) 套票变更流水（发放/释放/消费/回滚等）
+CREATE TABLE IF NOT EXISTS shop_user_ticket_log (
+  id BIGINT AUTO_INCREMENT PRIMARY KEY,
+  user_ticket_id BIGINT NOT NULL,
+  user_id INT NOT NULL,
+
+  change_type INT NOT NULL, -- 10发放 20释放 30消费 40回滚/退款
+  change_available INT NOT NULL DEFAULT 0,
+  change_frozen INT NOT NULL DEFAULT 0,
+  change_used INT NOT NULL DEFAULT 0,
+
+  available_after INT NOT NULL DEFAULT 0,
+  frozen_after INT NOT NULL DEFAULT 0,
+  used_after INT NOT NULL DEFAULT 0,
+
+  order_id INT NULL,
+  order_no VARCHAR(64) NULL,
+  remark VARCHAR(255) NULL,
+
+  tenant_id INT NOT NULL,
+  create_time DATETIME NULL,
+  update_time DATETIME NULL,
+
+  KEY idx_ticket_log_user (tenant_id, user_id),
+  KEY idx_ticket_log_ticket (tenant_id, user_ticket_id)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+

docs/ai/README.md

@@ -0,0 +1,61 @@
+# AI 模块（Ollama + RAG + 订单分析）
+
+## 1. 配置
+
+见 `src/main/resources/application.yml`：
+
+- `ai.ollama.base-url`：主地址（例如 `https://ai-api.websoft.top`）
+- `ai.ollama.fallback-url`：备用地址（例如 `http://47.119.165.234:11434`）
+- `ai.ollama.chat-model`：对话模型（`qwen3.5:cloud`）
+- `ai.ollama.embed-model`：向量模型（`qwen3-embedding:4b`）
+
+## 2. 建表（知识库）
+
+执行：`docs/ai/ai_kb_tables.sql`
+
+## 3. API
+
+说明：所有接口默认需要登录（`@PreAuthorize("isAuthenticated()")`），并且要求能够拿到 `tenantId`（header 或登录用户）。
+
+### 3.1 对话
+
+- `GET /api/ai/models`：获取 Ollama 模型列表
+- `POST /api/ai/chat`：非流式对话
+- `POST /api/ai/chat/stream`：流式对话（SSE）
+- `GET /api/ai/chat/stream?prompt=...`：流式对话（SSE，适配 EventSource）
+
+请求示例（非流式）：
+```json
+{
+  "prompt": "帮我写一个退款流程说明"
+}
+```
+
+### 3.2 知识库（RAG）
+
+- `POST /api/ai/kb/upload`：上传文档入库（建议 txt/md/html）
+- `POST /api/ai/kb/sync/cms`：同步 CMS 已发布文章到知识库（当前租户）
+- `POST /api/ai/kb/query`：仅检索 topK
+- `POST /api/ai/kb/ask`：检索 + 生成答案（答案要求引用 chunk_id）
+
+请求示例（ask）：
+```json
+{
+  "question": "怎么开具发票？",
+  "topK": 5
+}
+```
+
+### 3.3 商城订单分析（按租户/按天）
+
+- `POST /api/ai/analytics/query`：返回按天指标数据
+- `POST /api/ai/analytics/ask`：基于指标数据生成分析结论
+
+请求示例（ask）：
+```json
+{
+  "question": "最近30天支付率有没有明显下滑？请给出原因排查建议。",
+  "startDate": "2026-02-01",
+  "endDate": "2026-02-27"
+}
+```

docs/ai/ai_kb_tables.sql

@@ -0,0 +1,39 @@
+-- AI 知识库（RAG）建表脚本（MySQL）
+-- 说明：本项目使用 MyBatis-Plus 默认命名规则（AiKbDocument -> ai_kb_document）。
+
+CREATE TABLE IF NOT EXISTS `ai_kb_document` (
+  `document_id` INT NOT NULL AUTO_INCREMENT COMMENT '文档ID',
+  `title` VARCHAR(255) NULL COMMENT '标题',
+  `source_type` VARCHAR(32) NULL COMMENT '来源类型：upload/cms',
+  `source_id` INT NULL COMMENT '来源ID（如 cms.article_id）',
+  `source_ref` VARCHAR(255) NULL COMMENT '来源引用（如文件名、文章 code）',
+  `content_hash` CHAR(64) NULL COMMENT '内容hash(SHA-256)，用于增量同步',
+  `status` TINYINT NULL DEFAULT 0 COMMENT '状态',
+  `deleted` TINYINT NULL DEFAULT 0 COMMENT '逻辑删除：0否1是',
+  `tenant_id` INT NOT NULL COMMENT '租户ID',
+  `update_time` DATETIME NULL COMMENT '更新时间',
+  `create_time` DATETIME NULL COMMENT '创建时间',
+  PRIMARY KEY (`document_id`),
+  KEY `idx_ai_kb_document_tenant` (`tenant_id`),
+  KEY `idx_ai_kb_document_source` (`tenant_id`, `source_type`, `source_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='AI 知识库文档';
+
+CREATE TABLE IF NOT EXISTS `ai_kb_chunk` (
+  `id` INT NOT NULL AUTO_INCREMENT COMMENT '自增ID',
+  `document_id` INT NOT NULL COMMENT '文档ID',
+  `chunk_id` VARCHAR(64) NOT NULL COMMENT 'chunk 唯一ID（用于引用）',
+  `chunk_index` INT NULL COMMENT 'chunk 序号',
+  `title` VARCHAR(255) NULL COMMENT '标题（冗余，便于展示）',
+  `content` LONGTEXT NULL COMMENT 'chunk 文本',
+  `content_hash` CHAR(64) NULL COMMENT 'chunk 内容hash',
+  `embedding` LONGTEXT NULL COMMENT 'embedding(JSON数组)',
+  `embedding_norm` DOUBLE NULL COMMENT 'embedding L2 范数',
+  `deleted` TINYINT NULL DEFAULT 0 COMMENT '逻辑删除：0否1是',
+  `tenant_id` INT NOT NULL COMMENT '租户ID',
+  `create_time` DATETIME NULL COMMENT '创建时间',
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `uk_ai_kb_chunk_chunk_id` (`chunk_id`),
+  KEY `idx_ai_kb_chunk_tenant` (`tenant_id`),
+  KEY `idx_ai_kb_chunk_document` (`document_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='AI 知识库 chunk';
+

docs/ai/后端实现指南.md

@@ -0,0 +1,459 @@
+# 客户跟进7步骤后端实现指南
+
+## 📋 概述
+
+本指南详细说明如何实现客户跟进7个步骤功能的后端代码，包括数据库设计、Java后端实现和API接口。
+
+## 🗄️ 数据库设计
+
+### 1. 修改 credit_mp_customer 表结构
+
+```sql
+-- 为第5-7步添加字段（第1-4步基础字段已存在；如未包含审核时间/审核人字段，请先补齐 step1-4 的 approved_at/approved_by）
+-- 参考：docs/sql/credit_mp_customer_step1_4_approval_columns.sql
+-- 第5步：合同签订
+ALTER TABLE credit_mp_customer ADD COLUMN follow_step5_submitted TINYINT DEFAULT 0 COMMENT '是否已提交';
+ALTER TABLE credit_mp_customer ADD COLUMN follow_step5_submitted_at VARCHAR(255) COMMENT '提交时间';
+ALTER TABLE credit_mp_customer ADD COLUMN follow_step5_contracts TEXT COMMENT '合同信息JSON数组';
+ALTER TABLE credit_mp_customer ADD COLUMN follow_step5_need_approval TINYINT DEFAULT 1 COMMENT '是否需要审核';
+ALTER TABLE credit_mp_customer ADD COLUMN follow_step5_approved TINYINT DEFAULT 0 COMMENT '是否审核通过';
+ALTER TABLE credit_mp_customer ADD COLUMN follow_step5_approved_at VARCHAR(255) COMMENT '审核时间';
+ALTER TABLE credit_mp_customer ADD COLUMN follow_step5_approved_by BIGINT COMMENT '审核人ID';
+
+-- 第6步：订单回款
+ALTER TABLE credit_mp_customer ADD COLUMN follow_step6_submitted TINYINT DEFAULT 0 COMMENT '是否已提交';
+ALTER TABLE credit_mp_customer ADD COLUMN follow_step6_submitted_at VARCHAR(255) COMMENT '提交时间';
+ALTER TABLE credit_mp_customer ADD COLUMN follow_step6_payment_records TEXT COMMENT '财务录入的回款记录JSON数组';
+ALTER TABLE credit_mp_customer ADD COLUMN follow_step6_expected_payments TEXT COMMENT '预计回款JSON数组';
+ALTER TABLE credit_mp_customer ADD COLUMN follow_step6_need_approval TINYINT DEFAULT 1 COMMENT '是否需要审核';
+ALTER TABLE credit_mp_customer ADD COLUMN follow_step6_approved TINYINT DEFAULT 0 COMMENT '是否审核通过';
+ALTER TABLE credit_mp_customer ADD COLUMN follow_step6_approved_at VARCHAR(255) COMMENT '审核时间';
+ALTER TABLE credit_mp_customer ADD COLUMN follow_step6_approved_by BIGINT COMMENT '审核人ID';
+
+-- 第7步：电话回访
+ALTER TABLE credit_mp_customer ADD COLUMN follow_step7_submitted TINYINT DEFAULT 0 COMMENT '是否已提交';
+ALTER TABLE credit_mp_customer ADD COLUMN follow_step7_submitted_at VARCHAR(255) COMMENT '提交时间';
+ALTER TABLE credit_mp_customer ADD COLUMN follow_step7_visit_records TEXT COMMENT '回访记录JSON数组';
+ALTER TABLE credit_mp_customer ADD COLUMN follow_step7_need_approval TINYINT DEFAULT 1 COMMENT '是否需要审核';
+ALTER TABLE credit_mp_customer ADD COLUMN follow_step7_approved TINYINT DEFAULT 0 COMMENT '是否审核通过';
+ALTER TABLE credit_mp_customer ADD COLUMN follow_step7_approved_at VARCHAR(255) COMMENT '审核时间';
+ALTER TABLE credit_mp_customer ADD COLUMN follow_step7_approved_by BIGINT COMMENT '审核人ID';
+
+-- 添加流程结束相关字段
+ALTER TABLE credit_mp_customer ADD COLUMN follow_process_ended TINYINT DEFAULT 0 COMMENT '流程是否已结束';
+ALTER TABLE credit_mp_customer ADD COLUMN follow_process_end_time VARCHAR(255) COMMENT '流程结束时间';
+ALTER TABLE credit_mp_customer ADD COLUMN follow_process_end_reason TEXT COMMENT '流程结束原因';
+```
+
+### 2. 创建审核记录表（可选）
+
+```sql
+CREATE TABLE credit_follow_approval (
+  id BIGINT PRIMARY KEY AUTO_INCREMENT,
+  customer_id BIGINT NOT NULL COMMENT '客户ID',
+  step TINYINT NOT NULL COMMENT '步骤号',
+  approved TINYINT NOT NULL COMMENT '是否通过',
+  remark TEXT COMMENT '审核备注',
+  approved_by BIGINT COMMENT '审核人ID',
+  approved_at VARCHAR(255) COMMENT '审核时间',
+  created_at VARCHAR(255) COMMENT '创建时间',
+  INDEX idx_customer_step (customer_id, step),
+  INDEX idx_approved_by (approved_by)
+) COMMENT='跟进步骤审核记录';
+```
+
+## ☕ Java后端实现
+
+### 1. 实体类修改
+
+```java
+// CreditMpCustomer.java 添加字段
+public class CreditMpCustomer {
+    // ... 现有字段
+    
+    // 第5步字段
+    private Integer followStep5Submitted;
+    private String followStep5SubmittedAt;
+    private String followStep5Contracts;
+    private Integer followStep5NeedApproval;
+    private Integer followStep5Approved;
+    private String followStep5ApprovedAt;
+    private Long followStep5ApprovedBy;
+    
+    // 第6步字段
+    private Integer followStep6Submitted;
+    private String followStep6SubmittedAt;
+    private String followStep6PaymentRecords;
+    private String followStep6ExpectedPayments;
+    private Integer followStep6NeedApproval;
+    private Integer followStep6Approved;
+    private String followStep6ApprovedAt;
+    private Long followStep6ApprovedBy;
+    
+    // 第7步字段
+    private Integer followStep7Submitted;
+    private String followStep7SubmittedAt;
+    private String followStep7VisitRecords;
+    private Integer followStep7NeedApproval;
+    private Integer followStep7Approved;
+    private String followStep7ApprovedAt;
+    private Long followStep7ApprovedBy;
+    
+    // 流程结束字段
+    private Integer followProcessEnded;
+    private String followProcessEndTime;
+    private String followProcessEndReason;
+    
+    // getter/setter 方法...
+}
+```
+
+### 2. DTO类创建
+
+```java
+// FollowStepApprovalDTO.java
+@Data
+public class FollowStepApprovalDTO {
+    private Long customerId;
+    private Integer step;
+    private Boolean approved;
+    private String remark;
+}
+
+// BatchFollowStepApprovalDTO.java
+@Data
+public class BatchFollowStepApprovalDTO {
+    private List<FollowStepApprovalDTO> approvals;
+}
+
+// FollowStatisticsDTO.java
+@Data
+public class FollowStatisticsDTO {
+    private Integer totalSteps;
+    private Integer completedSteps;
+    private Integer currentStep;
+    private Double progress;
+    private List<FollowStepDetailDTO> stepDetails;
+}
+
+// FollowStepDetailDTO.java
+@Data
+public class FollowStepDetailDTO {
+    private Integer step;
+    private String title;
+    private String status; // pending, submitted, approved, rejected
+    private String submittedAt;
+    private String approvedAt;
+}
+```
+
+### 3. Service层实现
+
+```java
+// CreditMpCustomerServiceImpl.java 添加方法
+
+@Service
+public class CreditMpCustomerServiceImpl implements CreditMpCustomerService {
+    
+    /**
+     * 审核跟进步骤
+     */
+    @Override
+    @Transactional
+    public void approveFollowStep(FollowStepApprovalDTO dto) {
+        CreditMpCustomer customer = getById(dto.getCustomerId());
+        if (customer == null) {
+            throw new ServiceException("客户不存在");
+        }
+        
+        // 验证步骤是否已提交
+        if (!isStepSubmitted(customer, dto.getStep())) {
+            throw new ServiceException("该步骤尚未提交，无法审核");
+        }
+        
+        // 更新审核状态
+        updateStepApproval(customer, dto);
+        
+        // 记录审核日志
+        saveApprovalLog(dto);
+        
+        // 如果审核通过，更新客户步骤状态
+        if (dto.getApproved()) {
+            updateCustomerStep(customer, dto.getStep());
+        }
+    }
+    
+    /**
+     * 批量审核跟进步骤
+     */
+    @Override
+    @Transactional
+    public void batchApproveFollowSteps(BatchFollowStepApprovalDTO dto) {
+        for (FollowStepApprovalDTO approval : dto.getApprovals()) {
+            approveFollowStep(approval);
+        }
+    }
+    
+    /**
+     * 获取待审核的跟进步骤列表
+     */
+    @Override
+    public List<PendingApprovalStepVO> getPendingApprovalSteps(FollowStepQueryDTO query) {
+        return baseMapper.selectPendingApprovalSteps(query);
+    }
+    
+    /**
+     * 获取客户跟进统计
+     */
+    @Override
+    public FollowStatisticsDTO getFollowStatistics(Long customerId) {
+        CreditMpCustomer customer = getById(customerId);
+        if (customer == null) {
+            throw new ServiceException("客户不存在");
+        }
+        
+        FollowStatisticsDTO statistics = new FollowStatisticsDTO();
+        statistics.setTotalSteps(7);
+        
+        List<FollowStepDetailDTO> stepDetails = new ArrayList<>();
+        int completedSteps = 0;
+        int currentStep = 1;
+        
+        for (int i = 1; i <= 7; i++) {
+            FollowStepDetailDTO detail = getStepDetail(customer, i);
+            stepDetails.add(detail);
+            
+            if ("approved".equals(detail.getStatus())) {
+                completedSteps++;
+                currentStep = i + 1;
+            } else if ("submitted".equals(detail.getStatus()) && currentStep == 1) {
+                currentStep = i;
+            }
+        }
+        
+        statistics.setCompletedSteps(completedSteps);
+        statistics.setCurrentStep(Math.min(currentStep, 7));
+        statistics.setProgress((double) completedSteps / 7 * 100);
+        statistics.setStepDetails(stepDetails);
+        
+        return statistics;
+    }
+    
+    /**
+     * 结束客户跟进流程
+     */
+    @Override
+    @Transactional
+    public void endFollowProcess(Long customerId, String reason) {
+        CreditMpCustomer customer = getById(customerId);
+        if (customer == null) {
+            throw new ServiceException("客户不存在");
+        }
+        
+        customer.setFollowProcessEnded(1);
+        customer.setFollowProcessEndTime(DateUtil.formatDateTime(new Date()));
+        customer.setFollowProcessEndReason(reason);
+        
+        updateById(customer);
+    }
+    
+    // 私有辅助方法...
+    private boolean isStepSubmitted(CreditMpCustomer customer, Integer step) {
+        switch (step) {
+            case 1: return customer.getFollowStep1Submitted() == 1;
+            case 2: return customer.getFollowStep2Submitted() == 1;
+            // ... 其他步骤
+            case 7: return customer.getFollowStep7Submitted() == 1;
+            default: return false;
+        }
+    }
+    
+    private void updateStepApproval(CreditMpCustomer customer, FollowStepApprovalDTO dto) {
+        String currentTime = DateUtil.formatDateTime(new Date());
+        Long currentUserId = SecurityFrameworkUtils.getLoginUserId();
+        
+        switch (dto.getStep()) {
+            case 5:
+                customer.setFollowStep5Approved(dto.getApproved() ? 1 : 0);
+                customer.setFollowStep5ApprovedAt(currentTime);
+                customer.setFollowStep5ApprovedBy(currentUserId);
+                break;
+            case 6:
+                customer.setFollowStep6Approved(dto.getApproved() ? 1 : 0);
+                customer.setFollowStep6ApprovedAt(currentTime);
+                customer.setFollowStep6ApprovedBy(currentUserId);
+                break;
+            case 7:
+                customer.setFollowStep7Approved(dto.getApproved() ? 1 : 0);
+                customer.setFollowStep7ApprovedAt(currentTime);
+                customer.setFollowStep7ApprovedBy(currentUserId);
+                break;
+        }
+        
+        updateById(customer);
+    }
+}
+```
+
+### 4. Controller层实现
+
+```java
+// CreditMpCustomerController.java 添加接口
+
+@RestController
+@RequestMapping("/credit/credit-mp-customer")
+public class CreditMpCustomerController {
+    
+    @PostMapping("/approve-follow-step")
+    @OperLog(title = "审核跟进步骤", businessType = BusinessType.UPDATE)
+    public R<Void> approveFollowStep(@RequestBody FollowStepApprovalDTO dto) {
+        creditMpCustomerService.approveFollowStep(dto);
+        return R.ok();
+    }
+    
+    @PostMapping("/batch-approve-follow-steps")
+    @OperLog(title = "批量审核跟进步骤", businessType = BusinessType.UPDATE)
+    public R<Void> batchApproveFollowSteps(@RequestBody BatchFollowStepApprovalDTO dto) {
+        creditMpCustomerService.batchApproveFollowSteps(dto);
+        return R.ok();
+    }
+    
+    @GetMapping("/pending-approval-steps")
+    @OperLog(title = "获取待审核跟进步骤", businessType = BusinessType.SELECT)
+    public R<List<PendingApprovalStepVO>> getPendingApprovalSteps(FollowStepQueryDTO query) {
+        List<PendingApprovalStepVO> list = creditMpCustomerService.getPendingApprovalSteps(query);
+        return R.ok(list);
+    }
+    
+    @GetMapping("/follow-statistics/{customerId}")
+    @OperLog(title = "获取客户跟进统计", businessType = BusinessType.SELECT)
+    public R<FollowStatisticsDTO> getFollowStatistics(@PathVariable Long customerId) {
+        FollowStatisticsDTO statistics = creditMpCustomerService.getFollowStatistics(customerId);
+        return R.ok(statistics);
+    }
+    
+    @PostMapping("/end-follow-process")
+    @OperLog(title = "结束客户跟进流程", businessType = BusinessType.UPDATE)
+    public R<Void> endFollowProcess(@RequestBody EndFollowProcessDTO dto) {
+        creditMpCustomerService.endFollowProcess(dto.getCustomerId(), dto.getReason());
+        return R.ok();
+    }
+}
+```
+
+### 5. Mapper层SQL
+
+```xml
+<!-- CreditMpCustomerMapper.xml 添加查询方法 -->
+
+<select id="selectPendingApprovalSteps" resultType="com.your.package.PendingApprovalStepVO">
+    SELECT 
+        c.id as customerId,
+        c.to_user as customerName,
+        5 as step,
+        '合同签订' as stepTitle,
+        c.follow_step5_submitted_at as submittedAt,
+        u.real_name as submittedBy,
+        c.follow_step5_contracts as content
+    FROM credit_mp_customer c
+    LEFT JOIN sys_user u ON c.user_id = u.user_id
+    WHERE c.follow_step5_submitted = 1 
+    AND c.follow_step5_approved = 0 
+    AND c.deleted = 0
+    
+    UNION ALL
+    
+    SELECT 
+        c.id as customerId,
+        c.to_user as customerName,
+        6 as step,
+        '订单回款' as stepTitle,
+        c.follow_step6_submitted_at as submittedAt,
+        u.real_name as submittedBy,
+        c.follow_step6_expected_payments as content
+    FROM credit_mp_customer c
+    LEFT JOIN sys_user u ON c.user_id = u.user_id
+    WHERE c.follow_step6_submitted = 1 
+    AND c.follow_step6_approved = 0 
+    AND c.deleted = 0
+    
+    UNION ALL
+    
+    SELECT 
+        c.id as customerId,
+        c.to_user as customerName,
+        7 as step,
+        '电话回访' as stepTitle,
+        c.follow_step7_submitted_at as submittedAt,
+        u.real_name as submittedBy,
+        c.follow_step7_visit_records as content
+    FROM credit_mp_customer c
+    LEFT JOIN sys_user u ON c.user_id = u.user_id
+    WHERE c.follow_step7_submitted = 1 
+    AND c.follow_step7_approved = 0 
+    AND c.deleted = 0
+    
+    <if test="step != null">
+        HAVING step = #{step}
+    </if>
+    <if test="customerId != null">
+        HAVING customerId = #{customerId}
+    </if>
+    ORDER BY submittedAt DESC
+</select>
+```
+
+## 🔧 业务逻辑说明
+
+### 1. 步骤解锁机制
+- 第一步始终可用
+- 后续步骤需要前一步审核通过才能进行
+- 前端通过 `canEnterStep` 逻辑控制
+
+### 2. 审核流程
+- 步骤提交后设置 `needApproval = 1`
+- 管理员在后台审核
+- 审核通过后设置 `approved = 1` 并更新时间
+
+### 3. 数据格式
+- 所有复杂数据使用JSON格式存储
+- 文件上传返回URL，存储在JSON数组中
+- 时间统一使用 `YYYY-MM-DD HH:mm:ss` 格式
+
+### 4. 权限控制
+- 销售只能提交和查看自己的客户
+- 管理员可以审核所有步骤
+- 财务人员可以录入第6步回款数据
+
+## 📱 前端集成
+
+前端代码已经完成，包括：
+- 7个步骤的完整页面
+- 步骤状态显示和跳转逻辑
+- 数据提交和验证
+- 客户详情页面的汇总显示
+
+## 🚀 部署步骤
+
+1. 执行数据库迁移脚本
+2. 部署Java后端代码
+3. 更新前端API调用
+4. 测试完整流程
+5. 配置权限和审核流程
+
+## 📝 注意事项
+
+1. **数据备份**：执行数据库变更前请备份
+2. **权限配置**：确保各角色权限正确配置
+3. **文件上传**：确认文件上传服务正常
+4. **审核流程**：测试审核流程的完整性
+5. **性能优化**：大量数据时考虑分页和索引优化
+
+## 🔄 后续扩展
+
+可以考虑的功能：
+- 跟进模板和标准化流程
+- 自动提醒和通知
+- 数据统计和报表
+- 跟进效率分析
+- 客户满意度评估

docs/sql/2026-02-06_glt_ticket_order_delivery_fields.sql

@@ -0,0 +1,14 @@
+-- 水票配送订单：配送流程字段（需在数据库执行）
+-- 表：glt_ticket_order
+
+ALTER TABLE glt_ticket_order2
+  ADD COLUMN delivery_status INT NULL DEFAULT 10 COMMENT '配送状态：10待配送、20配送中、30待客户确认、40已完成',
+  ADD COLUMN send_start_time DATETIME NULL COMMENT '开始配送时间',
+  ADD COLUMN send_end_time DATETIME NULL COMMENT '确认送达时间',
+  ADD COLUMN send_end_img VARCHAR(512) NULL COMMENT '送达拍照留档图片URL',
+  ADD COLUMN receive_confirm_time DATETIME NULL COMMENT '客户确认收货时间',
+  ADD COLUMN receive_confirm_type INT NULL COMMENT '确认方式：10手动、20照片、30超时';
+
+CREATE INDEX idx_glt_ticket_order_rider_status ON glt_ticket_order (tenant_id, rider_id, delivery_status, deleted);
+CREATE INDEX idx_glt_ticket_order_user_status ON glt_ticket_order (tenant_id, user_id, delivery_status, deleted);
+

docs/sql/2026-03-18_credit_user_add_indexes.sql

@@ -0,0 +1,34 @@
+-- credit_user 索引优化（MySQL/InnoDB）
+--
+-- 背景：
+-- - credit_user 列表分页默认排序：sort_number asc, create_time desc
+-- - 常见过滤：tenant_id（TenantLine 自动追加）、deleted=0、company_id、user_id、create_time 范围
+-- - 统计/刷新关联数：WHERE deleted=0 AND company_id IN (...) GROUP BY company_id
+--
+-- 使用前建议先查看现有索引，避免重复：
+--   SHOW INDEX FROM credit_user;
+--
+-- 注意：
+-- - 大表加索引会消耗 IO/CPU，建议在低峰执行。
+-- - MySQL 8 可考虑：ALTER TABLE ... ALGORITHM=INPLACE, LOCK=NONE（视版本/引擎而定）。
+
+-- 1) 覆盖默认分页排序 + 逻辑删除 + 租户隔离
+--    典型：WHERE tenant_id=? AND deleted=0 ORDER BY sort_number, create_time DESC LIMIT ...
+CREATE INDEX idx_credit_user_tenant_deleted_sort_create_id
+    ON credit_user (tenant_id, deleted, sort_number, create_time, id);
+
+-- 2) 企业维度查询/统计（也服务于 credit_company 记录数刷新）
+--    典型：WHERE tenant_id=? AND company_id=? AND deleted=0 ...
+--    典型：WHERE tenant_id=? AND deleted=0 AND company_id IN (...) GROUP BY company_id
+CREATE INDEX idx_credit_user_tenant_company_deleted
+    ON credit_user (tenant_id, company_id, deleted);
+
+-- 3) 用户维度查询（后台常按录入人/负责人筛选）
+--    典型：WHERE tenant_id=? AND user_id=? AND deleted=0 ...
+CREATE INDEX idx_credit_user_tenant_user_deleted
+    ON credit_user (tenant_id, user_id, deleted);
+
+-- 可选：如果你们经常按 type 过滤（0/1），再加这个（否则先别加，避免过多索引影响写入）
+-- CREATE INDEX idx_credit_user_tenant_type_deleted
+--     ON credit_user (tenant_id, type, deleted);
+

docs/sql/credit_mp_customer_step1_4_approval_columns.sql

@@ -0,0 +1,24 @@
+-- 修复：审核接口(updateStepApproval)会写入 follow_step{1..4}_approved_at / follow_step{1..4}_approved_by
+-- 若数据库缺少这些列，会触发：Unknown column 'follow_step1_approved_at' in 'field list'
+--
+-- 建议先检查：
+--   SHOW COLUMNS FROM credit_mp_customer LIKE 'follow_step%_approved%';
+--
+-- 然后按需执行下面的 ALTER TABLE（如果你的 MySQL 版本支持，也可以改为 ADD COLUMN IF NOT EXISTS）。
+
+-- 第1步：案件受理
+ALTER TABLE credit_mp_customer ADD COLUMN follow_step1_approved_at VARCHAR(255) NULL COMMENT '第1步审核时间';
+ALTER TABLE credit_mp_customer ADD COLUMN follow_step1_approved_by BIGINT NULL COMMENT '第1步审核人ID';
+
+-- 第2步：材料准备
+ALTER TABLE credit_mp_customer ADD COLUMN follow_step2_approved_at VARCHAR(255) NULL COMMENT '第2步审核时间';
+ALTER TABLE credit_mp_customer ADD COLUMN follow_step2_approved_by BIGINT NULL COMMENT '第2步审核人ID';
+
+-- 第3步：案件办理
+ALTER TABLE credit_mp_customer ADD COLUMN follow_step3_approved_at VARCHAR(255) NULL COMMENT '第3步审核时间';
+ALTER TABLE credit_mp_customer ADD COLUMN follow_step3_approved_by BIGINT NULL COMMENT '第3步审核人ID';
+
+-- 第4步：送达签收
+ALTER TABLE credit_mp_customer ADD COLUMN follow_step4_approved_at VARCHAR(255) NULL COMMENT '第4步审核时间';
+ALTER TABLE credit_mp_customer ADD COLUMN follow_step4_approved_by BIGINT NULL COMMENT '第4步审核人ID';
+

docs/水票配送订单-后端提示词.md

@@ -0,0 +1,98 @@
+# 水票配送订单：后端提示词（可直接发给后端）
+
+> 目标：把“水票下单后 -> 配送员接单/配送 -> 用户确认 -> 自动确认”的闭环放到后端，用明确的字段 + 状态机校验保证不越权、不乱跳状态、并发不重复接单。
+>
+> 接口前缀：当前后端控制器为 `@RequestMapping("/api/glt/glt-ticket-order")`，下文默认都带 `/api` 前缀（如需兼容旧路径，可做网关转发或保留旧路由）。
+
+## 0) 角色与权限边界（务必在后端兜底）
+- 用户端（小程序用户）：只能看/操作自己的订单（`userId` = token userId）。
+- 配送员端：只能看/操作分配给自己的订单（`riderId` = token userId / rider userId）。
+- 管理端：按后台权限控制（可查询/派单/改状态，但仍需 tenantId 隔离）。
+
+建议：对“配送员端接口”忽略前端传入的 `riderId/userId/tenantId`，统一从登录态注入，避免越权。
+
+## 1) 订单查询（配送员端）
+建议提供配送员专用分页接口：`GET /api/glt/glt-ticket-order/rider/page`（避免与后台管理分页混用）。
+请支持以下筛选，并保证权限隔离：
+- `deliveryStatus`：10待配送、20配送中、30待客户确认、40已完成（配送员端必要；不传默认=10）
+- `keywords`：支持按地址/备注等模糊搜索（可选）
+- 排序：建议默认 `sendTime asc, createTime desc`（或沿用后端默认排序，但请告知前端）
+
+权限隔离要求（配送员端）：
+- 只返回当前登录配送员的订单：后端强制 `param.riderId = loginUserId`（前端传不传都一样）。
+- `tenantId/deleted` 等同样后端兜底（只查当前租户、只查未删除）。
+
+返回字段建议（配送员端用得上）：
+- 门店/仓库/用户/配送员的展示字段：`storeName/storeAddress/storePhone`、`warehouseName/warehouseAddress`、`nickname/phone/avatar`、`riderName/riderPhone`（现有 `pageRel/listRel` 已在做关联返回）。
+- 导航相关（详见第 5 节）：收货地址 `lat/lng`、门店/仓库 `lngAndLat`（可关联返回或做快照字段）。
+
+## 2) 配送流程字段（建议后端落库并回传）
+订单表建议确保有以下字段（当前前端已按这些字段做流程判断/展示）：
+- `riderId/riderName/riderPhone`：配送员信息
+- `deliveryStatus`：10/20/30/40
+- `sendStartTime`：配送员点击“开始配送”的时间（建议 datetime）
+- `sendEndTime`：配送员点击“确认送达”的时间（建议 datetime）
+- `sendEndImg`：送达拍照留档图片 URL（可选/必填由后端策略决定；建议 varchar(512)）
+- `receiveConfirmTime`：客户确认收货时间（建议 datetime）
+- `receiveConfirmType`：10客户手动确认、20配送照片自动确认、30超时自动确认
+
+数据库变更（示例SQL见：`docs/sql/2026-02-06_glt_ticket_order_delivery_fields.sql`）。
+
+强烈建议把“配送状态”与“业务状态(status=0/1、deleted=0/1)”分开，避免混用：
+- `status/deleted`：系统通用字段（现有逻辑）
+- `deliveryStatus`：配送流程状态（本需求新增）
+
+## 3) 状态流转与校验（强烈建议在后端做）
+请在更新订单时做状态机校验，避免前端绕过流程：
+- `10 -> 20`：仅允许订单属于当前配送员，且未开始/未送达
+- `20 -> 30`：配送员确认送达（可带 `sendEndImg`）
+- `20/30 -> 40`：完成；来源可能是
+  - 客户手动确认（写 `receiveConfirmTime` + `receiveConfirmType=10`）
+  - 配送照片直接完成（写 `receiveConfirmTime` + `receiveConfirmType=20`，并要求 `sendEndImg`）
+  - 超时自动确认（写 `receiveConfirmTime` + `receiveConfirmType=30`，建议由定时任务执行）
+
+并发/幂等建议（避免重复点击/重复请求带来的脏数据）：
+- 所有“状态变更接口”用条件更新实现原子校验：`UPDATE ... SET ... WHERE id=? AND rider_id=? AND delivery_status=? AND deleted=0`
+- 对重复调用做幂等：
+  - `start`：如果已是 20 则直接返回成功；如果已到 30/40 返回“状态不允许”
+  - `delivered`：如果已是 30/40 则返回成功（或提示已送达）；避免重复写 `sendEndTime`
+  - `confirm-receive`：如果已是 40 则返回成功（或提示已完成）
+
+## 4) 建议新增/明确的接口能力
+为了避免并发抢单/越权更新，建议新增更语义化的接口（或在 update 内做等价校验）：
+- 接单（抢单/派单）：`POST /api/glt/glt-ticket-order/{id}/accept`
+  - 配送员端：后端原子校验：仅当 `rider_id IS NULL`（或为 0）时才能写入当前 rider 信息
+  - 管理端派单：允许传 `riderId`，但需校验骑手归属门店/租户（如有该约束）
+- 开始配送：`POST /api/glt/glt-ticket-order/{id}/start`
+  - 写：`sendStartTime=now`、`deliveryStatus=20`
+  - 校验：必须 `riderId=当前登录配送员` 且当前 `deliveryStatus=10`
+- 确认送达：`POST /api/glt/glt-ticket-order/{id}/delivered`
+  - 入参：`sendEndImg`（可选/必填，按策略）
+  - 写：`sendEndTime=now`、`deliveryStatus=30`、`sendEndImg`
+  - 可选策略 A（推荐可配置）：若 `sendEndImg` 必填且存在，则可直接 `deliveryStatus=40` 并写 `receiveConfirmTime/Type=20`
+- 客户确认收货：`POST /api/glt/glt-ticket-order/{id}/confirm-receive`
+  - 校验：只能本人 `userId` 操作，且必须 `deliveryStatus=30`
+  - 写：`deliveryStatus=40`、`receiveConfirmTime=now`、`receiveConfirmType=10`
+
+接口返回建议：
+- 成功统一返回 `ApiResult.success(...)`
+- 失败请返回明确 msg（例如：`无权限`、`订单不存在`、`订单状态不允许`、`订单已被其他配送员接单`）
+
+## 5) 为了“导航到收货地址/取货点”的字段补充（建议）
+当前仅有 `address` 字符串，无法在小程序内 `openLocation` 精准导航；建议补充：
+- 收货地址（推荐至少返回）：`receiverName`、`receiverPhone`、`province/city/region/address/fullAddress`、`lat/lng`
+- 取货点（门店/仓库，推荐至少返回）：`store.lngAndLat`、`warehouse.lngAndLat`
+
+实现方式二选一：
+- 方式 A（更快）：查询时关联 `shop_user_address`、`shop_store`、`shop_warehouse`，把经纬度字段透出给前端。
+- 方式 B（更稳）：下单时把收货地址的 `name/phone/lat/lng/fullAddress` 以及门店/仓库 `lngAndLat` 做快照写入订单，避免后续数据变更影响历史订单导航。
+
+## 6)（可选但很有用）超时自动确认规则
+- 建议后端提供可配置项：`autoConfirmHours`（例如 24h/48h）
+- 定时任务扫描：`deliveryStatus=30` 且 `sendEndTime < now - autoConfirmHours` 的订单
+- 原子更新：只更新仍处于 30 的订单，写入 `deliveryStatus=40`、`receiveConfirmTime=now`、`receiveConfirmType=30`
+
+## 7)（可选）字段/枚举建议（便于前后端对齐）
+- `deliveryStatus`：10待配送、20配送中、30待客户确认、40已完成
+- `receiveConfirmType`：10客户手动确认、20配送照片自动确认、30超时自动确认
+- 时间字段统一返回格式：`yyyy-MM-dd HH:mm:ss`（与项目现有 `@JsonFormat` 风格一致）

pom.xml

@@ -38,6 +38,11 @@
       <artifactId>spring-boot-starter-test</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>com.h2database</groupId>
+      <artifactId>h2</artifactId>
+      <scope>test</scope>
+    </dependency>
 
     <!-- spring-boot-web -->
     <dependency>

scripts/fix-chinese-font.sh

@@ -1,125 +0,0 @@
-#!/bin/bash
-
-###############################################################################
-# 捐款证书中文乱码修复脚本
-# 用途：在运行中的Docker容器内安装中文字体
-# 适用于：无法重新构建镜像的紧急情况
-###############################################################################
-
-set -e  # 遇到错误立即退出
-
-# 颜色输出
-RED='\033[0;31m'
-GREEN='\033[0;32m'
-YELLOW='\033[1;33m'
-NC='\033[0m' # No Color
-
-# 容器名称（可根据实际情况修改）
-CONTAINER_NAME="websoft-api-container"
-
-echo -e "${GREEN}================================${NC}"
-echo -e "${GREEN}中文字体修复脚本${NC}"
-echo -e "${GREEN}================================${NC}"
-echo ""
-
-# 检查容器是否存在
-echo -e "${YELLOW}步骤 1/6: 检查容器状态...${NC}"
-if ! docker ps | grep -q "$CONTAINER_NAME"; then
-    echo -e "${RED}错误：容器 $CONTAINER_NAME 未运行！${NC}"
-    echo "当前运行的容器："
-    docker ps --format "table {{.Names}}\t{{.Status}}"
-    echo ""
-    read -p "请输入正确的容器名称: " CONTAINER_NAME
-    if [ -z "$CONTAINER_NAME" ]; then
-        echo -e "${RED}容器名称不能为空，退出。${NC}"
-        exit 1
-    fi
-fi
-echo -e "${GREEN}✓ 容器正在运行${NC}"
-echo ""
-
-# 检查是否已安装字体
-echo -e "${YELLOW}步骤 2/6: 检查是否已安装中文字体...${NC}"
-if docker exec "$CONTAINER_NAME" fc-list :lang=zh 2>/dev/null | grep -q "WenQuanYi"; then
-    echo -e "${GREEN}✓ 中文字体已安装${NC}"
-    docker exec "$CONTAINER_NAME" fc-list :lang=zh
-    echo ""
-    read -p "是否重新安装？(y/N): " REINSTALL
-    if [[ ! "$REINSTALL" =~ ^[Yy]$ ]]; then
-        echo "跳过安装，退出。"
-        exit 0
-    fi
-else
-    echo -e "${YELLOW}未检测到中文字体，开始安装...${NC}"
-fi
-echo ""
-
-# 安装字体工具
-echo -e "${YELLOW}步骤 3/6: 安装字体工具...${NC}"
-docker exec -u root "$CONTAINER_NAME" sh -c "apk add --no-cache fontconfig ttf-dejavu wget" || {
-    echo -e "${RED}✗ 字体工具安装失败${NC}"
-    exit 1
-}
-echo -e "${GREEN}✓ 字体工具安装成功${NC}"
-echo ""
-
-# 下载中文字体
-echo -e "${YELLOW}步骤 4/6: 下载文泉驿微米黑字体...${NC}"
-echo "正在从GitHub下载（约10MB），请稍候..."
-docker exec -u root "$CONTAINER_NAME" sh -c "
-    wget -O /tmp/wqy-microhei.ttc https://github.com/anthonyfok/fonts-wqy-microhei/raw/master/wqy-microhei.ttc 2>&1 | grep -E 'Connecting|Length|saved' || true
-" || {
-    echo -e "${YELLOW}GitHub下载失败，尝试使用代理...${NC}"
-    docker exec -u root "$CONTAINER_NAME" sh -c "
-        wget -O /tmp/wqy-microhei.ttc https://ghproxy.com/https://github.com/anthonyfok/fonts-wqy-microhei/raw/master/wqy-microhei.ttc
-    " || {
-        echo -e "${RED}✗ 字体下载失败${NC}"
-        echo "请检查网络连接或手动下载字体文件。"
-        exit 1
-    }
-}
-echo -e "${GREEN}✓ 字体下载成功${NC}"
-echo ""
-
-# 安装字体
-echo -e "${YELLOW}步骤 5/6: 安装字体文件...${NC}"
-docker exec -u root "$CONTAINER_NAME" sh -c "
-    mkdir -p /usr/share/fonts/truetype/wqy && \
-    mv /tmp/wqy-microhei.ttc /usr/share/fonts/truetype/wqy/ && \
-    fc-cache -fv
-" || {
-    echo -e "${RED}✗ 字体安装失败${NC}"
-    exit 1
-}
-echo -e "${GREEN}✓ 字体安装成功${NC}"
-echo ""
-
-# 验证安装
-echo -e "${YELLOW}步骤 6/6: 验证字体安装...${NC}"
-FONT_COUNT=$(docker exec "$CONTAINER_NAME" fc-list :lang=zh | wc -l)
-if [ "$FONT_COUNT" -gt 0 ]; then
-    echo -e "${GREEN}✓ 中文字体验证成功！${NC}"
-    echo "已安装的中文字体："
-    docker exec "$CONTAINER_NAME" fc-list :lang=zh
-else
-    echo -e "${RED}✗ 字体验证失败${NC}"
-    exit 1
-fi
-echo ""
-
-# 完成提示
-echo -e "${GREEN}================================${NC}"
-echo -e "${GREEN}修复完成！${NC}"
-echo -e "${GREEN}================================${NC}"
-echo ""
-echo "后续步骤："
-echo "1. 不需要重启容器，字体已生效"
-echo "2. 重新生成捐款证书即可看到效果"
-echo "3. 如果仍有问题，请查看容器日志："
-echo "   docker logs -f $CONTAINER_NAME"
-echo ""
-echo -e "${YELLOW}注意：${NC}"
-echo "- 此修复方法在容器重启后会失效"
-echo "- 建议后续使用更新后的Dockerfile重新构建镜像"
-echo "- 详细文档请参考：docs/chinese-font-fix-guide.md"
-echo ""

src/main/java/com/gxwebsoft/ai/client/OllamaClient.java

@@ -0,0 +1,194 @@
+package com.gxwebsoft.ai.client;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.gxwebsoft.ai.client.dto.*;
+import com.gxwebsoft.ai.config.AiOllamaProperties;
+import com.gxwebsoft.common.core.exception.BusinessException;
+import com.gxwebsoft.common.core.utils.JSONUtil;
+import okhttp3.*;
+import okio.BufferedSource;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.io.IOException;
+import java.time.Duration;
+import java.util.Objects;
+import java.util.function.Consumer;
+
+/**
+ * 轻量 Ollama HTTP Client（兼容 /api/chat、/api/embeddings、/api/tags）。
+ */
+@Component
+public class OllamaClient {
+  @Resource
+  private AiOllamaProperties props;
+
+  @Resource
+  private ObjectMapper objectMapper;
+
+  private volatile OkHttpClient http;
+
+  private OkHttpClient http() {
+    OkHttpClient c = http;
+    if (c != null) {
+      return c;
+    }
+    synchronized (this) {
+      if (http == null) {
+        http = new OkHttpClient.Builder()
+          .connectTimeout(Duration.ofMillis(props.getConnectTimeoutMs()))
+          .readTimeout(Duration.ofMillis(props.getReadTimeoutMs()))
+          .writeTimeout(Duration.ofMillis(props.getWriteTimeoutMs()))
+          .build();
+      }
+      return http;
+    }
+  }
+
+  public OllamaTagsResponse tags() {
+    return getJson("/api/tags", OllamaTagsResponse.class);
+  }
+
+  public OllamaChatResponse chat(OllamaChatRequest req) {
+    if (req.getStream() == null) {
+      req.setStream(false);
+    }
+    return postJson("/api/chat", req, OllamaChatResponse.class);
+  }
+
+  /**
+   * 流式对话：Ollama 会返回按行分隔的 JSON。
+   */
+  public void chatStream(OllamaChatRequest req, Consumer<OllamaChatResponse> onEvent) {
+    Objects.requireNonNull(onEvent, "onEvent");
+    if (req.getStream() == null) {
+      req.setStream(true);
+    }
+
+    Request request = buildPost(baseUrl(), "/api/chat", JSONUtil.toJSONString(req));
+    try (Response resp = http().newCall(request).execute()) {
+      if (!resp.isSuccessful()) {
+        throw new BusinessException("Ollama chat stream failed: HTTP " + resp.code());
+      }
+      ResponseBody body = resp.body();
+      if (body == null) {
+        throw new BusinessException("Ollama chat stream failed: empty body");
+      }
+
+      BufferedSource source = body.source();
+      String line;
+      while ((line = source.readUtf8Line()) != null) {
+        line = line.trim();
+        if (line.isEmpty()) {
+          continue;
+        }
+        OllamaChatResponse event = objectMapper.readValue(line, OllamaChatResponse.class);
+        onEvent.accept(event);
+        if (Boolean.TRUE.equals(event.getDone())) {
+          break;
+        }
+      }
+    } catch (IOException e) {
+      throw new BusinessException("Ollama chat stream IO error: " + e.getMessage());
+    }
+  }
+
+  public OllamaEmbeddingResponse embedding(String prompt) {
+    OllamaEmbeddingRequest req = new OllamaEmbeddingRequest();
+    req.setModel(props.getEmbedModel());
+    req.setPrompt(prompt);
+    return postJson("/api/embeddings", req, OllamaEmbeddingResponse.class);
+  }
+
+  private String baseUrl() {
+    if (props.getBaseUrl() == null || props.getBaseUrl().trim().isEmpty()) {
+      throw new BusinessException("ai.ollama.base-url 未配置");
+    }
+    return props.getBaseUrl().trim();
+  }
+
+  private String fallbackUrl() {
+    if (props.getFallbackUrl() == null || props.getFallbackUrl().trim().isEmpty()) {
+      return null;
+    }
+    return props.getFallbackUrl().trim();
+  }
+
+  private <T> T getJson(String path, Class<T> clazz) {
+    try {
+      return getJsonOnce(baseUrl(), path, clazz);
+    } catch (Exception e) {
+      String fb = fallbackUrl();
+      if (fb == null) {
+        throw e;
+      }
+      return getJsonOnce(fb, path, clazz);
+    }
+  }
+
+  private <T> T getJsonOnce(String base, String path, Class<T> clazz) {
+    Request req = new Request.Builder()
+      .url(join(base, path))
+      .get()
+      .build();
+    try (Response resp = http().newCall(req).execute()) {
+      if (!resp.isSuccessful()) {
+        throw new BusinessException("Ollama GET failed: HTTP " + resp.code());
+      }
+      ResponseBody body = resp.body();
+      if (body == null) {
+        throw new BusinessException("Ollama GET failed: empty body");
+      }
+      return objectMapper.readValue(body.string(), clazz);
+    } catch (IOException e) {
+      throw new BusinessException("Ollama GET IO error: " + e.getMessage());
+    }
+  }
+
+  private <T> T postJson(String path, Object payload, Class<T> clazz) {
+    String json = JSONUtil.toJSONString(payload);
+    try {
+      return postJsonOnce(baseUrl(), path, json, clazz);
+    } catch (Exception e) {
+      String fb = fallbackUrl();
+      if (fb == null) {
+        throw e;
+      }
+      return postJsonOnce(fb, path, json, clazz);
+    }
+  }
+
+  private <T> T postJsonOnce(String base, String path, String json, Class<T> clazz) {
+    Request req = buildPost(base, path, json);
+    try (Response resp = http().newCall(req).execute()) {
+      if (!resp.isSuccessful()) {
+        throw new BusinessException("Ollama POST failed: HTTP " + resp.code());
+      }
+      ResponseBody body = resp.body();
+      if (body == null) {
+        throw new BusinessException("Ollama POST failed: empty body");
+      }
+      return objectMapper.readValue(body.string(), clazz);
+    } catch (IOException e) {
+      throw new BusinessException("Ollama POST IO error: " + e.getMessage());
+    }
+  }
+
+  private Request buildPost(String base, String path, String json) {
+    RequestBody body = RequestBody.create(json, MediaType.parse("application/json; charset=utf-8"));
+    return new Request.Builder()
+      .url(join(base, path))
+      .post(body)
+      .build();
+  }
+
+  private static String join(String base, String path) {
+    String b = base;
+    if (b.endsWith("/")) {
+      b = b.substring(0, b.length() - 1);
+    }
+    String p = path.startsWith("/") ? path : ("/" + path);
+    return b + p;
+  }
+}
+

src/main/java/com/gxwebsoft/ai/client/dto/OllamaChatRequest.java

@@ -0,0 +1,19 @@
+package com.gxwebsoft.ai.client.dto;
+
+import lombok.Data;
+
+import java.util.List;
+import java.util.Map;
+
+@Data
+public class OllamaChatRequest {
+  private String model;
+  private List<OllamaMessage> messages;
+  private Boolean stream;
+
+  /**
+   * Ollama options，例如：temperature、top_k、top_p、num_predict...
+   */
+  private Map<String, Object> options;
+}
+

src/main/java/com/gxwebsoft/ai/client/dto/OllamaChatResponse.java

@@ -0,0 +1,28 @@
+package com.gxwebsoft.ai.client.dto;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+
+@Data
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class OllamaChatResponse {
+  private String model;
+
+  @JsonProperty("created_at")
+  private String createdAt;
+
+  private OllamaMessage message;
+
+  private Boolean done;
+
+  @JsonProperty("total_duration")
+  private Long totalDuration;
+
+  @JsonProperty("prompt_eval_count")
+  private Integer promptEvalCount;
+
+  @JsonProperty("eval_count")
+  private Integer evalCount;
+}
+

src/main/java/com/gxwebsoft/ai/client/dto/OllamaEmbeddingRequest.java

@@ -0,0 +1,14 @@
+package com.gxwebsoft.ai.client.dto;
+
+import lombok.Data;
+
+@Data
+public class OllamaEmbeddingRequest {
+  private String model;
+
+  /**
+   * Ollama embeddings 目前常用字段为 prompt。
+   */
+  private String prompt;
+}
+

src/main/java/com/gxwebsoft/ai/client/dto/OllamaEmbeddingResponse.java

@@ -0,0 +1,13 @@
+package com.gxwebsoft.ai.client.dto;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class OllamaEmbeddingResponse {
+  private List<Double> embedding;
+}
+

src/main/java/com/gxwebsoft/ai/client/dto/OllamaMessage.java

@@ -0,0 +1,14 @@
+package com.gxwebsoft.ai.client.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class OllamaMessage {
+  private String role;
+  private String content;
+}
+

src/main/java/com/gxwebsoft/ai/client/dto/OllamaTagsResponse.java

@@ -0,0 +1,22 @@
+package com.gxwebsoft.ai.client.dto;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class OllamaTagsResponse {
+  private List<Model> models;
+
+  @Data
+  @JsonIgnoreProperties(ignoreUnknown = true)
+  public static class Model {
+    private String name;
+    private Long size;
+    private String digest;
+    private String modified_at;
+  }
+}
+

src/main/java/com/gxwebsoft/ai/config/AiOllamaProperties.java

@@ -0,0 +1,68 @@
+package com.gxwebsoft.ai.config;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+/**
+ * Ollama API 配置。
+ *
+ * 说明：本项目通过自建 Ollama 网关提供服务，因此这里用 baseUrl + fallbackUrl。
+ */
+@Data
+@Component
+@ConfigurationProperties(prefix = "ai.ollama")
+public class AiOllamaProperties {
+  /**
+   * 主地址，例如：https://ai-api.websoft.top
+   */
+  private String baseUrl;
+
+  /**
+   * 备用地址，例如：http://47.119.165.234:11434
+   */
+  private String fallbackUrl;
+
+  /**
+   * 对话模型，例如：qwen3.5:cloud
+   */
+  private String chatModel;
+
+  /**
+   * 向量模型，例如：qwen3-embedding:4b
+   */
+  private String embedModel;
+
+  /**
+   * HTTP 超时（毫秒）。
+   */
+  private long connectTimeoutMs = 10_000;
+  private long readTimeoutMs = 300_000;
+  private long writeTimeoutMs = 60_000;
+
+  /**
+   * 并发上限（用于 embedding/入库等批处理场景）。
+   */
+  private int maxConcurrency = 4;
+
+  /**
+   * RAG：检索候选 chunk 最大数量（避免一次性拉取过多数据导致内存/耗时过高）。
+   */
+  private int ragMaxCandidates = 2000;
+
+  /**
+   * RAG：检索返回 topK。
+   */
+  private int ragTopK = 5;
+
+  /**
+   * RAG：单个 chunk 最大字符数（用于入库切分）。
+   */
+  private int ragChunkSize = 800;
+
+  /**
+   * RAG：chunk 重叠字符数（用于减少语义断裂）。
+   */
+  private int ragChunkOverlap = 120;
+}
+

src/main/java/com/gxwebsoft/ai/controller/AiAnalyticsController.java

@@ -0,0 +1,37 @@
+package com.gxwebsoft.ai.controller;
+
+import com.gxwebsoft.ai.dto.*;
+import com.gxwebsoft.ai.service.AiAnalyticsService;
+import com.gxwebsoft.common.core.web.ApiResult;
+import com.gxwebsoft.common.core.web.BaseController;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+@Tag(name = "AI - 订单数据分析")
+@RestController
+@RequestMapping("/api/ai/analytics")
+public class AiAnalyticsController extends BaseController {
+  @Resource
+  private AiAnalyticsService analyticsService;
+
+  @PreAuthorize("isAuthenticated()")
+  @Operation(summary = "查询商城订单按天指标（当前租户）")
+  @PostMapping("/query")
+  public ApiResult<AiShopMetricsQueryResult> query(@RequestBody AiShopMetricsQueryRequest request) {
+    Integer tenantId = getTenantId();
+    return success(analyticsService.queryShopMetrics(tenantId, request));
+  }
+
+  @PreAuthorize("isAuthenticated()")
+  @Operation(summary = "AI 解析并输出订单分析结论（当前租户）")
+  @PostMapping("/ask")
+  public ApiResult<AiAnalyticsAskResult> ask(@RequestBody AiAnalyticsAskRequest request) {
+    Integer tenantId = getTenantId();
+    return success(analyticsService.askShopAnalytics(tenantId, request));
+  }
+}
+

src/main/java/com/gxwebsoft/ai/controller/AiChatController.java

@@ -0,0 +1,95 @@
+package com.gxwebsoft.ai.controller;
+
+import com.gxwebsoft.ai.client.OllamaClient;
+import com.gxwebsoft.ai.client.dto.OllamaChatResponse;
+import com.gxwebsoft.ai.client.dto.OllamaTagsResponse;
+import com.gxwebsoft.ai.dto.AiChatRequest;
+import com.gxwebsoft.ai.dto.AiChatResult;
+import com.gxwebsoft.ai.dto.AiMessage;
+import com.gxwebsoft.ai.service.AiChatService;
+import com.gxwebsoft.common.core.web.ApiResult;
+import com.gxwebsoft.common.core.web.BaseController;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.mvc.method.annotation.SseEmitter;
+
+import javax.annotation.Resource;
+import java.util.Collections;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.concurrent.CompletableFuture;
+
+@Tag(name = "AI - 对话")
+@RestController
+@RequestMapping("/api/ai")
+public class AiChatController extends BaseController {
+  @Resource
+  private OllamaClient ollamaClient;
+
+  @Resource
+  private AiChatService aiChatService;
+
+  @PreAuthorize("isAuthenticated()")
+  @Operation(summary = "获取 Ollama 模型列表")
+  @GetMapping("/models")
+  public ApiResult<OllamaTagsResponse> models() {
+    return success(ollamaClient.tags());
+  }
+
+  @PreAuthorize("isAuthenticated()")
+  @Operation(summary = "非流式对话")
+  @PostMapping("/chat")
+  public ApiResult<AiChatResult> chat(@RequestBody AiChatRequest request) {
+    return success(aiChatService.chat(request));
+  }
+
+  @PreAuthorize("isAuthenticated()")
+  @Operation(summary = "流式对话（SSE）")
+  @PostMapping("/chat/stream")
+  public SseEmitter chatStream(@RequestBody AiChatRequest request) {
+    // 10 分钟超时（可根据前端需要调整）
+    SseEmitter emitter = new SseEmitter(10 * 60 * 1000L);
+
+    CompletableFuture.runAsync(() -> {
+      try {
+        aiChatService.chatStream(request,
+          delta -> {
+            try {
+              emitter.send(SseEmitter.event().name("delta").data(delta));
+            } catch (Exception e) {
+              // 客户端断开会触发 send 异常，这里直接结束即可
+              emitter.complete();
+            }
+          },
+          (OllamaChatResponse done) -> {
+            try {
+              Map<String, Object> meta = new LinkedHashMap<>();
+              meta.put("model", done.getModel());
+              meta.put("prompt_eval_count", done.getPromptEvalCount());
+              meta.put("eval_count", done.getEvalCount());
+              meta.put("total_duration", done.getTotalDuration());
+              emitter.send(SseEmitter.event().name("done").data(meta));
+            } catch (Exception ignored) {
+            } finally {
+              emitter.complete();
+            }
+          });
+      } catch (Exception e) {
+        emitter.completeWithError(e);
+      }
+    });
+
+    return emitter;
+  }
+
+  @PreAuthorize("isAuthenticated()")
+  @Operation(summary = "流式对话（SSE, GET 版本，便于 EventSource）")
+  @GetMapping("/chat/stream")
+  public SseEmitter chatStreamGet(@RequestParam("prompt") String prompt) {
+    AiChatRequest req = new AiChatRequest();
+    req.setMessages(Collections.singletonList(new AiMessage("user", prompt)));
+    return chatStream(req);
+  }
+}

src/main/java/com/gxwebsoft/ai/controller/AiKbController.java

@@ -0,0 +1,54 @@
+package com.gxwebsoft.ai.controller;
+
+import com.gxwebsoft.ai.dto.*;
+import com.gxwebsoft.ai.service.AiKbRagService;
+import com.gxwebsoft.common.core.web.ApiResult;
+import com.gxwebsoft.common.core.web.BaseController;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.annotation.Resource;
+
+@Tag(name = "AI - 知识库(RAG)")
+@RestController
+@RequestMapping("/api/ai/kb")
+public class AiKbController extends BaseController {
+  @Resource
+  private AiKbRagService ragService;
+
+  @PreAuthorize("isAuthenticated()")
+  @Operation(summary = "上传文档入库（txt/md/html 优先）")
+  @PostMapping("/upload")
+  public ApiResult<AiKbIngestResult> upload(@RequestParam("file") MultipartFile file) {
+    Integer tenantId = getTenantId();
+    return success(ragService.ingestUpload(tenantId, file));
+  }
+
+  @PreAuthorize("isAuthenticated()")
+  @Operation(summary = "同步 CMS 文章到知识库（当前租户）")
+  @PostMapping("/sync/cms")
+  public ApiResult<AiKbIngestResult> syncCms() {
+    Integer tenantId = getTenantId();
+    return success(ragService.syncCms(tenantId));
+  }
+
+  @PreAuthorize("isAuthenticated()")
+  @Operation(summary = "仅检索（返回 topK 命中）")
+  @PostMapping("/query")
+  public ApiResult<AiKbQueryResult> query(@RequestBody AiKbQueryRequest request) {
+    Integer tenantId = getTenantId();
+    return success(ragService.query(tenantId, request));
+  }
+
+  @PreAuthorize("isAuthenticated()")
+  @Operation(summary = "知识库问答（RAG 生成 + 返回检索结果）")
+  @PostMapping("/ask")
+  public ApiResult<AiKbAskResult> ask(@RequestBody AiKbAskRequest request) {
+    Integer tenantId = getTenantId();
+    return success(ragService.ask(tenantId, request));
+  }
+}
+

src/main/java/com/gxwebsoft/ai/dto/AiAnalyticsAskRequest.java

@@ -0,0 +1,13 @@
+package com.gxwebsoft.ai.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Data
+@Schema(name = "AiAnalyticsAskRequest", description = "AI 数据分析提问")
+public class AiAnalyticsAskRequest {
+  private String question;
+  private String startDate;
+  private String endDate;
+}
+

src/main/java/com/gxwebsoft/ai/dto/AiAnalyticsAskResult.java

@@ -0,0 +1,12 @@
+package com.gxwebsoft.ai.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Data
+@Schema(name = "AiAnalyticsAskResult", description = "AI 数据分析结果")
+public class AiAnalyticsAskResult {
+  private String analysis;
+  private AiShopMetricsQueryResult data;
+}
+

src/main/java/com/gxwebsoft/ai/dto/AiChatRequest.java

@@ -0,0 +1,35 @@
+package com.gxwebsoft.ai.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+@Schema(name = "AiChatRequest", description = "AI 对话请求")
+public class AiChatRequest {
+  @Schema(description = "可选：直接传一句话。若 messages 为空则使用该字段构造 user message")
+  private String prompt;
+
+  @Schema(description = "可选：OpenAI 风格 messages（role: system/user/assistant）")
+  private List<AiMessage> messages;
+
+  @Schema(description = "可选：覆盖默认模型")
+  private String model;
+
+  @Schema(description = "是否流式输出（/chat/stream 端点通常忽略此字段）")
+  private Boolean stream;
+
+  @Schema(description = "temperature")
+  private Double temperature;
+
+  @Schema(description = "top_k")
+  private Integer topK;
+
+  @Schema(description = "top_p")
+  private Double topP;
+
+  @Schema(description = "num_predict（类似 max_tokens）")
+  private Integer numPredict;
+}
+

src/main/java/com/gxwebsoft/ai/dto/AiChatResult.java

@@ -0,0 +1,15 @@
+package com.gxwebsoft.ai.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Schema(name = "AiChatResult", description = "AI 对话结果")
+public class AiChatResult {
+  private String content;
+}
+

src/main/java/com/gxwebsoft/ai/dto/AiKbAskRequest.java

@@ -0,0 +1,12 @@
+package com.gxwebsoft.ai.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Data
+@Schema(name = "AiKbAskRequest", description = "知识库问答请求")
+public class AiKbAskRequest {
+  private String question;
+  private Integer topK;
+}
+

src/main/java/com/gxwebsoft/ai/dto/AiKbAskResult.java

@@ -0,0 +1,12 @@
+package com.gxwebsoft.ai.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Data
+@Schema(name = "AiKbAskResult", description = "知识库问答结果")
+public class AiKbAskResult {
+  private String answer;
+  private AiKbQueryResult retrieval;
+}
+

src/main/java/com/gxwebsoft/ai/dto/AiKbHit.java

@@ -0,0 +1,15 @@
+package com.gxwebsoft.ai.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Data
+@Schema(name = "AiKbHit", description = "知识库命中")
+public class AiKbHit {
+  private String chunkId;
+  private Integer documentId;
+  private String title;
+  private Double score;
+  private String content;
+}
+

src/main/java/com/gxwebsoft/ai/dto/AiKbIngestResult.java

@@ -0,0 +1,15 @@
+package com.gxwebsoft.ai.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Data
+@Schema(name = "AiKbIngestResult", description = "知识库入库结果")
+public class AiKbIngestResult {
+  private Integer documentId;
+  private String title;
+  private Integer chunks;
+  private Integer updatedDocuments;
+  private Integer skippedDocuments;
+}
+

src/main/java/com/gxwebsoft/ai/dto/AiKbQueryRequest.java

@@ -0,0 +1,12 @@
+package com.gxwebsoft.ai.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Data
+@Schema(name = "AiKbQueryRequest", description = "知识库检索请求")
+public class AiKbQueryRequest {
+  private String query;
+  private Integer topK;
+}
+

src/main/java/com/gxwebsoft/ai/dto/AiKbQueryResult.java

@@ -0,0 +1,13 @@
+package com.gxwebsoft.ai.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+@Schema(name = "AiKbQueryResult", description = "知识库检索结果")
+public class AiKbQueryResult {
+  private List<AiKbHit> hits;
+}
+

src/main/java/com/gxwebsoft/ai/dto/AiMessage.java

@@ -0,0 +1,14 @@
+package com.gxwebsoft.ai.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class AiMessage {
+  private String role;
+  private String content;
+}
+

src/main/java/com/gxwebsoft/ai/dto/AiShopMetricsQueryRequest.java

@@ -0,0 +1,18 @@
+package com.gxwebsoft.ai.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Data
+@Schema(name = "AiShopMetricsQueryRequest", description = "商城订单指标查询请求")
+public class AiShopMetricsQueryRequest {
+  @Schema(description = "开始日期(YYYY-MM-DD)")
+  private String startDate;
+
+  @Schema(description = "结束日期(YYYY-MM-DD)，包含该天")
+  private String endDate;
+
+  @Schema(description = "是否按天分组，默认 true")
+  private Boolean groupByDay;
+}
+

src/main/java/com/gxwebsoft/ai/dto/AiShopMetricsQueryResult.java

@@ -0,0 +1,16 @@
+package com.gxwebsoft.ai.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+@Schema(name = "AiShopMetricsQueryResult", description = "商城订单指标查询结果")
+public class AiShopMetricsQueryResult {
+  private Integer tenantId;
+  private String startDate;
+  private String endDate;
+  private List<AiShopMetricsRow> rows;
+}
+

src/main/java/com/gxwebsoft/ai/dto/AiShopMetricsRow.java

@@ -0,0 +1,23 @@
+package com.gxwebsoft.ai.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+@Schema(name = "AiShopMetricsRow", description = "商城订单指标行（按 tenant/day）")
+public class AiShopMetricsRow {
+  private Integer tenantId;
+  private String day;
+
+  private Long orderCnt;
+  private Long paidOrderCnt;
+  private BigDecimal gmv;
+  private BigDecimal refundAmt;
+  private Long payUserCnt;
+
+  private BigDecimal aov;
+  private BigDecimal payRate;
+}
+

src/main/java/com/gxwebsoft/ai/entity/AiKbChunk.java

@@ -0,0 +1,57 @@
+package com.gxwebsoft.ai.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * 知识库分段（chunk）。
+ */
+@Data
+@Schema(name = "AiKbChunk", description = "AI 知识库分段")
+public class AiKbChunk implements Serializable {
+  private static final long serialVersionUID = 1L;
+
+  @TableId(value = "id", type = IdType.AUTO)
+  private Integer id;
+
+  private Integer documentId;
+
+  /**
+   * 外部引用用的唯一 ID（便于在答案里引用）。
+   */
+  private String chunkId;
+
+  private Integer chunkIndex;
+
+  private String title;
+
+  private String content;
+
+  private String contentHash;
+
+  /**
+   * embedding JSON（数组），存成文本便于快速落库。
+   */
+  private String embedding;
+
+  /**
+   * embedding 的 L2 范数，用于余弦相似度。
+   */
+  private Double embeddingNorm;
+
+  @TableLogic
+  private Integer deleted;
+
+  private Integer tenantId;
+
+  @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+  private LocalDateTime createTime;
+}
+

src/main/java/com/gxwebsoft/ai/entity/AiKbDocument.java

@@ -0,0 +1,59 @@
+package com.gxwebsoft.ai.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * 知识库文档（来源：上传、CMS 等）。
+ */
+@Data
+@Schema(name = "AiKbDocument", description = "AI 知识库文档")
+public class AiKbDocument implements Serializable {
+  private static final long serialVersionUID = 1L;
+
+  @TableId(value = "document_id", type = IdType.AUTO)
+  private Integer documentId;
+
+  private String title;
+
+  /**
+   * upload / cms
+   */
+  private String sourceType;
+
+  /**
+   * 例如 CMS article_id
+   */
+  private Integer sourceId;
+
+  /**
+   * 例如文件名、路径等
+   */
+  private String sourceRef;
+
+  /**
+   * 文档文本内容哈希（用于增量同步/去重）。
+   */
+  private String contentHash;
+
+  private Integer status;
+
+  @TableLogic
+  private Integer deleted;
+
+  private Integer tenantId;
+
+  @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+  private LocalDateTime updateTime;
+
+  @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+  private LocalDateTime createTime;
+}
+

src/main/java/com/gxwebsoft/ai/mapper/AiKbChunkMapper.java

@@ -0,0 +1,10 @@
+package com.gxwebsoft.ai.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.gxwebsoft.ai.entity.AiKbChunk;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface AiKbChunkMapper extends BaseMapper<AiKbChunk> {
+}
+

src/main/java/com/gxwebsoft/ai/mapper/AiKbDocumentMapper.java

@@ -0,0 +1,10 @@
+package com.gxwebsoft.ai.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.gxwebsoft.ai.entity.AiKbDocument;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface AiKbDocumentMapper extends BaseMapper<AiKbDocument> {
+}
+

src/main/java/com/gxwebsoft/ai/mapper/AiShopAnalyticsMapper.java

@@ -0,0 +1,16 @@
+package com.gxwebsoft.ai.mapper;
+
+import com.gxwebsoft.ai.dto.AiShopMetricsRow;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+@Mapper
+public interface AiShopAnalyticsMapper {
+  List<AiShopMetricsRow> queryMetrics(@Param("tenantId") Integer tenantId,
+                                      @Param("start") LocalDateTime start,
+                                      @Param("end") LocalDateTime end);
+}
+

src/main/java/com/gxwebsoft/ai/mapper/xml/AiShopAnalyticsMapper.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.gxwebsoft.ai.mapper.AiShopAnalyticsMapper">
+
+  <select id="queryMetrics" resultType="com.gxwebsoft.ai.dto.AiShopMetricsRow">
+    SELECT
+      tenant_id,
+      DATE_FORMAT(create_time, '%Y-%m-%d') AS day,
+      COUNT(1) AS order_cnt,
+      SUM(CASE WHEN pay_status = 1 THEN 1 ELSE 0 END) AS paid_order_cnt,
+      SUM(CASE WHEN pay_status = 1 THEN COALESCE(pay_price, 0) ELSE 0 END) AS gmv,
+      SUM(CASE WHEN COALESCE(refund_money, 0) &gt; 0 THEN COALESCE(refund_money, 0) ELSE 0 END) AS refund_amt,
+      COUNT(DISTINCT IF(pay_status = 1, user_id, NULL)) AS pay_user_cnt
+    FROM shop_order
+    WHERE deleted = 0
+      AND tenant_id = #{tenantId}
+      AND create_time &gt;= #{start}
+      AND create_time &lt; #{end}
+    GROUP BY tenant_id, DATE_FORMAT(create_time, '%Y-%m-%d')
+    ORDER BY day ASC
+  </select>
+
+</mapper>
+

src/main/java/com/gxwebsoft/ai/prompt/AiPrompts.java

@@ -0,0 +1,24 @@
+package com.gxwebsoft.ai.prompt;
+
+/**
+ * 统一提示词模板（尽量简短、可控）。
+ */
+public class AiPrompts {
+  private AiPrompts() {
+  }
+
+  public static final String SYSTEM_SUPPORT =
+    "你是 WebSoft 客服AI。规则：\n" +
+      "- 只使用给定的“上下文资料”回答，禁止编造。\n" +
+      "- 如果资料不足，直接说“资料不足”，并列出需要补充的信息。\n" +
+      "- 答案末尾必须给引用，格式：[source:chunk_id]。\n" +
+      "- 输出中文，简洁可执行。\n";
+
+  public static final String SYSTEM_ANALYTICS =
+    "你是商城订单数据分析助手。你将基于提供的按天指标数据给出结论。\n" +
+      "要求：\n" +
+      "- 只基于数据陈述，不要编造不存在的数字。\n" +
+      "- 输出包含：结论、关键指标变化、异常点、建议的下一步核查。\n" +
+      "- 输出中文，简洁。\n";
+}
+

src/main/java/com/gxwebsoft/ai/service/AiAnalyticsService.java

@@ -0,0 +1,82 @@
+package com.gxwebsoft.ai.service;
+
+import cn.hutool.core.util.StrUtil;
+import com.gxwebsoft.ai.dto.*;
+import com.gxwebsoft.ai.prompt.AiPrompts;
+import com.gxwebsoft.common.core.exception.BusinessException;
+import com.gxwebsoft.common.core.utils.JSONUtil;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.time.LocalDate;
+import java.time.format.DateTimeParseException;
+import java.util.Arrays;
+
+@Service
+public class AiAnalyticsService {
+  @Resource
+  private AiShopAnalyticsService shopAnalyticsService;
+  @Resource
+  private AiChatService aiChatService;
+
+  public AiShopMetricsQueryResult queryShopMetrics(Integer tenantId, AiShopMetricsQueryRequest request) {
+    if (tenantId == null) {
+      throw new BusinessException("tenantId 不能为空");
+    }
+    if (request == null) {
+      throw new BusinessException("请求不能为空");
+    }
+    LocalDate start = parseDate(request.getStartDate(), "startDate");
+    LocalDate end = parseDate(request.getEndDate(), "endDate");
+    if (end.isBefore(start)) {
+      throw new BusinessException("endDate 不能早于 startDate");
+    }
+
+    AiShopMetricsQueryResult r = new AiShopMetricsQueryResult();
+    r.setTenantId(tenantId);
+    r.setStartDate(start.toString());
+    r.setEndDate(end.toString());
+    r.setRows(shopAnalyticsService.queryTenantDaily(tenantId, start, end));
+    return r;
+  }
+
+  public AiAnalyticsAskResult askShopAnalytics(Integer tenantId, AiAnalyticsAskRequest request) {
+    if (request == null || StrUtil.isBlank(request.getQuestion())) {
+      throw new BusinessException("question 不能为空");
+    }
+    AiShopMetricsQueryRequest q = new AiShopMetricsQueryRequest();
+    q.setStartDate(request.getStartDate());
+    q.setEndDate(request.getEndDate());
+    q.setGroupByDay(true);
+    AiShopMetricsQueryResult data = queryShopMetrics(tenantId, q);
+
+    String userPrompt =
+      "用户问题：\n" + request.getQuestion() + "\n\n" +
+        "数据（JSON，字段含义：order_cnt=订单数，paid_order_cnt=已支付订单数，gmv=已支付金额，refund_amt=退款金额，pay_user_cnt=支付用户数，aov=客单价，pay_rate=支付率）：\n" +
+        JSONUtil.toJSONString(data, true);
+
+    AiChatRequest chat = new AiChatRequest();
+    chat.setMessages(Arrays.asList(
+      new AiMessage("system", AiPrompts.SYSTEM_ANALYTICS),
+      new AiMessage("user", userPrompt)
+    ));
+
+    AiChatResult resp = aiChatService.chat(chat);
+    AiAnalyticsAskResult r = new AiAnalyticsAskResult();
+    r.setAnalysis(resp.getContent());
+    r.setData(data);
+    return r;
+  }
+
+  private static LocalDate parseDate(String s, String field) {
+    if (StrUtil.isBlank(s)) {
+      throw new BusinessException(field + " 不能为空，格式 YYYY-MM-DD");
+    }
+    try {
+      return LocalDate.parse(s.trim());
+    } catch (DateTimeParseException e) {
+      throw new BusinessException(field + " 格式错误，需 YYYY-MM-DD");
+    }
+  }
+}
+

src/main/java/com/gxwebsoft/ai/service/AiChatService.java

@@ -0,0 +1,94 @@
+package com.gxwebsoft.ai.service;
+
+import cn.hutool.core.util.StrUtil;
+import com.gxwebsoft.ai.client.OllamaClient;
+import com.gxwebsoft.ai.client.dto.OllamaChatRequest;
+import com.gxwebsoft.ai.client.dto.OllamaChatResponse;
+import com.gxwebsoft.ai.client.dto.OllamaMessage;
+import com.gxwebsoft.ai.config.AiOllamaProperties;
+import com.gxwebsoft.ai.dto.AiChatRequest;
+import com.gxwebsoft.ai.dto.AiChatResult;
+import com.gxwebsoft.ai.dto.AiMessage;
+import com.gxwebsoft.common.core.exception.BusinessException;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.*;
+import java.util.function.Consumer;
+
+@Service
+public class AiChatService {
+  @Resource
+  private AiOllamaProperties props;
+
+  @Resource
+  private OllamaClient ollamaClient;
+
+  public AiChatResult chat(AiChatRequest request) {
+    OllamaChatRequest req = buildChatRequest(request, false);
+    OllamaChatResponse resp = ollamaClient.chat(req);
+    String content = resp != null && resp.getMessage() != null ? resp.getMessage().getContent() : null;
+    return new AiChatResult(content == null ? "" : content);
+  }
+
+  public void chatStream(AiChatRequest request, Consumer<String> onDelta, Consumer<OllamaChatResponse> onFinal) {
+    Objects.requireNonNull(onDelta, "onDelta");
+    OllamaChatRequest req = buildChatRequest(request, true);
+    ollamaClient.chatStream(req, event -> {
+      String delta = event != null && event.getMessage() != null ? event.getMessage().getContent() : null;
+      if (StrUtil.isNotBlank(delta)) {
+        onDelta.accept(delta);
+      }
+      if (Boolean.TRUE.equals(event.getDone()) && onFinal != null) {
+        onFinal.accept(event);
+      }
+    });
+  }
+
+  private OllamaChatRequest buildChatRequest(AiChatRequest request, boolean stream) {
+    if (request == null) {
+      throw new BusinessException("请求不能为空");
+    }
+
+    List<AiMessage> messages = request.getMessages();
+    if ((messages == null || messages.isEmpty()) && StrUtil.isBlank(request.getPrompt())) {
+      throw new BusinessException("prompt 或 messages 不能为空");
+    }
+    if (messages == null || messages.isEmpty()) {
+      messages = Collections.singletonList(new AiMessage("user", request.getPrompt()));
+    }
+
+    List<OllamaMessage> ollamaMessages = new ArrayList<>();
+    for (AiMessage m : messages) {
+      if (m == null || StrUtil.isBlank(m.getRole()) || m.getContent() == null) {
+        continue;
+      }
+      ollamaMessages.add(new OllamaMessage(m.getRole(), m.getContent()));
+    }
+    if (ollamaMessages.isEmpty()) {
+      throw new BusinessException("messages 为空或无有效内容");
+    }
+
+    Map<String, Object> options = new HashMap<>();
+    if (request.getTemperature() != null) {
+      options.put("temperature", request.getTemperature());
+    }
+    if (request.getTopK() != null) {
+      options.put("top_k", request.getTopK());
+    }
+    if (request.getTopP() != null) {
+      options.put("top_p", request.getTopP());
+    }
+    if (request.getNumPredict() != null) {
+      options.put("num_predict", request.getNumPredict());
+    }
+
+    OllamaChatRequest req = new OllamaChatRequest();
+    req.setModel(StrUtil.blankToDefault(request.getModel(), props.getChatModel()));
+    req.setMessages(ollamaMessages);
+    req.setStream(stream);
+    req.setOptions(options.isEmpty() ? null : options);
+    return req;
+  }
+}
+

src/main/java/com/gxwebsoft/ai/service/AiKbChunkService.java

@@ -0,0 +1,8 @@
+package com.gxwebsoft.ai.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.gxwebsoft.ai.entity.AiKbChunk;
+
+public interface AiKbChunkService extends IService<AiKbChunk> {
+}
+

src/main/java/com/gxwebsoft/ai/service/AiKbDocumentService.java

@@ -0,0 +1,8 @@
+package com.gxwebsoft.ai.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.gxwebsoft.ai.entity.AiKbDocument;
+
+public interface AiKbDocumentService extends IService<AiKbDocument> {
+}
+

src/main/java/com/gxwebsoft/ai/service/AiKbRagService.java

@@ -0,0 +1,426 @@
+package com.gxwebsoft.ai.service;
+
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.gxwebsoft.ai.client.OllamaClient;
+import com.gxwebsoft.ai.client.dto.OllamaEmbeddingResponse;
+import com.gxwebsoft.ai.config.AiOllamaProperties;
+import com.gxwebsoft.ai.dto.*;
+import com.gxwebsoft.ai.entity.AiKbChunk;
+import com.gxwebsoft.ai.entity.AiKbDocument;
+import com.gxwebsoft.ai.prompt.AiPrompts;
+import com.gxwebsoft.ai.util.AiTextUtil;
+import com.gxwebsoft.cms.entity.CmsArticle;
+import com.gxwebsoft.cms.entity.CmsArticleContent;
+import com.gxwebsoft.cms.service.CmsArticleContentService;
+import com.gxwebsoft.cms.service.CmsArticleService;
+import com.gxwebsoft.common.core.exception.BusinessException;
+import com.gxwebsoft.common.core.utils.JSONUtil;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.apache.tika.Tika;
+import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.annotation.Resource;
+import java.nio.charset.StandardCharsets;
+import java.time.LocalDateTime;
+import java.util.*;
+import java.util.concurrent.*;
+import java.util.stream.Collectors;
+
+@Service
+public class AiKbRagService {
+  @Resource
+  private AiOllamaProperties props;
+  @Resource
+  private OllamaClient ollamaClient;
+  @Resource
+  private AiKbDocumentService documentService;
+  @Resource
+  private AiKbChunkService chunkService;
+  @Resource
+  private CmsArticleService cmsArticleService;
+  @Resource
+  private CmsArticleContentService cmsArticleContentService;
+  @Resource
+  private AiChatService aiChatService;
+  @Resource
+  private ObjectMapper objectMapper;
+
+  private final Tika tika = new Tika();
+  private volatile ExecutorService embedPool;
+
+  private ExecutorService pool() {
+    ExecutorService p = embedPool;
+    if (p != null) {
+      return p;
+    }
+    synchronized (this) {
+      if (embedPool == null) {
+        embedPool = Executors.newFixedThreadPool(Math.max(1, props.getMaxConcurrency()));
+      }
+      return embedPool;
+    }
+  }
+
+  public AiKbIngestResult ingestUpload(Integer tenantId, MultipartFile file) {
+    if (tenantId == null) {
+      throw new BusinessException("tenantId 不能为空");
+    }
+    if (file == null || file.isEmpty()) {
+      throw new BusinessException("文件不能为空");
+    }
+    String title = StrUtil.blankToDefault(file.getOriginalFilename(), "upload");
+    String text = extractText(file);
+    if (StrUtil.isBlank(text)) {
+      throw new BusinessException("无法解析文件内容，请上传 txt/md/html 等可解析文本");
+    }
+
+    String contentHash = AiTextUtil.sha256(text);
+    AiKbDocument doc = new AiKbDocument();
+    doc.setTitle(title);
+    doc.setSourceType("upload");
+    doc.setSourceRef(title);
+    doc.setContentHash(contentHash);
+    doc.setStatus(0);
+    doc.setTenantId(tenantId);
+    doc.setCreateTime(LocalDateTime.now());
+    doc.setUpdateTime(LocalDateTime.now());
+    documentService.save(doc);
+
+    int chunks = ingestChunks(doc, text);
+
+    AiKbIngestResult r = new AiKbIngestResult();
+    r.setDocumentId(doc.getDocumentId());
+    r.setTitle(doc.getTitle());
+    r.setChunks(chunks);
+    r.setUpdatedDocuments(1);
+    r.setSkippedDocuments(0);
+    return r;
+  }
+
+  /**
+   * 同步 CMS（仅当前 tenant）。
+   */
+  public AiKbIngestResult syncCms(Integer tenantId) {
+    if (tenantId == null) {
+      throw new BusinessException("tenantId 不能为空");
+    }
+    // 仅同步“已发布且未删除”的文章
+    List<CmsArticle> articles = cmsArticleService.list(new LambdaQueryWrapper<CmsArticle>()
+      .eq(CmsArticle::getTenantId, tenantId)
+      .eq(CmsArticle::getDeleted, 0)
+      .eq(CmsArticle::getStatus, 0));
+    if (articles == null || articles.isEmpty()) {
+      AiKbIngestResult r = new AiKbIngestResult();
+      r.setUpdatedDocuments(0);
+      r.setSkippedDocuments(0);
+      r.setChunks(0);
+      return r;
+    }
+
+    Set<Integer> articleIds = articles.stream().map(CmsArticle::getArticleId).collect(Collectors.toSet());
+    List<CmsArticleContent> contents = cmsArticleContentService.list(new LambdaQueryWrapper<CmsArticleContent>()
+      .in(CmsArticleContent::getArticleId, articleIds));
+
+    Map<Integer, CmsArticleContent> contentByArticle = contents.stream()
+      .collect(Collectors.toMap(
+        CmsArticleContent::getArticleId,
+        c -> c,
+        (a, b) -> (a.getCreateTime() != null && b.getCreateTime() != null && a.getCreateTime().isAfter(b.getCreateTime())) ? a : b
+      ));
+
+    int updatedDocs = 0;
+    int skippedDocs = 0;
+    int totalChunks = 0;
+
+    for (CmsArticle a : articles) {
+      CmsArticleContent c = contentByArticle.get(a.getArticleId());
+      String raw = "";
+      if (a.getOverview() != null) {
+        raw += a.getOverview() + "\n";
+      }
+      if (c != null && c.getContent() != null) {
+        raw += c.getContent();
+      }
+      String text = a.getTitle() + "\n" + AiTextUtil.stripHtml(raw);
+      text = AiTextUtil.normalizeWhitespace(text);
+      if (StrUtil.isBlank(text)) {
+        continue;
+      }
+      String hash = AiTextUtil.sha256(text);
+
+      AiKbDocument existing = documentService.getOne(new LambdaQueryWrapper<AiKbDocument>()
+        .eq(AiKbDocument::getTenantId, tenantId)
+        .eq(AiKbDocument::getSourceType, "cms")
+        .eq(AiKbDocument::getSourceId, a.getArticleId())
+        .last("limit 1"));
+
+      if (existing != null && StrUtil.equals(existing.getContentHash(), hash)) {
+        skippedDocs++;
+        continue;
+      }
+
+      AiKbDocument doc;
+      if (existing == null) {
+        doc = new AiKbDocument();
+        doc.setTitle(a.getTitle());
+        doc.setSourceType("cms");
+        doc.setSourceId(a.getArticleId());
+        doc.setSourceRef(a.getCode());
+        doc.setContentHash(hash);
+        doc.setStatus(0);
+        doc.setTenantId(tenantId);
+        doc.setCreateTime(LocalDateTime.now());
+        doc.setUpdateTime(LocalDateTime.now());
+        documentService.save(doc);
+      } else {
+        doc = existing;
+        doc.setTitle(a.getTitle());
+        doc.setSourceRef(a.getCode());
+        doc.setContentHash(hash);
+        doc.setUpdateTime(LocalDateTime.now());
+        documentService.updateById(doc);
+        // 重新入库：先删除旧 chunk
+        chunkService.remove(new LambdaQueryWrapper<AiKbChunk>().eq(AiKbChunk::getDocumentId, doc.getDocumentId()));
+      }
+
+      int chunks = ingestChunks(doc, text);
+      totalChunks += chunks;
+      updatedDocs++;
+    }
+
+    AiKbIngestResult r = new AiKbIngestResult();
+    r.setUpdatedDocuments(updatedDocs);
+    r.setSkippedDocuments(skippedDocs);
+    r.setChunks(totalChunks);
+    return r;
+  }
+
+  public AiKbQueryResult query(Integer tenantId, AiKbQueryRequest request) {
+    if (tenantId == null) {
+      throw new BusinessException("tenantId 不能为空");
+    }
+    if (request == null || StrUtil.isBlank(request.getQuery())) {
+      throw new BusinessException("query 不能为空");
+    }
+    int topK = request.getTopK() != null ? request.getTopK() : props.getRagTopK();
+    topK = Math.max(1, Math.min(20, topK));
+
+    float[] qEmb = embedding(request.getQuery());
+    float qNorm = l2(qEmb);
+    if (qNorm == 0f) {
+      throw new BusinessException("query embedding 为空");
+    }
+
+    // MVP：按 tenant 拉取最新 N 条候选 chunk，再做余弦相似度排序
+    List<AiKbChunk> candidates = chunkService.list(new LambdaQueryWrapper<AiKbChunk>()
+      .eq(AiKbChunk::getTenantId, tenantId)
+      .orderByDesc(AiKbChunk::getId)
+      .last("limit " + props.getRagMaxCandidates()));
+
+    PriorityQueue<AiKbHit> pq = new PriorityQueue<>(Comparator.comparingDouble(h -> h.getScore() == null ? -1d : h.getScore()));
+    for (AiKbChunk c : candidates) {
+      if (StrUtil.isBlank(c.getEmbedding())) {
+        continue;
+      }
+      float[] cEmb = parseEmbedding(c.getEmbedding());
+      if (cEmb == null || cEmb.length == 0) {
+        continue;
+      }
+      Double cNormD = c.getEmbeddingNorm();
+      float cNorm = cNormD == null ? l2(cEmb) : cNormD.floatValue();
+      if (cNorm == 0f) {
+        continue;
+      }
+      double score = dot(qEmb, cEmb) / (qNorm * cNorm);
+      AiKbHit hit = new AiKbHit();
+      hit.setChunkId(c.getChunkId());
+      hit.setDocumentId(c.getDocumentId());
+      hit.setTitle(StrUtil.blankToDefault(c.getTitle(), ""));
+      hit.setScore(score);
+      // 返回给前端时避免过长
+      hit.setContent(clip(c.getContent(), 900));
+
+      if (pq.size() < topK) {
+        pq.add(hit);
+      } else if (hit.getScore() != null && hit.getScore() > pq.peek().getScore()) {
+        pq.poll();
+        pq.add(hit);
+      }
+    }
+
+    List<AiKbHit> hits = new ArrayList<>(pq);
+    hits.sort((a, b) -> Double.compare(b.getScore(), a.getScore()));
+    AiKbQueryResult r = new AiKbQueryResult();
+    r.setHits(hits);
+    return r;
+  }
+
+  public AiKbAskResult ask(Integer tenantId, AiKbAskRequest request) {
+    if (request == null || StrUtil.isBlank(request.getQuestion())) {
+      throw new BusinessException("question 不能为空");
+    }
+    AiKbQueryRequest q = new AiKbQueryRequest();
+    q.setQuery(request.getQuestion());
+    q.setTopK(request.getTopK());
+    AiKbQueryResult retrieval = query(tenantId, q);
+
+    String context = buildContext(retrieval);
+    String userPrompt = "上下文资料：\n" + context + "\n\n用户问题：\n" + request.getQuestion();
+
+    AiChatRequest chatReq = new AiChatRequest();
+    chatReq.setMessages(Arrays.asList(
+      new AiMessage("system", AiPrompts.SYSTEM_SUPPORT),
+      new AiMessage("user", userPrompt)
+    ));
+    AiChatResult chat = aiChatService.chat(chatReq);
+
+    AiKbAskResult r = new AiKbAskResult();
+    r.setAnswer(chat.getContent());
+    r.setRetrieval(retrieval);
+    return r;
+  }
+
+  private int ingestChunks(AiKbDocument doc, String text) {
+    List<String> chunks = AiTextUtil.chunkText(text, props.getRagChunkSize(), props.getRagChunkOverlap());
+    if (chunks.isEmpty()) {
+      return 0;
+    }
+    LocalDateTime now = LocalDateTime.now();
+
+    List<CompletableFuture<AiKbChunk>> futures = new ArrayList<>(chunks.size());
+    for (int i = 0; i < chunks.size(); i++) {
+      final int idx = i;
+      final String chunkText = chunks.get(i);
+      futures.add(CompletableFuture.supplyAsync(() -> {
+        OllamaEmbeddingResponse emb = ollamaClient.embedding(chunkText);
+        if (emb == null || emb.getEmbedding() == null || emb.getEmbedding().isEmpty()) {
+          throw new BusinessException("embedding 生成失败");
+        }
+        float[] v = toFloat(emb.getEmbedding());
+        float norm = l2(v);
+        AiKbChunk c = new AiKbChunk();
+        c.setDocumentId(doc.getDocumentId());
+        c.setChunkId(UUID.randomUUID().toString().replace("-", ""));
+        c.setChunkIndex(idx);
+        c.setTitle(doc.getTitle());
+        c.setContent(chunkText);
+        c.setContentHash(AiTextUtil.sha256(chunkText));
+        c.setEmbedding(JSONUtil.toJSONString(emb.getEmbedding()));
+        c.setEmbeddingNorm((double) norm);
+        c.setTenantId(doc.getTenantId());
+        c.setCreateTime(now);
+        c.setDeleted(0);
+        return c;
+      }, pool()));
+    }
+
+    List<AiKbChunk> entities = futures.stream().map(f -> {
+      try {
+        return f.get(10, TimeUnit.MINUTES);
+      } catch (Exception e) {
+        throw new BusinessException("embedding 批处理失败: " + e.getMessage());
+      }
+    }).collect(Collectors.toList());
+
+    chunkService.saveBatch(entities);
+    return entities.size();
+  }
+
+  private String extractText(MultipartFile file) {
+    try {
+      String contentType = file.getContentType();
+      String filename = file.getOriginalFilename();
+
+      // 优先：对纯文本直接读 UTF-8
+      if ((contentType != null && contentType.startsWith("text/"))
+        || (filename != null && (filename.endsWith(".txt") || filename.endsWith(".md") || filename.endsWith(".html") || filename.endsWith(".htm")))) {
+        return AiTextUtil.normalizeWhitespace(new String(file.getBytes(), StandardCharsets.UTF_8));
+      }
+
+      // 尝试用 tika 解析（注意：当前依赖为 tika-core，解析能力有限）
+      String parsed = tika.parseToString(file.getInputStream());
+      return AiTextUtil.normalizeWhitespace(parsed);
+    } catch (Exception e) {
+      return "";
+    }
+  }
+
+  private float[] embedding(String text) {
+    OllamaEmbeddingResponse emb = ollamaClient.embedding(text);
+    if (emb == null || emb.getEmbedding() == null || emb.getEmbedding().isEmpty()) {
+      throw new BusinessException("embedding 生成失败");
+    }
+    return toFloat(emb.getEmbedding());
+  }
+
+  private float[] parseEmbedding(String json) {
+    try {
+      // embedding 是一维数组，存储为 JSON 文本
+      double[] d = ObjectUtil.isEmpty(json) ? null : objectMapper.readValue(json, double[].class);
+      if (d == null || d.length == 0) {
+        return null;
+      }
+      float[] f = new float[d.length];
+      for (int i = 0; i < d.length; i++) {
+        f[i] = (float) d[i];
+      }
+      return f;
+    } catch (Exception e) {
+      return null;
+    }
+  }
+
+  private static float[] toFloat(List<Double> v) {
+    float[] out = new float[v.size()];
+    for (int i = 0; i < v.size(); i++) {
+      Double d = v.get(i);
+      out[i] = d == null ? 0f : d.floatValue();
+    }
+    return out;
+  }
+
+  private static float dot(float[] a, float[] b) {
+    int n = Math.min(a.length, b.length);
+    double s = 0d;
+    for (int i = 0; i < n; i++) {
+      s += (double) a[i] * (double) b[i];
+    }
+    return (float) s;
+  }
+
+  private static float l2(float[] a) {
+    double s = 0d;
+    for (float v : a) {
+      s += (double) v * (double) v;
+    }
+    return (float) Math.sqrt(s);
+  }
+
+  private static String clip(String s, int max) {
+    if (s == null) {
+      return "";
+    }
+    if (s.length() <= max) {
+      return s;
+    }
+    return s.substring(0, max) + "...";
+  }
+
+  private static String buildContext(AiKbQueryResult retrieval) {
+    if (retrieval == null || retrieval.getHits() == null || retrieval.getHits().isEmpty()) {
+      return "(无)";
+    }
+    StringBuilder sb = new StringBuilder();
+    for (AiKbHit h : retrieval.getHits()) {
+      sb.append("[source:").append(h.getChunkId()).append("] ");
+      if (StrUtil.isNotBlank(h.getTitle())) {
+        sb.append(h.getTitle()).append("\n");
+      }
+      sb.append(h.getContent()).append("\n\n");
+    }
+    return sb.toString();
+  }
+}

src/main/java/com/gxwebsoft/ai/service/AiShopAnalyticsService.java

@@ -0,0 +1,46 @@
+package com.gxwebsoft.ai.service;
+
+import com.gxwebsoft.ai.dto.AiShopMetricsRow;
+import com.gxwebsoft.ai.mapper.AiShopAnalyticsMapper;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.List;
+
+@Service
+public class AiShopAnalyticsService {
+  @Resource
+  private AiShopAnalyticsMapper mapper;
+
+  public List<AiShopMetricsRow> queryTenantDaily(Integer tenantId, LocalDate startDate, LocalDate endDateInclusive) {
+    LocalDateTime start = startDate.atStartOfDay();
+    LocalDateTime endExclusive = endDateInclusive.plusDays(1).atStartOfDay();
+    List<AiShopMetricsRow> rows = mapper.queryMetrics(tenantId, start, endExclusive);
+    if (rows == null) {
+      return null;
+    }
+    for (AiShopMetricsRow r : rows) {
+      long orderCnt = r.getOrderCnt() == null ? 0L : r.getOrderCnt();
+      long paidCnt = r.getPaidOrderCnt() == null ? 0L : r.getPaidOrderCnt();
+      BigDecimal gmv = r.getGmv() == null ? BigDecimal.ZERO : r.getGmv();
+
+      if (paidCnt > 0) {
+        r.setAov(gmv.divide(BigDecimal.valueOf(paidCnt), 4, RoundingMode.HALF_UP));
+      } else {
+        r.setAov(BigDecimal.ZERO);
+      }
+      if (orderCnt > 0) {
+        r.setPayRate(BigDecimal.valueOf(paidCnt)
+          .divide(BigDecimal.valueOf(orderCnt), 4, RoundingMode.HALF_UP));
+      } else {
+        r.setPayRate(BigDecimal.ZERO);
+      }
+    }
+    return rows;
+  }
+}
+

src/main/java/com/gxwebsoft/ai/service/impl/AiKbChunkServiceImpl.java

@@ -0,0 +1,12 @@
+package com.gxwebsoft.ai.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.gxwebsoft.ai.entity.AiKbChunk;
+import com.gxwebsoft.ai.mapper.AiKbChunkMapper;
+import com.gxwebsoft.ai.service.AiKbChunkService;
+import org.springframework.stereotype.Service;
+
+@Service
+public class AiKbChunkServiceImpl extends ServiceImpl<AiKbChunkMapper, AiKbChunk> implements AiKbChunkService {
+}
+

src/main/java/com/gxwebsoft/ai/service/impl/AiKbDocumentServiceImpl.java

@@ -0,0 +1,12 @@
+package com.gxwebsoft.ai.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.gxwebsoft.ai.entity.AiKbDocument;
+import com.gxwebsoft.ai.mapper.AiKbDocumentMapper;
+import com.gxwebsoft.ai.service.AiKbDocumentService;
+import org.springframework.stereotype.Service;
+
+@Service
+public class AiKbDocumentServiceImpl extends ServiceImpl<AiKbDocumentMapper, AiKbDocument> implements AiKbDocumentService {
+}
+

src/main/java/com/gxwebsoft/ai/util/AiTextUtil.java

@@ -0,0 +1,100 @@
+package com.gxwebsoft.ai.util;
+
+import cn.hutool.core.util.StrUtil;
+
+import java.nio.charset.StandardCharsets;
+import java.security.MessageDigest;
+import java.util.ArrayList;
+import java.util.List;
+
+public class AiTextUtil {
+  private AiTextUtil() {
+  }
+
+  public static String sha256(String s) {
+    if (s == null) {
+      return null;
+    }
+    try {
+      MessageDigest md = MessageDigest.getInstance("SHA-256");
+      byte[] dig = md.digest(s.getBytes(StandardCharsets.UTF_8));
+      StringBuilder sb = new StringBuilder(dig.length * 2);
+      for (byte b : dig) {
+        sb.append(String.format("%02x", b));
+      }
+      return sb.toString();
+    } catch (Exception e) {
+      throw new RuntimeException(e);
+    }
+  }
+
+  /**
+   * 很轻量的 HTML 转纯文本（不追求完美，只用于知识库入库前清洗）。
+   */
+  public static String stripHtml(String html) {
+    if (StrUtil.isBlank(html)) {
+      return "";
+    }
+    String s = html;
+    s = s.replaceAll("(?is)<script[^>]*>.*?</script>", " ");
+    s = s.replaceAll("(?is)<style[^>]*>.*?</style>", " ");
+    s = s.replaceAll("(?is)<br\\s*/?>", "\n");
+    s = s.replaceAll("(?is)</p\\s*>", "\n");
+    s = s.replaceAll("(?is)<[^>]+>", " ");
+    // 常见 HTML 实体最小处理
+    s = s.replace("&nbsp;", " ");
+    s = s.replace("&lt;", "<").replace("&gt;", ">").replace("&amp;", "&").replace("&quot;", "\"");
+    return normalizeWhitespace(s);
+  }
+
+  public static String normalizeWhitespace(String s) {
+    if (s == null) {
+      return "";
+    }
+    // 合并空白，保留换行用于 chunking
+    String x = s.replace("\r", "\n");
+    x = x.replaceAll("[\\t\\f\\u000B]+", " ");
+    x = x.replaceAll("[ ]{2,}", " ");
+    x = x.replaceAll("\\n{3,}", "\n\n");
+    return x.trim();
+  }
+
+  /**
+   * 按字符数切分，并做固定 overlap。
+   */
+  public static List<String> chunkText(String text, int chunkSize, int overlap) {
+    String s = normalizeWhitespace(text);
+    List<String> out = new ArrayList<>();
+    if (StrUtil.isBlank(s)) {
+      return out;
+    }
+    if (chunkSize <= 0) {
+      chunkSize = 800;
+    }
+    if (overlap < 0) {
+      overlap = 0;
+    }
+    if (overlap >= chunkSize) {
+      overlap = Math.max(0, chunkSize / 5);
+    }
+
+    int n = s.length();
+    int start = 0;
+    while (start < n) {
+      int end = Math.min(n, start + chunkSize);
+      String chunk = s.substring(start, end).trim();
+      if (!chunk.isEmpty()) {
+        out.add(chunk);
+      }
+      if (end >= n) {
+        break;
+      }
+      start = end - overlap;
+      if (start < 0) {
+        start = 0;
+      }
+    }
+    return out;
+  }
+}
+

src/main/java/com/gxwebsoft/app/controller/AppCredentialController.java

@@ -0,0 +1,151 @@
+package com.gxwebsoft.app.controller;
+
+import com.gxwebsoft.common.core.web.BaseController;
+import com.gxwebsoft.app.service.AppCredentialService;
+import com.gxwebsoft.app.entity.AppCredential;
+import com.gxwebsoft.app.param.AppCredentialParam;
+import com.gxwebsoft.common.core.web.ApiResult;
+import com.gxwebsoft.common.core.web.PageResult;
+import com.gxwebsoft.common.core.web.BatchParam;
+import com.gxwebsoft.common.core.annotation.OperationLog;
+import com.gxwebsoft.common.system.entity.User;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 应用密钥凭证控制器
+ *
+ * @author 科技小王子
+ * @since 2026-03-28 21:29:44
+ */
+@Slf4j
+@Tag(name = "应用密钥凭证管理")
+@RestController
+@RequestMapping("/api/app/app-credential")
+public class AppCredentialController extends BaseController {
+
+    @Resource
+    private AppCredentialService appCredentialService;
+
+    @Operation(summary = "分页查询应用密钥凭证")
+    @GetMapping("/page")
+    public ApiResult<PageResult<AppCredential>> page(AppCredentialParam param) {
+        return success(appCredentialService.pageRel(param));
+    }
+
+    @Operation(summary = "查询全部应用密钥凭证")
+    @GetMapping()
+    public ApiResult<List<AppCredential>> list(AppCredentialParam param) {
+        return success(appCredentialService.listRel(param));
+    }
+
+    @Operation(summary = "根据id查询应用密钥凭证")
+    @GetMapping("/{id}")
+    public ApiResult<AppCredential> get(@PathVariable("id") Integer id) {
+        return success(appCredentialService.getByIdRel(id));
+    }
+
+    @PreAuthorize("hasAuthority('app:appCredential:save')")
+    @OperationLog
+    @Operation(summary = "创建应用密钥凭证（自动生成 AppID 和 AppSecret）")
+    @PostMapping()
+    public ApiResult<?> save(@RequestBody AppCredential appCredential) {
+        User loginUser = getLoginUser();
+        if (loginUser == null) {
+            return fail("请先登录");
+        }
+        appCredential.setUserId(loginUser.getUserId());
+        // 创建并生成密钥
+        AppCredential result = appCredentialService.createCredential(appCredential);
+        return success("创建成功，请保存 AppSecret，该信息仅展示一次", result);
+    }
+
+    @PreAuthorize("hasAuthority('app:appCredential:update')")
+    @OperationLog
+    @Operation(summary = "修改应用密钥凭证（名称/类型/备注等，不含密钥）")
+    @PutMapping()
+    public ApiResult<?> update(@RequestBody AppCredential appCredential) {
+        // 防止通过此接口直接修改 appId/appSecret
+        appCredential.setAppId(null);
+        appCredential.setAppSecret(null);
+        if (appCredentialService.updateById(appCredential)) {
+            return success("修改成功");
+        }
+        return fail("修改失败");
+    }
+
+    @PreAuthorize("hasAuthority('app:appCredential:update')")
+    @OperationLog
+    @Operation(summary = "重置 AppSecret（重新生成密钥）")
+    @PostMapping("/resetSecret/{id}")
+    public ApiResult<?> resetSecret(@PathVariable("id") Long id) {
+        try {
+            AppCredential result = appCredentialService.resetSecret(id);
+            return success("重置成功，请保存新 AppSecret，该信息仅展示一次", result);
+        } catch (RuntimeException e) {
+            return fail(e.getMessage());
+        }
+    }
+
+    @PreAuthorize("hasAuthority('app:appCredential:update')")
+    @OperationLog
+    @Operation(summary = "禁用/启用凭证")
+    @PutMapping("/status/{id}/{status}")
+    public ApiResult<?> updateStatus(@PathVariable("id") Long id, @PathVariable("status") Integer status) {
+        if (appCredentialService.updateStatus(id, status)) {
+            return success(status == 0 ? "已启用" : "已禁用");
+        }
+        return fail("操作失败");
+    }
+
+    @PreAuthorize("hasAuthority('app:appCredential:remove')")
+    @OperationLog
+    @Operation(summary = "删除应用密钥凭证")
+    @DeleteMapping("/{id}")
+    public ApiResult<?> remove(@PathVariable("id") Integer id) {
+        if (appCredentialService.removeById(id)) {
+            return success("删除成功");
+        }
+        return fail("删除失败");
+    }
+
+    @PreAuthorize("hasAuthority('app:appCredential:save')")
+    @OperationLog
+    @Operation(summary = "批量添加应用密钥凭证")
+    @PostMapping("/batch")
+    public ApiResult<?> saveBatch(@RequestBody List<AppCredential> list) {
+        if (appCredentialService.saveBatch(list)) {
+            return success("添加成功");
+        }
+        return fail("添加失败");
+    }
+
+    @PreAuthorize("hasAuthority('app:appCredential:update')")
+    @OperationLog
+    @Operation(summary = "批量修改应用密钥凭证")
+    @PutMapping("/batch")
+    public ApiResult<?> updateBatch(@RequestBody BatchParam<AppCredential> batchParam) {
+        if (batchParam.update(appCredentialService, "id")) {
+            return success("修改成功");
+        }
+        return fail("修改失败");
+    }
+
+    @PreAuthorize("hasAuthority('app:appCredential:remove')")
+    @OperationLog
+    @Operation(summary = "批量删除应用密钥凭证")
+    @DeleteMapping("/batch")
+    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
+        if (appCredentialService.removeByIds(ids)) {
+            return success("删除成功");
+        }
+        return fail("删除失败");
+    }
+
+}

src/main/java/com/gxwebsoft/app/controller/AppEventController.java

@@ -0,0 +1,133 @@
+package com.gxwebsoft.app.controller;
+
+import com.gxwebsoft.common.core.web.BaseController;
+import com.gxwebsoft.app.service.AppEventService;
+import com.gxwebsoft.app.entity.AppEvent;
+import com.gxwebsoft.app.param.AppEventParam;
+import com.gxwebsoft.common.core.web.ApiResult;
+import com.gxwebsoft.common.core.web.PageResult;
+import com.gxwebsoft.common.core.annotation.OperationLog;
+import com.gxwebsoft.common.system.entity.User;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 应用操作动态控制器
+ *
+ * @author 科技小王子
+ * @since 2026-03-28 21:29:44
+ */
+@Slf4j
+@Tag(name = "应用操作动态管理")
+@RestController
+@RequestMapping("/api/app/app-event")
+public class AppEventController extends BaseController {
+
+    @Resource
+    private AppEventService appEventService;
+
+    @Operation(summary = "分页查询操作动态")
+    @GetMapping("/page")
+    public ApiResult<PageResult<AppEvent>> page(AppEventParam param) {
+        return success(appEventService.pageRel(param));
+    }
+
+    @Operation(summary = "查询全部操作动态")
+    @GetMapping()
+    public ApiResult<List<AppEvent>> list(AppEventParam param) {
+        return success(appEventService.listRel(param));
+    }
+
+    @Operation(summary = "根据id查询操作动态")
+    @GetMapping("/{id}")
+    public ApiResult<AppEvent> get(@PathVariable("id") Integer id) {
+        return success(appEventService.getByIdRel(id));
+    }
+
+    @Operation(summary = "获取应用最新一条动态（用于卡片展示）")
+    @GetMapping("/latest/{websiteId}")
+    public ApiResult<AppEvent> getLatest(@PathVariable("websiteId") Long websiteId) {
+        return success(appEventService.getLatestEvent(websiteId));
+    }
+
+    @PreAuthorize("hasAuthority('app:appEvent:save')")
+    @OperationLog
+    @Operation(summary = "手动记录操作动态")
+    @PostMapping()
+    public ApiResult<?> save(@RequestBody AppEvent appEvent) {
+        User loginUser = getLoginUser();
+        if (loginUser != null) {
+            appEvent.setUserId(loginUser.getUserId());
+            appEvent.setTenantId(loginUser.getTenantId());
+            if (appEvent.getOperatorId() == null) {
+                appEvent.setOperatorId(loginUser.getUserId().longValue());
+            }
+            if (appEvent.getOperator() == null) {
+                appEvent.setOperator(loginUser.getNickname());
+            }
+        }
+        if (appEventService.save(appEvent)) {
+            return success("记录成功");
+        }
+        return fail("记录失败");
+    }
+
+    @PreAuthorize("hasAuthority('app:appEvent:update')")
+    @OperationLog
+    @Operation(summary = "修改操作动态")
+    @PutMapping()
+    public ApiResult<?> update(@RequestBody AppEvent appEvent) {
+        if (appEventService.updateById(appEvent)) {
+            return success("修改成功");
+        }
+        return fail("修改失败");
+    }
+
+    @PreAuthorize("hasAuthority('app:appEvent:remove')")
+    @OperationLog
+    @Operation(summary = "删除操作动态")
+    @DeleteMapping("/{id}")
+    public ApiResult<?> remove(@PathVariable("id") Integer id) {
+        if (appEventService.removeById(id)) {
+            return success("删除成功");
+        }
+        return fail("删除失败");
+    }
+
+    @PreAuthorize("hasAuthority('app:appEvent:remove')")
+    @OperationLog
+    @Operation(summary = "清空应用所有动态记录")
+    @DeleteMapping("/clear/{websiteId}")
+    public ApiResult<?> clearByWebsiteId(@PathVariable("websiteId") Long websiteId) {
+        // 只清空当前租户下的数据
+        AppEventParam param = new AppEventParam();
+        param.setWebsiteId(websiteId);
+        List<AppEvent> list = appEventService.listRel(param);
+        if (list.isEmpty()) {
+            return success("暂无动态记录");
+        }
+        List<Long> ids = list.stream().map(AppEvent::getId).collect(java.util.stream.Collectors.toList());
+        if (appEventService.removeByIds(ids)) {
+            return success("已清空 " + ids.size() + " 条动态记录");
+        }
+        return fail("清空失败");
+    }
+
+    @PreAuthorize("hasAuthority('app:appEvent:remove')")
+    @OperationLog
+    @Operation(summary = "批量删除操作动态")
+    @DeleteMapping("/batch")
+    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
+        if (appEventService.removeByIds(ids)) {
+            return success("删除成功");
+        }
+        return fail("删除失败");
+    }
+
+}

src/main/java/com/gxwebsoft/app/controller/AppUserController.java

@@ -0,0 +1,158 @@
+package com.gxwebsoft.app.controller;
+
+import com.gxwebsoft.common.core.web.BaseController;
+import com.gxwebsoft.app.service.AppUserService;
+import com.gxwebsoft.app.entity.AppUser;
+import com.gxwebsoft.app.param.AppUserParam;
+import com.gxwebsoft.common.core.web.ApiResult;
+import com.gxwebsoft.common.core.web.PageResult;
+import com.gxwebsoft.common.core.web.BatchParam;
+import com.gxwebsoft.common.core.annotation.OperationLog;
+import com.gxwebsoft.common.system.entity.User;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 应用成员控制器
+ *
+ * @author 科技小王子
+ * @since 2026-03-28 21:29:44
+ */
+@Slf4j
+@Tag(name = "应用成员管理")
+@RestController
+@RequestMapping("/api/app/app-user")
+public class AppUserController extends BaseController {
+
+    @Resource
+    private AppUserService appUserService;
+
+    @Operation(summary = "分页查询应用成员")
+    @GetMapping("/page")
+    public ApiResult<PageResult<AppUser>> page(AppUserParam param) {
+        return success(appUserService.pageRel(param));
+    }
+
+    @Operation(summary = "查询全部应用成员")
+    @GetMapping()
+    public ApiResult<List<AppUser>> list(AppUserParam param) {
+        return success(appUserService.listRel(param));
+    }
+
+    @Operation(summary = "根据id查询应用成员")
+    @GetMapping("/{id}")
+    public ApiResult<AppUser> get(@PathVariable("id") Integer id) {
+        return success(appUserService.getByIdRel(id));
+    }
+
+    @PreAuthorize("hasAuthority('app:appUser:save')")
+    @OperationLog
+    @Operation(summary = "添加应用成员（手动添加）")
+    @PostMapping()
+    public ApiResult<?> save(@RequestBody AppUser appUser) {
+        User loginUser = getLoginUser();
+        if (loginUser != null) {
+            appUser.setUserId(loginUser.getUserId());
+            appUser.setTenantId(loginUser.getTenantId());
+        }
+        if (appUserService.save(appUser)) {
+            return success("添加成功");
+        }
+        return fail("添加失败");
+    }
+
+    @PreAuthorize("hasAuthority('app:appUser:save')")
+    @OperationLog
+    @Operation(summary = "邀请用户成为应用成员")
+    @PostMapping("/invite")
+    public ApiResult<?> invite(@RequestBody AppUser appUser) {
+        User loginUser = getLoginUser();
+        if (loginUser == null) {
+            return fail("请先登录");
+        }
+        try {
+            AppUser result = appUserService.inviteUser(
+                    appUser.getWebsiteId(),
+                    appUser.getUserId(),
+                    appUser.getRole(),
+                    loginUser.getUserId()
+            );
+            return success("邀请成功", result);
+        } catch (RuntimeException e) {
+            return fail(e.getMessage());
+        }
+    }
+
+    @PreAuthorize("hasAuthority('app:appUser:update')")
+    @OperationLog
+    @Operation(summary = "修改应用成员信息")
+    @PutMapping()
+    public ApiResult<?> update(@RequestBody AppUser appUser) {
+        if (appUserService.updateById(appUser)) {
+            return success("修改成功");
+        }
+        return fail("修改失败");
+    }
+
+    @PreAuthorize("hasAuthority('app:appUser:update')")
+    @OperationLog
+    @Operation(summary = "修改成员角色")
+    @PutMapping("/role/{id}/{role}")
+    public ApiResult<?> updateRole(@PathVariable("id") Long id, @PathVariable("role") String role) {
+        if (appUserService.updateRole(id, role)) {
+            return success("角色修改成功");
+        }
+        return fail("修改失败");
+    }
+
+    @PreAuthorize("hasAuthority('app:appUser:remove')")
+    @OperationLog
+    @Operation(summary = "移除应用成员")
+    @DeleteMapping("/{id}")
+    public ApiResult<?> remove(@PathVariable("id") Integer id) {
+        if (appUserService.removeById(id)) {
+            return success("已移除");
+        }
+        return fail("移除失败");
+    }
+
+    @PreAuthorize("hasAuthority('app:appUser:save')")
+    @OperationLog
+    @Operation(summary = "批量添加应用成员")
+    @PostMapping("/batch")
+    public ApiResult<?> saveBatch(@RequestBody List<AppUser> list) {
+        if (appUserService.saveBatch(list)) {
+            return success("添加成功");
+        }
+        return fail("添加失败");
+    }
+
+    @PreAuthorize("hasAuthority('app:appUser:update')")
+    @OperationLog
+    @Operation(summary = "批量修改应用成员")
+    @PutMapping("/batch")
+    public ApiResult<?> updateBatch(@RequestBody BatchParam<AppUser> batchParam) {
+        if (batchParam.update(appUserService, "id")) {
+            return success("修改成功");
+        }
+        return fail("修改失败");
+    }
+
+    @PreAuthorize("hasAuthority('app:appUser:remove')")
+    @OperationLog
+    @Operation(summary = "批量移除应用成员")
+    @DeleteMapping("/batch")
+    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
+        if (appUserService.removeByIds(ids)) {
+            return success("移除成功");
+        }
+        return fail("移除失败");
+    }
+
+}

src/main/java/com/gxwebsoft/app/controller/AppVersionController.java

@@ -0,0 +1,173 @@
+package com.gxwebsoft.app.controller;
+
+import com.gxwebsoft.common.core.web.BaseController;
+import com.gxwebsoft.app.service.AppVersionService;
+import com.gxwebsoft.app.entity.AppVersion;
+import com.gxwebsoft.app.param.AppVersionParam;
+import com.gxwebsoft.common.core.web.ApiResult;
+import com.gxwebsoft.common.core.web.PageResult;
+import com.gxwebsoft.common.core.web.BatchParam;
+import com.gxwebsoft.common.core.annotation.OperationLog;
+import com.gxwebsoft.common.system.entity.User;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 应用版本发布记录控制器
+ *
+ * @author 科技小王子
+ * @since 2026-03-28 21:29:44
+ */
+@Slf4j
+@Tag(name = "应用版本发布管理")
+@RestController
+@RequestMapping("/api/app/app-version")
+public class AppVersionController extends BaseController {
+
+    @Resource
+    private AppVersionService appVersionService;
+
+    @Operation(summary = "分页查询版本记录")
+    @GetMapping("/page")
+    public ApiResult<PageResult<AppVersion>> page(AppVersionParam param) {
+        return success(appVersionService.pageRel(param));
+    }
+
+    @Operation(summary = "查询全部版本记录")
+    @GetMapping()
+    public ApiResult<List<AppVersion>> list(AppVersionParam param) {
+        return success(appVersionService.listRel(param));
+    }
+
+    @Operation(summary = "根据id查询版本")
+    @GetMapping("/{id}")
+    public ApiResult<AppVersion> get(@PathVariable("id") Integer id) {
+        return success(appVersionService.getByIdRel(id));
+    }
+
+    @Operation(summary = "获取应用当前版本")
+    @GetMapping("/current/{websiteId}")
+    public ApiResult<AppVersion> getCurrentVersion(@PathVariable("websiteId") Long websiteId) {
+        return success(appVersionService.getCurrentVersion(websiteId));
+    }
+
+    @PreAuthorize("hasAuthority('app:appVersion:save')")
+    @OperationLog
+    @Operation(summary = "新增版本（构建中状态）")
+    @PostMapping()
+    public ApiResult<?> save(@RequestBody AppVersion appVersion) {
+        User loginUser = getLoginUser();
+        if (loginUser != null) {
+            appVersion.setUserId(loginUser.getUserId());
+            appVersion.setTenantId(loginUser.getTenantId());
+        }
+        // 默认为构建中状态
+        if (appVersion.getStatus() == null) {
+            appVersion.setStatus(0);
+        }
+        if (appVersion.getEnv() == null) {
+            appVersion.setEnv("production");
+        }
+        appVersion.setIsCurrent(false);
+        if (appVersionService.save(appVersion)) {
+            return success("创建成功");
+        }
+        return fail("创建失败");
+    }
+
+    @PreAuthorize("hasAuthority('app:appVersion:update')")
+    @OperationLog
+    @Operation(summary = "修改版本信息")
+    @PutMapping()
+    public ApiResult<?> update(@RequestBody AppVersion appVersion) {
+        if (appVersionService.updateById(appVersion)) {
+            return success("修改成功");
+        }
+        return fail("修改失败");
+    }
+
+    @PreAuthorize("hasAuthority('app:appVersion:update')")
+    @OperationLog
+    @Operation(summary = "发布版本（将此版本设为当前运行版本）")
+    @PostMapping("/publish/{id}")
+    public ApiResult<?> publish(@PathVariable("id") Long id) {
+        User loginUser = getLoginUser();
+        if (loginUser == null) {
+            return fail("请先登录");
+        }
+        try {
+            appVersionService.publish(id, loginUser.getUserId());
+            return success("发布成功");
+        } catch (RuntimeException e) {
+            return fail(e.getMessage());
+        }
+    }
+
+    @PreAuthorize("hasAuthority('app:appVersion:update')")
+    @OperationLog
+    @Operation(summary = "回滚到指定版本")
+    @PostMapping("/rollback/{id}")
+    public ApiResult<?> rollback(@PathVariable("id") Long id) {
+        User loginUser = getLoginUser();
+        if (loginUser == null) {
+            return fail("请先登录");
+        }
+        try {
+            appVersionService.rollback(id, loginUser.getUserId());
+            return success("回滚成功");
+        } catch (RuntimeException e) {
+            return fail(e.getMessage());
+        }
+    }
+
+    @PreAuthorize("hasAuthority('app:appVersion:remove')")
+    @OperationLog
+    @Operation(summary = "删除版本记录")
+    @DeleteMapping("/{id}")
+    public ApiResult<?> remove(@PathVariable("id") Integer id) {
+        if (appVersionService.removeById(id)) {
+            return success("删除成功");
+        }
+        return fail("删除失败");
+    }
+
+    @PreAuthorize("hasAuthority('app:appVersion:save')")
+    @OperationLog
+    @Operation(summary = "批量添加版本")
+    @PostMapping("/batch")
+    public ApiResult<?> saveBatch(@RequestBody List<AppVersion> list) {
+        if (appVersionService.saveBatch(list)) {
+            return success("添加成功");
+        }
+        return fail("添加失败");
+    }
+
+    @PreAuthorize("hasAuthority('app:appVersion:update')")
+    @OperationLog
+    @Operation(summary = "批量修改版本")
+    @PutMapping("/batch")
+    public ApiResult<?> updateBatch(@RequestBody BatchParam<AppVersion> batchParam) {
+        if (batchParam.update(appVersionService, "id")) {
+            return success("修改成功");
+        }
+        return fail("修改失败");
+    }
+
+    @PreAuthorize("hasAuthority('app:appVersion:remove')")
+    @OperationLog
+    @Operation(summary = "批量删除版本记录")
+    @DeleteMapping("/batch")
+    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
+        if (appVersionService.removeByIds(ids)) {
+            return success("删除成功");
+        }
+        return fail("删除失败");
+    }
+
+}

src/main/java/com/gxwebsoft/app/entity/AppCredential.java

@@ -1,70 +1,57 @@
-package com.gxwebsoft.credit.entity;
+package com.gxwebsoft.app.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.TableLogic;
+import java.io.Serializable;
+
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.io.Serializable;
-import java.time.LocalDateTime;
-
 /**
- * 被执行人
+ * 应用密钥凭证
  *
  * @author 科技小王子
- * @since 2026-01-12 08:10:43
+ * @since 2026-03-28 21:29:43
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
-@Schema(name = "CreditJudgmentDebtorHistory对象", description = "被执行人")
-public class CreditJudgmentDebtorHistory implements Serializable {
+@Schema(name = "AppCredential对象", description = "应用密钥凭证")
+public class AppCredential implements Serializable {
     private static final long serialVersionUID = 1L;
 
-    @Schema(description = "ID")
+    @Schema(description = "自增ID")
     @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
+    private Long id;
 
-    @Schema(description = "案号")
-    private String caseNumber;
+    @Schema(description = "关联应用ID")
+    private Long websiteId;
 
-    @Schema(description = "被执行人名称")
+    @Schema(description = "凭证名称，如生产环境密钥")
     private String name;
 
-    @Schema(description = "被执行人")
-    private String name1;
+    @Schema(description = "App ID（公开）")
+    private String appId;
 
-    @Schema(description = "证件号/组织机构代码")
-    private String code;
+    @Schema(description = "App Secret（加密存储）")
+    private String appSecret;
 
-    @Schema(description = "链接")
-    private String url;
+    @Schema(description = "凭证类型: server/client/webhook")
+    private String type;
 
-    @Schema(description = "是否多企业")
-    private Integer type;
+    @Schema(description = "权限范围，空格分隔")
+    private String scopes;
 
-    @Schema(description = "立案日期")
-    private String occurrenceTime;
+    @Schema(description = "到期时间，NULL=永不过期")
+    private LocalDateTime expireTime;
 
-    @Schema(description = "执行标的(元)")
-    private String amount;
+    @Schema(description = "最后使用时间")
+    private LocalDateTime lastUsedAt;
 
-    @Schema(description = "法院")
-    private String courtName;
-
-    @Schema(description = "数据状态")
-    private String dataStatus;
-
-    @Schema(description = "企业ID")
-    private Integer companyId;
-
-    @Schema(description = "备注")
-    private String comments;
-
-    @Schema(description = "是否推荐")
-    private Integer recommend;
+    private String remark;
 
     @Schema(description = "排序(数字越小越靠前)")
     private Integer sortNumber;

src/main/java/com/gxwebsoft/app/entity/AppEvent.java

@@ -0,0 +1,76 @@
+package com.gxwebsoft.app.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 应用操作动态
+ *
+ * @author 科技小王子
+ * @since 2026-03-28 21:29:44
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Schema(name = "AppEvent对象", description = "应用操作动态")
+public class AppEvent implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @Schema(description = "自增ID")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    @Schema(description = "关联应用ID")
+    private Long websiteId;
+
+    @Schema(description = "事件类型: created/published/updated/domain_bound/member_added/status_changed")
+    private String eventType;
+
+    @Schema(description = "事件标题，如已发布")
+    private String title;
+
+    @Schema(description = "详细描述")
+    private String content;
+
+    @Schema(description = "操作人用户ID")
+    private Long operatorId;
+
+    @Schema(description = "操作人名称（冗余）")
+    private String operator;
+
+    @Schema(description = "关联ID，如版本ID")
+    private Long refId;
+
+    @Schema(description = "关联类型")
+    private String refType;
+
+    @Schema(description = "扩展数据")
+    private String extra;
+
+    @Schema(description = "排序(数字越小越靠前)")
+    private Integer sortNumber;
+
+    @Schema(description = "状态, 0正常, 1冻结")
+    private Integer status;
+
+    @Schema(description = "用户ID")
+    private Integer userId;
+
+    @Schema(description = "租户id")
+    private Integer tenantId;
+
+    @Schema(description = "创建时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime createTime;
+
+    @Schema(description = "修改时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime updateTime;
+
+}

src/main/java/com/gxwebsoft/app/entity/AppUser.java

@@ -0,0 +1,67 @@
+package com.gxwebsoft.app.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 应用成员
+ *
+ * @author 科技小王子
+ * @since 2026-03-28 21:29:44
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Schema(name = "AppUser对象", description = "应用成员")
+public class AppUser implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @Schema(description = "自增ID")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    @Schema(description = "关联应用ID")
+    private Long websiteId;
+
+    @Schema(description = "用户ID")
+    private Integer userId;
+
+    @Schema(description = "用户名（冗余）")
+    private String username;
+
+    @Schema(description = "头像（冗余）")
+    private String avatar;
+
+    @Schema(description = "角色: owner/admin/developer/viewer")
+    private String role;
+
+    @Schema(description = "邀请人用户ID")
+    private Long inviteBy;
+
+    @Schema(description = "加入时间")
+    private LocalDateTime inviteTime;
+
+    @Schema(description = "排序(数字越小越靠前)")
+    private Integer sortNumber;
+
+    @Schema(description = "状态, 0正常, 1冻结")
+    private Integer status;
+
+    @Schema(description = "租户id")
+    private Integer tenantId;
+
+    @Schema(description = "创建时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime createTime;
+
+    @Schema(description = "修改时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime updateTime;
+
+}

src/main/java/com/gxwebsoft/app/entity/AppVersion.java

@@ -0,0 +1,85 @@
+package com.gxwebsoft.app.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 应用版本发布记录
+ *
+ * @author 科技小王子
+ * @since 2026-03-28 21:29:44
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Schema(name = "AppVersion对象", description = "应用版本发布记录")
+public class AppVersion implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @Schema(description = "自增ID")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    @Schema(description = "关联应用ID")
+    private Long websiteId;
+
+    @Schema(description = "版本号，如 1.0.0")
+    private String versionNo;
+
+    @Schema(description = "版本名称")
+    private String versionName;
+
+    @Schema(description = "版本更新说明")
+    private String changelog;
+
+    @Schema(description = "安装包地址")
+    private String packageUrl;
+
+    @Schema(description = "包大小(字节)")
+    private Long packageSize;
+
+    @Schema(description = "包MD5/SHA256")
+    private String packageHash;
+
+    @Schema(description = "环境: development/staging/production")
+    private String env;
+
+    @Schema(description = "状态 0=构建中 1=已发布 2=已回滚 3=构建失败")
+    private Integer status;
+
+    @Schema(description = "是否为当前版本")
+    private Boolean isCurrent;
+
+    @Schema(description = "发布人用户ID")
+    private Long publishBy;
+
+    @Schema(description = "发布时间")
+    private LocalDateTime publishTime;
+
+    @Schema(description = "备注")
+    private String remark;
+
+    @Schema(description = "排序(数字越小越靠前)")
+    private Integer sortNumber;
+
+    @Schema(description = "用户ID")
+    private Integer userId;
+
+    @Schema(description = "租户id")
+    private Integer tenantId;
+
+    @Schema(description = "创建时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime createTime;
+
+    @Schema(description = "修改时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime updateTime;
+
+}

src/main/java/com/gxwebsoft/app/mapper/AppCredentialMapper.java

@@ -0,0 +1,37 @@
+package com.gxwebsoft.app.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.gxwebsoft.app.entity.AppCredential;
+import com.gxwebsoft.app.param.AppCredentialParam;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 应用密钥凭证Mapper
+ *
+ * @author 科技小王子
+ * @since 2026-03-28 21:29:43
+ */
+public interface AppCredentialMapper extends BaseMapper<AppCredential> {
+
+    /**
+     * 分页查询
+     *
+     * @param page  分页对象
+     * @param param 查询参数
+     * @return List<AppCredential>
+     */
+    List<AppCredential> selectPageRel(@Param("page") IPage<AppCredential> page,
+                             @Param("param") AppCredentialParam param);
+
+    /**
+     * 查询全部
+     *
+     * @param param 查询参数
+     * @return List<User>
+     */
+    List<AppCredential> selectListRel(@Param("param") AppCredentialParam param);
+
+}

src/main/java/com/gxwebsoft/app/mapper/AppEventMapper.java

@@ -0,0 +1,37 @@
+package com.gxwebsoft.app.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.gxwebsoft.app.entity.AppEvent;
+import com.gxwebsoft.app.param.AppEventParam;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 应用操作动态Mapper
+ *
+ * @author 科技小王子
+ * @since 2026-03-28 21:29:44
+ */
+public interface AppEventMapper extends BaseMapper<AppEvent> {
+
+    /**
+     * 分页查询
+     *
+     * @param page  分页对象
+     * @param param 查询参数
+     * @return List<AppEvent>
+     */
+    List<AppEvent> selectPageRel(@Param("page") IPage<AppEvent> page,
+                             @Param("param") AppEventParam param);
+
+    /**
+     * 查询全部
+     *
+     * @param param 查询参数
+     * @return List<User>
+     */
+    List<AppEvent> selectListRel(@Param("param") AppEventParam param);
+
+}

src/main/java/com/gxwebsoft/app/mapper/AppUserMapper.java

@@ -0,0 +1,37 @@
+package com.gxwebsoft.app.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.gxwebsoft.app.entity.AppUser;
+import com.gxwebsoft.app.param.AppUserParam;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 应用成员Mapper
+ *
+ * @author 科技小王子
+ * @since 2026-03-28 21:29:44
+ */
+public interface AppUserMapper extends BaseMapper<AppUser> {
+
+    /**
+     * 分页查询
+     *
+     * @param page  分页对象
+     * @param param 查询参数
+     * @return List<AppUser>
+     */
+    List<AppUser> selectPageRel(@Param("page") IPage<AppUser> page,
+                             @Param("param") AppUserParam param);
+
+    /**
+     * 查询全部
+     *
+     * @param param 查询参数
+     * @return List<User>
+     */
+    List<AppUser> selectListRel(@Param("param") AppUserParam param);
+
+}

src/main/java/com/gxwebsoft/app/mapper/AppVersionMapper.java

@@ -0,0 +1,37 @@
+package com.gxwebsoft.app.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.gxwebsoft.app.entity.AppVersion;
+import com.gxwebsoft.app.param.AppVersionParam;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 应用版本发布记录Mapper
+ *
+ * @author 科技小王子
+ * @since 2026-03-28 21:29:44
+ */
+public interface AppVersionMapper extends BaseMapper<AppVersion> {
+
+    /**
+     * 分页查询
+     *
+     * @param page  分页对象
+     * @param param 查询参数
+     * @return List<AppVersion>
+     */
+    List<AppVersion> selectPageRel(@Param("page") IPage<AppVersion> page,
+                             @Param("param") AppVersionParam param);
+
+    /**
+     * 查询全部
+     *
+     * @param param 查询参数
+     * @return List<User>
+     */
+    List<AppVersion> selectListRel(@Param("param") AppVersionParam param);
+
+}

src/main/java/com/gxwebsoft/app/mapper/xml/AppCredentialMapper.xml

@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.gxwebsoft.app.mapper.AppCredentialMapper">
+
+    <!-- 关联查询sql -->
+    <sql id="selectSql">
+        SELECT a.*, w.website_name, w.website_code, w.website_icon
+        FROM app_credential a
+        LEFT JOIN cms_website w ON a.website_id = w.website_id AND w.deleted = 0
+        <where>
+            <if test="param.id != null">
+                AND a.id = #{param.id}
+            </if>
+            <if test="param.websiteId != null">
+                AND a.website_id = #{param.websiteId}
+            </if>
+            <if test="param.name != null and param.name != ''">
+                AND a.name LIKE CONCAT('%', #{param.name}, '%')
+            </if>
+            <if test="param.appId != null and param.appId != ''">
+                AND a.app_id = #{param.appId}
+            </if>
+            <if test="param.type != null and param.type != ''">
+                AND a.type = #{param.type}
+            </if>
+            <if test="param.scopes != null and param.scopes != ''">
+                AND a.scopes LIKE CONCAT('%', #{param.scopes}, '%')
+            </if>
+            <if test="param.remark != null and param.remark != ''">
+                AND a.remark LIKE CONCAT('%', #{param.remark}, '%')
+            </if>
+            <if test="param.sortNumber != null">
+                AND a.sort_number = #{param.sortNumber}
+            </if>
+            <if test="param.status != null">
+                AND a.status = #{param.status}
+            </if>
+            <if test="param.deleted != null">
+                AND a.deleted = #{param.deleted}
+            </if>
+            <if test="param.deleted == null">
+                AND a.deleted = 0
+            </if>
+            <if test="param.userId != null">
+                AND a.user_id = #{param.userId}
+            </if>
+            <if test="param.createTimeStart != null">
+                AND a.create_time &gt;= #{param.createTimeStart}
+            </if>
+            <if test="param.createTimeEnd != null">
+                AND a.create_time &lt;= #{param.createTimeEnd}
+            </if>
+            <if test="param.keywords != null and param.keywords != ''">
+                AND (a.name LIKE CONCAT('%', #{param.keywords}, '%')
+                  OR a.app_id LIKE CONCAT('%', #{param.keywords}, '%')
+                )
+            </if>
+        </where>
+    </sql>
+
+    <!-- 分页查询 -->
+    <select id="selectPageRel" resultType="com.gxwebsoft.app.entity.AppCredential">
+        <include refid="selectSql"></include>
+    </select>
+
+    <!-- 查询全部 -->
+    <select id="selectListRel" resultType="com.gxwebsoft.app.entity.AppCredential">
+        <include refid="selectSql"></include>
+    </select>
+
+</mapper>

src/main/java/com/gxwebsoft/app/mapper/xml/AppEventMapper.xml

@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.gxwebsoft.app.mapper.AppEventMapper">
+
+    <!-- 关联查询sql -->
+    <sql id="selectSql">
+        SELECT a.*, w.website_name, w.website_code, w.website_icon
+        FROM app_event a
+        LEFT JOIN cms_website w ON a.website_id = w.website_id AND w.deleted = 0
+        <where>
+            <if test="param.id != null">
+                AND a.id = #{param.id}
+            </if>
+            <if test="param.websiteId != null">
+                AND a.website_id = #{param.websiteId}
+            </if>
+            <if test="param.eventType != null and param.eventType != ''">
+                AND a.event_type = #{param.eventType}
+            </if>
+            <if test="param.title != null and param.title != ''">
+                AND a.title LIKE CONCAT('%', #{param.title}, '%')
+            </if>
+            <if test="param.operatorId != null">
+                AND a.operator_id = #{param.operatorId}
+            </if>
+            <if test="param.refId != null">
+                AND a.ref_id = #{param.refId}
+            </if>
+            <if test="param.refType != null and param.refType != ''">
+                AND a.ref_type = #{param.refType}
+            </if>
+            <if test="param.status != null">
+                AND a.status = #{param.status}
+            </if>
+            <if test="param.userId != null">
+                AND a.user_id = #{param.userId}
+            </if>
+            <if test="param.tenantId != null">
+                AND a.tenant_id = #{param.tenantId}
+            </if>
+            <if test="param.createTimeStart != null">
+                AND a.create_time &gt;= #{param.createTimeStart}
+            </if>
+            <if test="param.createTimeEnd != null">
+                AND a.create_time &lt;= #{param.createTimeEnd}
+            </if>
+            <if test="param.keywords != null and param.keywords != ''">
+                AND (a.title LIKE CONCAT('%', #{param.keywords}, '%')
+                  OR a.content LIKE CONCAT('%', #{param.keywords}, '%')
+                )
+            </if>
+        </where>
+        ORDER BY a.create_time DESC
+    </sql>
+
+    <!-- 分页查询 -->
+    <select id="selectPageRel" resultType="com.gxwebsoft.app.entity.AppEvent">
+        <include refid="selectSql"></include>
+    </select>
+
+    <!-- 查询全部 -->
+    <select id="selectListRel" resultType="com.gxwebsoft.app.entity.AppEvent">
+        <include refid="selectSql"></include>
+    </select>
+
+</mapper>

src/main/java/com/gxwebsoft/app/mapper/xml/AppUserMapper.xml

@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.gxwebsoft.app.mapper.AppUserMapper">
+
+    <!-- 关联查询sql -->
+    <sql id="selectSql">
+        SELECT a.*, w.website_name, w.website_code, w.website_icon,
+               u.nickname, u.avatar AS user_avatar, u.phone
+        FROM app_user a
+        LEFT JOIN cms_website w ON a.website_id = w.website_id AND w.deleted = 0
+        LEFT JOIN sys_user u ON a.user_id = u.user_id
+        <where>
+            <if test="param.id != null">
+                AND a.id = #{param.id}
+            </if>
+            <if test="param.websiteId != null">
+                AND a.website_id = #{param.websiteId}
+            </if>
+            <if test="param.userId != null">
+                AND a.user_id = #{param.userId}
+            </if>
+            <if test="param.username != null and param.username != ''">
+                AND (a.username LIKE CONCAT('%', #{param.username}, '%')
+                  OR u.nickname LIKE CONCAT('%', #{param.username}, '%'))
+            </if>
+            <if test="param.role != null and param.role != ''">
+                AND a.role = #{param.role}
+            </if>
+            <if test="param.inviteBy != null">
+                AND a.invite_by = #{param.inviteBy}
+            </if>
+            <if test="param.sortNumber != null">
+                AND a.sort_number = #{param.sortNumber}
+            </if>
+            <if test="param.status != null">
+                AND a.status = #{param.status}
+            </if>
+            <if test="param.tenantId != null">
+                AND a.tenant_id = #{param.tenantId}
+            </if>
+            <if test="param.createTimeStart != null">
+                AND a.create_time &gt;= #{param.createTimeStart}
+            </if>
+            <if test="param.createTimeEnd != null">
+                AND a.create_time &lt;= #{param.createTimeEnd}
+            </if>
+            <if test="param.keywords != null and param.keywords != ''">
+                AND (a.username LIKE CONCAT('%', #{param.keywords}, '%')
+                  OR u.nickname LIKE CONCAT('%', #{param.keywords}, '%')
+                )
+            </if>
+        </where>
+    </sql>
+
+    <!-- 分页查询 -->
+    <select id="selectPageRel" resultType="com.gxwebsoft.app.entity.AppUser">
+        <include refid="selectSql"></include>
+    </select>
+
+    <!-- 查询全部 -->
+    <select id="selectListRel" resultType="com.gxwebsoft.app.entity.AppUser">
+        <include refid="selectSql"></include>
+    </select>
+
+</mapper>

src/main/java/com/gxwebsoft/app/mapper/xml/AppVersionMapper.xml

@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.gxwebsoft.app.mapper.AppVersionMapper">
+
+    <!-- 关联查询sql -->
+    <sql id="selectSql">
+        SELECT a.*, w.website_name, w.website_code, w.website_icon
+        FROM app_version a
+        LEFT JOIN cms_website w ON a.website_id = w.website_id AND w.deleted = 0
+        <where>
+            <if test="param.id != null">
+                AND a.id = #{param.id}
+            </if>
+            <if test="param.websiteId != null">
+                AND a.website_id = #{param.websiteId}
+            </if>
+            <if test="param.versionNo != null and param.versionNo != ''">
+                AND a.version_no = #{param.versionNo}
+            </if>
+            <if test="param.versionName != null and param.versionName != ''">
+                AND a.version_name LIKE CONCAT('%', #{param.versionName}, '%')
+            </if>
+            <if test="param.env != null and param.env != ''">
+                AND a.env = #{param.env}
+            </if>
+            <if test="param.status != null">
+                AND a.status = #{param.status}
+            </if>
+            <if test="param.isCurrent != null">
+                AND a.is_current = #{param.isCurrent}
+            </if>
+            <if test="param.publishBy != null">
+                AND a.publish_by = #{param.publishBy}
+            </if>
+            <if test="param.userId != null">
+                AND a.user_id = #{param.userId}
+            </if>
+            <if test="param.tenantId != null">
+                AND a.tenant_id = #{param.tenantId}
+            </if>
+            <if test="param.createTimeStart != null">
+                AND a.create_time &gt;= #{param.createTimeStart}
+            </if>
+            <if test="param.createTimeEnd != null">
+                AND a.create_time &lt;= #{param.createTimeEnd}
+            </if>
+            <if test="param.keywords != null and param.keywords != ''">
+                AND (a.version_no LIKE CONCAT('%', #{param.keywords}, '%')
+                  OR a.version_name LIKE CONCAT('%', #{param.keywords}, '%')
+                  OR a.changelog LIKE CONCAT('%', #{param.keywords}, '%')
+                )
+            </if>
+        </where>
+    </sql>
+
+    <!-- 分页查询 -->
+    <select id="selectPageRel" resultType="com.gxwebsoft.app.entity.AppVersion">
+        <include refid="selectSql"></include>
+    </select>
+
+    <!-- 查询全部 -->
+    <select id="selectListRel" resultType="com.gxwebsoft.app.entity.AppVersion">
+        <include refid="selectSql"></include>
+    </select>
+
+</mapper>

src/main/java/com/gxwebsoft/app/param/AppCredentialParam.java

@@ -0,0 +1,65 @@
+package com.gxwebsoft.app.param;
+
+import com.gxwebsoft.common.core.annotation.QueryField;
+import com.gxwebsoft.common.core.annotation.QueryType;
+import com.gxwebsoft.common.core.web.BaseParam;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 应用密钥凭证查询参数
+ *
+ * @author 科技小王子
+ * @since 2026-03-28 21:29:43
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@Schema(name = "AppCredentialParam对象", description = "应用密钥凭证查询参数")
+public class AppCredentialParam extends BaseParam {
+    private static final long serialVersionUID = 1L;
+
+    @Schema(description = "自增ID")
+    @QueryField(type = QueryType.EQ)
+    private Long id;
+
+    @Schema(description = "关联应用ID")
+    @QueryField(type = QueryType.EQ)
+    private Long websiteId;
+
+    @Schema(description = "凭证名称，如生产环境密钥")
+    private String name;
+
+    @Schema(description = "App ID（公开）")
+    @QueryField(type = QueryType.EQ)
+    private String appId;
+
+    @Schema(description = "凭证类型: server/client/webhook")
+    @QueryField(type = QueryType.EQ)
+    private String type;
+
+    @Schema(description = "权限范围，空格分隔")
+    private String scopes;
+
+    @Schema(description = "备注")
+    private String remark;
+
+    @Schema(description = "排序(数字越小越靠前)")
+    @QueryField(type = QueryType.EQ)
+    private Integer sortNumber;
+
+    @Schema(description = "状态, 0正常, 1冻结")
+    @QueryField(type = QueryType.EQ)
+    private Integer status;
+
+    @Schema(description = "是否删除, 0否, 1是")
+    @QueryField(type = QueryType.EQ)
+    private Integer deleted;
+
+    @Schema(description = "用户ID")
+    @QueryField(type = QueryType.EQ)
+    private Integer userId;
+
+}

src/main/java/com/gxwebsoft/app/param/AppEventParam.java

@@ -0,0 +1,63 @@
+package com.gxwebsoft.app.param;
+
+import com.gxwebsoft.common.core.annotation.QueryField;
+import com.gxwebsoft.common.core.annotation.QueryType;
+import com.gxwebsoft.common.core.web.BaseParam;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 应用操作动态查询参数
+ *
+ * @author 科技小王子
+ * @since 2026-03-28 21:29:44
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@Schema(name = "AppEventParam对象", description = "应用操作动态查询参数")
+public class AppEventParam extends BaseParam {
+    private static final long serialVersionUID = 1L;
+
+    @Schema(description = "自增ID")
+    @QueryField(type = QueryType.EQ)
+    private Long id;
+
+    @Schema(description = "关联应用ID")
+    @QueryField(type = QueryType.EQ)
+    private Long websiteId;
+
+    @Schema(description = "事件类型: created/published/updated/domain_bound/member_added/status_changed")
+    @QueryField(type = QueryType.EQ)
+    private String eventType;
+
+    @Schema(description = "事件标题（模糊）")
+    private String title;
+
+    @Schema(description = "操作人用户ID")
+    @QueryField(type = QueryType.EQ)
+    private Long operatorId;
+
+    @Schema(description = "关联ID，如版本ID")
+    @QueryField(type = QueryType.EQ)
+    private Long refId;
+
+    @Schema(description = "关联类型")
+    @QueryField(type = QueryType.EQ)
+    private String refType;
+
+    @Schema(description = "状态, 0正常, 1冻结")
+    @QueryField(type = QueryType.EQ)
+    private Integer status;
+
+    @Schema(description = "用户ID")
+    @QueryField(type = QueryType.EQ)
+    private Integer userId;
+
+    @Schema(description = "租户ID")
+    @QueryField(type = QueryType.EQ)
+    private Integer tenantId;
+
+}

src/main/java/com/gxwebsoft/app/param/AppUserParam.java

@@ -0,0 +1,59 @@
+package com.gxwebsoft.app.param;
+
+import com.gxwebsoft.common.core.annotation.QueryField;
+import com.gxwebsoft.common.core.annotation.QueryType;
+import com.gxwebsoft.common.core.web.BaseParam;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 应用成员查询参数
+ *
+ * @author 科技小王子
+ * @since 2026-03-28 21:29:44
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@Schema(name = "AppUserParam对象", description = "应用成员查询参数")
+public class AppUserParam extends BaseParam {
+    private static final long serialVersionUID = 1L;
+
+    @Schema(description = "自增ID")
+    @QueryField(type = QueryType.EQ)
+    private Long id;
+
+    @Schema(description = "关联应用ID")
+    @QueryField(type = QueryType.EQ)
+    private Long websiteId;
+
+    @Schema(description = "用户ID")
+    @QueryField(type = QueryType.EQ)
+    private Integer userId;
+
+    @Schema(description = "用户名（模糊搜索）")
+    private String username;
+
+    @Schema(description = "角色: owner/admin/developer/viewer")
+    @QueryField(type = QueryType.EQ)
+    private String role;
+
+    @Schema(description = "邀请人用户ID")
+    @QueryField(type = QueryType.EQ)
+    private Long inviteBy;
+
+    @Schema(description = "排序(数字越小越靠前)")
+    @QueryField(type = QueryType.EQ)
+    private Integer sortNumber;
+
+    @Schema(description = "状态, 0正常, 1冻结")
+    @QueryField(type = QueryType.EQ)
+    private Integer status;
+
+    @Schema(description = "租户ID")
+    @QueryField(type = QueryType.EQ)
+    private Integer tenantId;
+
+}

src/main/java/com/gxwebsoft/app/param/AppVersionParam.java

@@ -0,0 +1,63 @@
+package com.gxwebsoft.app.param;
+
+import com.gxwebsoft.common.core.annotation.QueryField;
+import com.gxwebsoft.common.core.annotation.QueryType;
+import com.gxwebsoft.common.core.web.BaseParam;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 应用版本发布记录查询参数
+ *
+ * @author 科技小王子
+ * @since 2026-03-28 21:29:44
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@Schema(name = "AppVersionParam对象", description = "应用版本发布记录查询参数")
+public class AppVersionParam extends BaseParam {
+    private static final long serialVersionUID = 1L;
+
+    @Schema(description = "自增ID")
+    @QueryField(type = QueryType.EQ)
+    private Long id;
+
+    @Schema(description = "关联应用ID")
+    @QueryField(type = QueryType.EQ)
+    private Long websiteId;
+
+    @Schema(description = "版本号，如 1.0.0")
+    @QueryField(type = QueryType.EQ)
+    private String versionNo;
+
+    @Schema(description = "版本名称（模糊）")
+    private String versionName;
+
+    @Schema(description = "环境: development/staging/production")
+    @QueryField(type = QueryType.EQ)
+    private String env;
+
+    @Schema(description = "状态 0=构建中 1=已发布 2=已回滚 3=构建失败")
+    @QueryField(type = QueryType.EQ)
+    private Integer status;
+
+    @Schema(description = "是否为当前版本")
+    @QueryField(type = QueryType.EQ)
+    private Boolean isCurrent;
+
+    @Schema(description = "发布人用户ID")
+    @QueryField(type = QueryType.EQ)
+    private Long publishBy;
+
+    @Schema(description = "用户ID")
+    @QueryField(type = QueryType.EQ)
+    private Integer userId;
+
+    @Schema(description = "租户ID")
+    @QueryField(type = QueryType.EQ)
+    private Integer tenantId;
+
+}

src/main/java/com/gxwebsoft/app/service/AppCredentialService.java

@@ -0,0 +1,57 @@
+package com.gxwebsoft.app.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.gxwebsoft.common.core.web.PageResult;
+import com.gxwebsoft.app.entity.AppCredential;
+import com.gxwebsoft.app.param.AppCredentialParam;
+
+import java.util.List;
+
+/**
+ * 应用密钥凭证Service
+ *
+ * @author 科技小王子
+ * @since 2026-03-28 21:29:43
+ */
+public interface AppCredentialService extends IService<AppCredential> {
+
+    /**
+     * 分页关联查询
+     */
+    PageResult<AppCredential> pageRel(AppCredentialParam param);
+
+    /**
+     * 关联查询全部
+     */
+    List<AppCredential> listRel(AppCredentialParam param);
+
+    /**
+     * 根据id查询
+     */
+    AppCredential getByIdRel(Integer id);
+
+    /**
+     * 创建凭证（自动生成 appId 和 appSecret）
+     *
+     * @param credential 凭证基础信息
+     * @return 包含明文 appSecret 的凭证对象（仅此次返回，之后不再展示）
+     */
+    AppCredential createCredential(AppCredential credential);
+
+    /**
+     * 重置密钥（重新生成 appSecret）
+     *
+     * @param id 凭证ID
+     * @return 包含新明文 appSecret 的凭证对象
+     */
+    AppCredential resetSecret(Long id);
+
+    /**
+     * 禁用/启用凭证
+     *
+     * @param id     凭证ID
+     * @param status 0=正常 1=冻结
+     */
+    boolean updateStatus(Long id, Integer status);
+
+}

src/main/java/com/gxwebsoft/app/service/AppEventService.java

@@ -0,0 +1,60 @@
+package com.gxwebsoft.app.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.gxwebsoft.common.core.web.PageResult;
+import com.gxwebsoft.app.entity.AppEvent;
+import com.gxwebsoft.app.param.AppEventParam;
+
+import java.util.List;
+
+/**
+ * 应用操作动态Service
+ *
+ * @author 科技小王子
+ * @since 2026-03-28 21:29:44
+ */
+public interface AppEventService extends IService<AppEvent> {
+
+    /**
+     * 分页关联查询
+     */
+    PageResult<AppEvent> pageRel(AppEventParam param);
+
+    /**
+     * 关联查询全部
+     */
+    List<AppEvent> listRel(AppEventParam param);
+
+    /**
+     * 根据id查询
+     */
+    AppEvent getByIdRel(Integer id);
+
+    /**
+     * 记录应用事件（便捷方法，供其他模块调用）
+     *
+     * @param websiteId  应用ID
+     * @param eventType  事件类型（created/published/updated/domain_bound/member_added/status_changed 等）
+     * @param title      事件标题
+     * @param content    详细描述
+     * @param operatorId 操作人用户ID
+     * @param operatorName 操作人名称
+     * @param refId      关联记录ID（如版本ID）
+     * @param refType    关联记录类型
+     */
+    void logEvent(Long websiteId, String eventType, String title, String content,
+                  Long operatorId, String operatorName, Long refId, String refType);
+
+    /**
+     * 快捷记录事件（无关联记录）
+     */
+    void logEvent(Long websiteId, String eventType, String title, Long operatorId, String operatorName);
+
+    /**
+     * 获取指定应用的最新一条事件（用于卡片"最新动态"展示）
+     *
+     * @param websiteId 应用ID
+     */
+    AppEvent getLatestEvent(Long websiteId);
+
+}

src/main/java/com/gxwebsoft/app/service/AppUserService.java

@@ -0,0 +1,60 @@
+package com.gxwebsoft.app.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.gxwebsoft.common.core.web.PageResult;
+import com.gxwebsoft.app.entity.AppUser;
+import com.gxwebsoft.app.param.AppUserParam;
+
+import java.util.List;
+
+/**
+ * 应用成员Service
+ *
+ * @author 科技小王子
+ * @since 2026-03-28 21:29:44
+ */
+public interface AppUserService extends IService<AppUser> {
+
+    /**
+     * 分页关联查询
+     */
+    PageResult<AppUser> pageRel(AppUserParam param);
+
+    /**
+     * 关联查询全部
+     */
+    List<AppUser> listRel(AppUserParam param);
+
+    /**
+     * 根据id查询
+     */
+    AppUser getByIdRel(Integer id);
+
+    /**
+     * 邀请成员加入应用
+     *
+     * @param websiteId 应用ID
+     * @param userId    被邀请的用户ID
+     * @param role      分配的角色
+     * @param inviteBy  邀请人用户ID
+     * @return 成员记录
+     */
+    AppUser inviteUser(Long websiteId, Integer userId, String role, Integer inviteBy);
+
+    /**
+     * 修改成员角色
+     *
+     * @param id   成员记录ID
+     * @param role 新角色
+     */
+    boolean updateRole(Long id, String role);
+
+    /**
+     * 检查用户是否已是应用成员
+     *
+     * @param websiteId 应用ID
+     * @param userId    用户ID
+     */
+    boolean isMember(Long websiteId, Integer userId);
+
+}

src/main/java/com/gxwebsoft/app/service/AppVersionService.java

@@ -0,0 +1,56 @@
+package com.gxwebsoft.app.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.gxwebsoft.common.core.web.PageResult;
+import com.gxwebsoft.app.entity.AppVersion;
+import com.gxwebsoft.app.param.AppVersionParam;
+
+import java.util.List;
+
+/**
+ * 应用版本发布记录Service
+ *
+ * @author 科技小王子
+ * @since 2026-03-28 21:29:44
+ */
+public interface AppVersionService extends IService<AppVersion> {
+
+    /**
+     * 分页关联查询
+     */
+    PageResult<AppVersion> pageRel(AppVersionParam param);
+
+    /**
+     * 关联查询全部
+     */
+    List<AppVersion> listRel(AppVersionParam param);
+
+    /**
+     * 根据id查询
+     */
+    AppVersion getByIdRel(Integer id);
+
+    /**
+     * 发布版本（将此版本设为当前版本，其他版本 isCurrent=false）
+     *
+     * @param id       版本ID
+     * @param publishBy 发布人用户ID
+     */
+    boolean publish(Long id, Integer publishBy);
+
+    /**
+     * 回滚到指定版本（将此版本设为当前版本，当前版本标为已回滚）
+     *
+     * @param id       要回滚到的版本ID
+     * @param publishBy 操作人用户ID
+     */
+    boolean rollback(Long id, Integer publishBy);
+
+    /**
+     * 获取指定应用的当前版本
+     *
+     * @param websiteId 应用ID
+     */
+    AppVersion getCurrentVersion(Long websiteId);
+
+}

src/main/java/com/gxwebsoft/app/service/impl/AppCredentialServiceImpl.java

@@ -0,0 +1,125 @@
+package com.gxwebsoft.app.service.impl;
+
+import cn.hutool.core.util.RandomUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.gxwebsoft.app.mapper.AppCredentialMapper;
+import com.gxwebsoft.app.service.AppCredentialService;
+import com.gxwebsoft.app.entity.AppCredential;
+import com.gxwebsoft.app.param.AppCredentialParam;
+import com.gxwebsoft.common.core.utils.CommonUtil;
+import com.gxwebsoft.common.core.web.PageParam;
+import com.gxwebsoft.common.core.web.PageResult;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 应用密钥凭证Service实现
+ *
+ * @author 科技小王子
+ * @since 2026-03-28 21:29:43
+ */
+@Slf4j
+@Service
+public class AppCredentialServiceImpl extends ServiceImpl<AppCredentialMapper, AppCredential> implements AppCredentialService {
+
+    @Override
+    public PageResult<AppCredential> pageRel(AppCredentialParam param) {
+        PageParam<AppCredential, AppCredentialParam> page = new PageParam<>(param);
+        page.setDefaultOrder("sort_number asc, create_time desc");
+        List<AppCredential> list = baseMapper.selectPageRel(page, param);
+        // 脱敏处理：appSecret 不对外展示（仅创建/重置时返回明文）
+        list.forEach(this::maskSecret);
+        return new PageResult<>(list, page.getTotal());
+    }
+
+    @Override
+    public List<AppCredential> listRel(AppCredentialParam param) {
+        List<AppCredential> list = baseMapper.selectListRel(param);
+        PageParam<AppCredential, AppCredentialParam> page = new PageParam<>();
+        page.setDefaultOrder("sort_number asc, create_time desc");
+        list = page.sortRecords(list);
+        list.forEach(this::maskSecret);
+        return list;
+    }
+
+    @Override
+    public AppCredential getByIdRel(Integer id) {
+        AppCredentialParam param = new AppCredentialParam();
+        param.setId(id.longValue());
+        AppCredential credential = param.getOne(baseMapper.selectListRel(param));
+        if (credential != null) {
+            maskSecret(credential);
+        }
+        return credential;
+    }
+
+    @Override
+    public AppCredential createCredential(AppCredential credential) {
+        // 生成 AppID：app_ + 16位随机字符串
+        String appId = "app_" + CommonUtil.randomUUID16();
+        // 生成 AppSecret：32位随机字符串（大小写字母+数字）
+        String appSecret = generateSecretValue();
+
+        credential.setAppId(appId);
+        credential.setAppSecret(appSecret);
+        // 默认状态正常
+        if (credential.getStatus() == null) {
+            credential.setStatus(0);
+        }
+        if (StrUtil.isBlank(credential.getType())) {
+            credential.setType("server");
+        }
+
+        save(credential);
+        log.info("创建凭证成功，websiteId={}, appId={}", credential.getWebsiteId(), appId);
+        // 返回含明文 secret 的对象（仅此一次）
+        return credential;
+    }
+
+    @Override
+    public AppCredential resetSecret(Long id) {
+        AppCredential credential = getById(id);
+        if (credential == null) {
+            throw new RuntimeException("凭证不存在");
+        }
+        String newSecret = generateSecretValue();
+        credential.setAppSecret(newSecret);
+        updateById(credential);
+        log.info("重置凭证密钥成功，id={}", id);
+        return credential;
+    }
+
+    @Override
+    public boolean updateStatus(Long id, Integer status) {
+        return update(new LambdaUpdateWrapper<AppCredential>()
+                .eq(AppCredential::getId, id)
+                .set(AppCredential::getStatus, status));
+    }
+
+    /**
+     * 生成32位随机 AppSecret
+     */
+    private String generateSecretValue() {
+        // 格式：8位-8位-8位-8位（类似 UUID 格式，便于复制）
+        return RandomUtil.randomString(8) + "-"
+                + RandomUtil.randomString(8) + "-"
+                + RandomUtil.randomString(8) + "-"
+                + RandomUtil.randomString(8);
+    }
+
+    /**
+     * 脱敏处理：将 appSecret 替换为掩码
+     */
+    private void maskSecret(AppCredential credential) {
+        if (StrUtil.isNotBlank(credential.getAppSecret())) {
+            // 只保留前4位，其余用 * 替代
+            String secret = credential.getAppSecret();
+            credential.setAppSecret(secret.substring(0, Math.min(4, secret.length())) + "**********************");
+        }
+    }
+
+}

src/main/java/com/gxwebsoft/app/service/impl/AppEventServiceImpl.java

@@ -0,0 +1,86 @@
+package com.gxwebsoft.app.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.gxwebsoft.app.mapper.AppEventMapper;
+import com.gxwebsoft.app.service.AppEventService;
+import com.gxwebsoft.app.entity.AppEvent;
+import com.gxwebsoft.app.param.AppEventParam;
+import com.gxwebsoft.common.core.web.PageParam;
+import com.gxwebsoft.common.core.web.PageResult;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 应用操作动态Service实现
+ *
+ * @author 科技小王子
+ * @since 2026-03-28 21:29:44
+ */
+@Slf4j
+@Service
+public class AppEventServiceImpl extends ServiceImpl<AppEventMapper, AppEvent> implements AppEventService {
+
+    @Override
+    public PageResult<AppEvent> pageRel(AppEventParam param) {
+        PageParam<AppEvent, AppEventParam> page = new PageParam<>(param);
+        page.setDefaultOrder("create_time desc");
+        List<AppEvent> list = baseMapper.selectPageRel(page, param);
+        return new PageResult<>(list, page.getTotal());
+    }
+
+    @Override
+    public List<AppEvent> listRel(AppEventParam param) {
+        List<AppEvent> list = baseMapper.selectListRel(param);
+        PageParam<AppEvent, AppEventParam> page = new PageParam<>();
+        page.setDefaultOrder("create_time desc");
+        return page.sortRecords(list);
+    }
+
+    @Override
+    public AppEvent getByIdRel(Integer id) {
+        AppEventParam param = new AppEventParam();
+        param.setId(id.longValue());
+        return param.getOne(baseMapper.selectListRel(param));
+    }
+
+    @Override
+    @Async
+    public void logEvent(Long websiteId, String eventType, String title, String content,
+                         Long operatorId, String operatorName, Long refId, String refType) {
+        try {
+            AppEvent event = new AppEvent();
+            event.setWebsiteId(websiteId);
+            event.setEventType(eventType);
+            event.setTitle(title);
+            event.setContent(content);
+            event.setOperatorId(operatorId);
+            event.setOperator(operatorName);
+            event.setRefId(refId);
+            event.setRefType(refType);
+            event.setStatus(0);
+            save(event);
+            log.debug("记录事件成功，websiteId={}, eventType={}, title={}", websiteId, eventType, title);
+        } catch (Exception e) {
+            log.warn("记录事件失败，websiteId={}, eventType={}: {}", websiteId, eventType, e.getMessage());
+        }
+    }
+
+    @Override
+    @Async
+    public void logEvent(Long websiteId, String eventType, String title, Long operatorId, String operatorName) {
+        logEvent(websiteId, eventType, title, null, operatorId, operatorName, null, null);
+    }
+
+    @Override
+    public AppEvent getLatestEvent(Long websiteId) {
+        return getOne(new LambdaQueryWrapper<AppEvent>()
+                .eq(AppEvent::getWebsiteId, websiteId)
+                .orderByDesc(AppEvent::getCreateTime)
+                .last("LIMIT 1"));
+    }
+
+}

src/main/java/com/gxwebsoft/app/service/impl/AppUserServiceImpl.java

@@ -0,0 +1,89 @@
+package com.gxwebsoft.app.service.impl;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.gxwebsoft.app.mapper.AppUserMapper;
+import com.gxwebsoft.app.service.AppUserService;
+import com.gxwebsoft.app.entity.AppUser;
+import com.gxwebsoft.app.param.AppUserParam;
+import com.gxwebsoft.common.core.web.PageParam;
+import com.gxwebsoft.common.core.web.PageResult;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * 应用成员Service实现
+ *
+ * @author 科技小王子
+ * @since 2026-03-28 21:29:44
+ */
+@Slf4j
+@Service
+public class AppUserServiceImpl extends ServiceImpl<AppUserMapper, AppUser> implements AppUserService {
+
+    @Override
+    public PageResult<AppUser> pageRel(AppUserParam param) {
+        PageParam<AppUser, AppUserParam> page = new PageParam<>(param);
+        page.setDefaultOrder("sort_number asc, create_time asc");
+        List<AppUser> list = baseMapper.selectPageRel(page, param);
+        return new PageResult<>(list, page.getTotal());
+    }
+
+    @Override
+    public List<AppUser> listRel(AppUserParam param) {
+        List<AppUser> list = baseMapper.selectListRel(param);
+        PageParam<AppUser, AppUserParam> page = new PageParam<>();
+        page.setDefaultOrder("sort_number asc, create_time asc");
+        return page.sortRecords(list);
+    }
+
+    @Override
+    public AppUser getByIdRel(Integer id) {
+        AppUserParam param = new AppUserParam();
+        param.setId(id.longValue());
+        return param.getOne(baseMapper.selectListRel(param));
+    }
+
+    @Override
+    public AppUser inviteUser(Long websiteId, Integer userId, String role, Integer inviteBy) {
+        // 检查是否已经是成员
+        if (isMember(websiteId, userId)) {
+            throw new RuntimeException("该用户已经是应用成员");
+        }
+
+        AppUser appUser = new AppUser();
+        appUser.setWebsiteId(websiteId);
+        appUser.setUserId(userId);
+        appUser.setRole(role != null ? role : "developer");
+        appUser.setInviteBy(inviteBy.longValue());
+        appUser.setInviteTime(LocalDateTime.now());
+        appUser.setStatus(0);
+        appUser.setSortNumber(0);
+
+        save(appUser);
+        log.info("邀请成员成功，websiteId={}, userId={}, role={}", websiteId, userId, role);
+        return appUser;
+    }
+
+    @Override
+    public boolean updateRole(Long id, String role) {
+        return update(new LambdaUpdateWrapper<AppUser>()
+                .eq(AppUser::getId, id)
+                .set(AppUser::getRole, role));
+    }
+
+    @Override
+    public boolean isMember(Long websiteId, Integer userId) {
+        long count = count(new LambdaQueryWrapper<AppUser>()
+                .eq(AppUser::getWebsiteId, websiteId)
+                .eq(AppUser::getUserId, userId)
+                .eq(AppUser::getStatus, 0));
+        return count > 0;
+    }
+
+}

src/main/java/com/gxwebsoft/app/service/impl/AppVersionServiceImpl.java

@@ -0,0 +1,112 @@
+package com.gxwebsoft.app.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.gxwebsoft.app.mapper.AppVersionMapper;
+import com.gxwebsoft.app.service.AppVersionService;
+import com.gxwebsoft.app.entity.AppVersion;
+import com.gxwebsoft.app.param.AppVersionParam;
+import com.gxwebsoft.common.core.web.PageParam;
+import com.gxwebsoft.common.core.web.PageResult;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * 应用版本发布记录Service实现
+ *
+ * @author 科技小王子
+ * @since 2026-03-28 21:29:44
+ */
+@Slf4j
+@Service
+public class AppVersionServiceImpl extends ServiceImpl<AppVersionMapper, AppVersion> implements AppVersionService {
+
+    @Override
+    public PageResult<AppVersion> pageRel(AppVersionParam param) {
+        PageParam<AppVersion, AppVersionParam> page = new PageParam<>(param);
+        page.setDefaultOrder("create_time desc");
+        List<AppVersion> list = baseMapper.selectPageRel(page, param);
+        return new PageResult<>(list, page.getTotal());
+    }
+
+    @Override
+    public List<AppVersion> listRel(AppVersionParam param) {
+        List<AppVersion> list = baseMapper.selectListRel(param);
+        PageParam<AppVersion, AppVersionParam> page = new PageParam<>();
+        page.setDefaultOrder("create_time desc");
+        return page.sortRecords(list);
+    }
+
+    @Override
+    public AppVersion getByIdRel(Integer id) {
+        AppVersionParam param = new AppVersionParam();
+        param.setId(id.longValue());
+        return param.getOne(baseMapper.selectListRel(param));
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public boolean publish(Long id, Integer publishBy) {
+        AppVersion version = getById(id);
+        if (version == null) {
+            throw new RuntimeException("版本不存在");
+        }
+        Long websiteId = version.getWebsiteId();
+
+        // 1. 将该应用下所有版本的 isCurrent 设为 false
+        update(new LambdaUpdateWrapper<AppVersion>()
+                .eq(AppVersion::getWebsiteId, websiteId)
+                .set(AppVersion::getIsCurrent, false));
+
+        // 2. 将当前版本设为已发布+当前版本
+        version.setStatus(1);
+        version.setIsCurrent(true);
+        version.setPublishBy(publishBy.longValue());
+        version.setPublishTime(LocalDateTime.now());
+
+        boolean result = updateById(version);
+        log.info("发布版本成功，id={}, versionNo={}", id, version.getVersionNo());
+        return result;
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public boolean rollback(Long id, Integer publishBy) {
+        AppVersion targetVersion = getById(id);
+        if (targetVersion == null) {
+            throw new RuntimeException("目标版本不存在");
+        }
+        Long websiteId = targetVersion.getWebsiteId();
+
+        // 1. 将当前版本标记为已回滚
+        update(new LambdaUpdateWrapper<AppVersion>()
+                .eq(AppVersion::getWebsiteId, websiteId)
+                .eq(AppVersion::getIsCurrent, true)
+                .set(AppVersion::getStatus, 2)       // 2=已回滚
+                .set(AppVersion::getIsCurrent, false));
+
+        // 2. 将目标版本设为当前版本
+        targetVersion.setStatus(1);
+        targetVersion.setIsCurrent(true);
+        targetVersion.setPublishBy(publishBy.longValue());
+        targetVersion.setPublishTime(LocalDateTime.now());
+
+        boolean result = updateById(targetVersion);
+        log.info("回滚版本成功，id={}, versionNo={}", id, targetVersion.getVersionNo());
+        return result;
+    }
+
+    @Override
+    public AppVersion getCurrentVersion(Long websiteId) {
+        return getOne(new LambdaQueryWrapper<AppVersion>()
+                .eq(AppVersion::getWebsiteId, websiteId)
+                .eq(AppVersion::getIsCurrent, true)
+                .last("LIMIT 1"));
+    }
+
+}

src/main/java/com/gxwebsoft/cms/controller/CmsNavigationController.java

@@ -1,13 +1,17 @@
 package com.gxwebsoft.cms.controller;
 
+import cn.afterturn.easypoi.excel.ExcelImportUtil;
+import cn.afterturn.easypoi.excel.entity.ImportParams;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.gxwebsoft.cms.entity.CmsDesign;
 import com.gxwebsoft.cms.entity.CmsModel;
+import com.gxwebsoft.cms.param.CmsNavigationImportParam;
 import com.gxwebsoft.cms.service.CmsDesignService;
 import com.gxwebsoft.cms.service.CmsModelService;
+import com.gxwebsoft.common.core.annotation.OperationLog;
 import com.gxwebsoft.common.core.utils.CommonUtil;
 import com.gxwebsoft.common.core.utils.RedisUtil;
 import com.gxwebsoft.common.core.web.BaseController;
@@ -21,11 +25,18 @@ import com.gxwebsoft.common.system.entity.User;
 import com.gxwebsoft.common.system.service.UserService;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import io.swagger.v3.oas.annotations.Operation;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 网站导航记录表控制器
@@ -79,6 +90,7 @@ public class CmsNavigationController extends BaseController {
     return success(cmsNavigationService.getByIdRelByCodeRel(code));
   }
 
+  @PreAuthorize("hasAuthority('cms:cmsNavigation:save')")
   @Operation(summary = "添加网站导航记录表")
   @PostMapping()
   public ApiResult<?> save(@RequestBody CmsNavigation cmsNavigation) {
@@ -99,6 +111,7 @@ public class CmsNavigationController extends BaseController {
     return fail("添加失败");
   }
 
+  @PreAuthorize("hasAuthority('cms:cmsNavigation:update')")
   @Operation(summary = "修改网站导航记录表")
   @PutMapping()
   public ApiResult<?> update(@RequestBody CmsNavigation cmsNavigation) {
@@ -111,6 +124,7 @@ public class CmsNavigationController extends BaseController {
     return fail("修改失败");
   }
 
+  @PreAuthorize("hasAuthority('cms:cmsNavigation:remove')")
   @Operation(summary = "删除网站导航记录表")
   @DeleteMapping("/{id}")
   public ApiResult<?> remove(@PathVariable("id") Integer id) {
@@ -121,6 +135,7 @@ public class CmsNavigationController extends BaseController {
     return fail("删除失败");
   }
 
+  @PreAuthorize("hasAuthority('cms:cmsNavigation:save')")
   @Operation(summary = "批量添加网站导航记录表")
   @PostMapping("/batch")
   public ApiResult<?> saveBatch(@RequestBody List<CmsNavigation> list) {
@@ -131,6 +146,7 @@ public class CmsNavigationController extends BaseController {
     return fail("添加失败");
   }
 
+  @PreAuthorize("hasAuthority('cms:cmsNavigation:update')")
   @Operation(summary = "批量修改网站导航记录表")
   @PutMapping("/batch")
   public ApiResult<?> removeBatch(@RequestBody BatchParam<CmsNavigation> batchParam) {
@@ -141,6 +157,7 @@ public class CmsNavigationController extends BaseController {
     return fail("修改失败");
   }
 
+  @PreAuthorize("hasAuthority('cms:cmsNavigation:remove')")
   @Operation(summary = "批量删除网站导航记录表")
   @DeleteMapping("/batch")
   public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
@@ -151,6 +168,173 @@ public class CmsNavigationController extends BaseController {
     return fail("删除失败");
   }
 
+  /**
+   * excel批量导入网站导航
+   */
+  @PreAuthorize("hasAuthority('cms:cmsNavigation:save')")
+  @OperationLog
+  @Operation(summary = "批量导入网站导航")
+  @Transactional(rollbackFor = {Exception.class})
+  @PostMapping("/import")
+  public ApiResult<?> importBatch(@RequestParam("file") MultipartFile file) {
+    ImportParams importParams = new ImportParams();
+    try {
+      User loginUser = getLoginUser();
+      if (loginUser == null) {
+        return fail("请先登录");
+      }
+      Integer currentUserId = loginUser.getUserId();
+      Integer currentTenantId = loginUser.getTenantId();
+
+      // 1) 清理当前租户的历史数据：先清理 deleted=1，再把 deleted=0 标记为 deleted=1
+      List<CmsNavigation> undeleted = cmsNavigationService.list(new LambdaQueryWrapper<CmsNavigation>()
+          .eq(CmsNavigation::getTenantId, currentTenantId)
+          .eq(CmsNavigation::getDeleted, 0));
+      cmsNavigationService.remove(new LambdaQueryWrapper<CmsNavigation>()
+          .eq(CmsNavigation::getTenantId, currentTenantId)
+          .eq(CmsNavigation::getDeleted, 1));
+      if (!CollectionUtils.isEmpty(undeleted)) {
+        LambdaUpdateWrapper<CmsNavigation> updateWrapper = new LambdaUpdateWrapper<>();
+        updateWrapper.eq(CmsNavigation::getTenantId, currentTenantId);
+        updateWrapper.eq(CmsNavigation::getDeleted, 0);
+        updateWrapper.set(CmsNavigation::getDeleted, 1);
+        cmsNavigationService.update(updateWrapper);
+      }
+
+      // 2) 读取Excel
+      List<CmsNavigationImportParam> list = ExcelImportUtil.importExcel(
+          file.getInputStream(), CmsNavigationImportParam.class, importParams);
+      if (CollectionUtils.isEmpty(list)) {
+        return fail("未读取到数据，请确认模板表头与示例格式一致");
+      }
+
+      // 3) 先全部落库（先按根节点保存），再尝试按“导入文件的 parentId -> 导入文件的 navigationId”映射回填层级。
+      // 这样即使 parentId 无法匹配（导入文件缺少导航ID/父节点缺失），也能把数据全部导入，无法还原层级的作为根节点处理。
+      Map<Integer, Integer> newIdByOldId = new HashMap<>();
+      List<Integer> newIds = new ArrayList<>(list.size());
+      List<Integer> oldIds = new ArrayList<>(list.size());
+      List<Integer> oldParentIds = new ArrayList<>(list.size());
+
+      for (CmsNavigationImportParam param : list) {
+        CmsNavigation nav = convertToNavigation(param, currentUserId, currentTenantId);
+        nav.setParentId(0);
+        cmsNavigationService.save(nav);
+        cmsNavigationService.saveAsync(nav);
+
+        Integer oldId = param.getNavigationId();
+        if (oldId != null) {
+          newIdByOldId.put(oldId, nav.getNavigationId());
+        }
+        newIds.add(nav.getNavigationId());
+        oldIds.add(oldId);
+        oldParentIds.add(param.getParentId() != null ? param.getParentId() : 0);
+      }
+
+      int orphanCount = 0;
+      int restoredCount = 0;
+      for (int i = 0; i < newIds.size(); i++) {
+        Integer oldParentId = oldParentIds.get(i);
+        if (oldParentId == null || oldParentId == 0) {
+          continue;
+        }
+        Integer oldId = oldIds.get(i);
+        Integer newId = newIds.get(i);
+        Integer newParentId = newIdByOldId.get(oldParentId);
+        // 无法匹配父节点（或出现自引用）就当作孤儿节点，保持根节点
+        if (newParentId == null || (oldId != null && oldParentId.equals(oldId)) || (newId != null && newParentId.equals(newId))) {
+          orphanCount++;
+          continue;
+        }
+        cmsNavigationService.update(new LambdaUpdateWrapper<CmsNavigation>()
+          .eq(CmsNavigation::getNavigationId, newId)
+          .set(CmsNavigation::getParentId, newParentId));
+        restoredCount++;
+      }
+
+      redisUtil.delete(SITE_INFO_KEY_PREFIX.concat(currentTenantId.toString()));
+      return success("成功导入" + list.size() + "条，恢复层级" + restoredCount + "条，无法还原层级的孤儿节点" + orphanCount + "条（已作为根节点导入）");
+    } catch (Exception e) {
+      e.printStackTrace();
+      return fail("导入失败: " + e.getMessage());
+    }
+  }
+
+  /**
+   * 递归创建子级导航
+   */
+  private void createChildNavigations(Map<Integer, List<CmsNavigationImportParam>> navGroups,
+                                      Map<Integer, CmsNavigation> tempIdMapping,
+                                      Integer originalParentId,
+                                      Integer defaultUserId,
+                                      Integer defaultTenantId) {
+    if (originalParentId == null || originalParentId == 0) {
+      return;
+    }
+    List<CmsNavigationImportParam> children = navGroups.get(originalParentId);
+    if (CollectionUtils.isEmpty(children)) {
+      return;
+    }
+    CmsNavigation parent = tempIdMapping.get(originalParentId);
+    if (parent == null || parent.getNavigationId() == null) {
+      return;
+    }
+    Integer newParentId = parent.getNavigationId();
+    for (CmsNavigationImportParam param : children) {
+      CmsNavigation nav = convertToNavigation(param, defaultUserId, defaultTenantId);
+      nav.setParentId(newParentId);
+      cmsNavigationService.save(nav);
+      cmsNavigationService.saveAsync(nav);
+      if (param.getNavigationId() != null) {
+        tempIdMapping.put(param.getNavigationId(), nav);
+      }
+      createChildNavigations(navGroups, tempIdMapping, param.getNavigationId(), defaultUserId, defaultTenantId);
+    }
+  }
+
+  private CmsNavigation convertToNavigation(CmsNavigationImportParam param, Integer defaultUserId, Integer defaultTenantId) {
+    CmsNavigation nav = new CmsNavigation();
+    nav.setType(param.getType());
+    nav.setTitle(StrUtil.trimStart(param.getTitle()));
+    nav.setParentId(param.getParentId() != null ? param.getParentId() : 0);
+    // saveAsync 依赖 model 生成路由/页面；缺省按 page 处理
+    nav.setModel(StrUtil.isBlank(param.getModel()) ? "page" : param.getModel());
+    nav.setCode(param.getCode());
+    nav.setPath(param.getPath());
+    nav.setComponent(param.getComponent());
+    nav.setTarget(param.getTarget());
+    nav.setIcon(param.getIcon());
+    nav.setColor(param.getColor());
+    nav.setHide(param.getHide());
+    nav.setPermission(param.getPermission());
+    nav.setPassword(param.getPassword());
+    nav.setPosition(param.getPosition());
+    nav.setTop(param.getTop());
+    nav.setBottom(param.getBottom());
+    nav.setActive(param.getActive());
+    nav.setMeta(param.getMeta());
+    nav.setStyle(param.getStyle());
+    nav.setModelName(param.getModelName());
+    nav.setPageId(param.getPageId());
+    nav.setItemId(param.getItemId());
+    nav.setIsMpWeixin(param.getIsMpWeixin());
+    nav.setGutter(param.getGutter());
+    nav.setSpan(param.getSpan());
+    nav.setReadNum(param.getReadNum());
+    nav.setMerchantId(param.getMerchantId());
+    nav.setLang(param.getLang());
+    nav.setHome(param.getHome());
+    nav.setRecommend(param.getRecommend());
+    nav.setSortNumber(param.getSortNumber() != null ? param.getSortNumber() : 0);
+    nav.setComments(param.getComments());
+    nav.setStatus(param.getStatus() != null ? param.getStatus() : 0);
+
+    // 导入时强制落到当前登录用户/租户，避免“导出其他租户 -> 导入”写回原租户导致当前租户数据不全。
+    nav.setUserId(defaultUserId);
+    nav.setTenantId(defaultTenantId);
+    nav.setDeleted(0);
+    return nav;
+  }
+
   @Operation(summary = "获取树形结构的网站导航数据")
   @GetMapping("/tree")
   public ApiResult<List<CmsNavigation>> tree(CmsNavigationParam param) {

src/main/java/com/gxwebsoft/cms/controller/CmsOrderController.java

@@ -0,0 +1,122 @@
+package com.gxwebsoft.cms.controller;
+
+import com.gxwebsoft.common.core.web.BaseController;
+import com.gxwebsoft.cms.service.CmsOrderService;
+import com.gxwebsoft.cms.entity.CmsOrder;
+import com.gxwebsoft.cms.param.CmsOrderParam;
+import com.gxwebsoft.common.core.web.ApiResult;
+import com.gxwebsoft.common.core.web.PageResult;
+import com.gxwebsoft.common.core.web.PageParam;
+import com.gxwebsoft.common.core.web.BatchParam;
+import com.gxwebsoft.common.core.annotation.OperationLog;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 网站订单控制器
+ *
+ * @author 科技小王子
+ * @since 2026-01-27 13:03:25
+ */
+@Tag(name = "网站订单管理")
+@RestController
+@RequestMapping("/api/cms/cms-order")
+public class CmsOrderController extends BaseController {
+    @Resource
+    private CmsOrderService cmsOrderService;
+
+    @PreAuthorize("hasAuthority('cms:cmsOrder:list')")
+    @Operation(summary = "分页查询网站订单")
+    @GetMapping("/page")
+    public ApiResult<PageResult<CmsOrder>> page(CmsOrderParam param) {
+        // 使用关联查询
+        return success(cmsOrderService.pageRel(param));
+    }
+
+    @PreAuthorize("hasAuthority('cms:cmsOrder:list')")
+    @Operation(summary = "查询全部网站订单")
+    @GetMapping()
+    public ApiResult<List<CmsOrder>> list(CmsOrderParam param) {
+        // 使用关联查询
+        return success(cmsOrderService.listRel(param));
+    }
+
+    @PreAuthorize("hasAuthority('cms:cmsOrder:list')")
+    @Operation(summary = "根据id查询网站订单")
+    @GetMapping("/{id}")
+    public ApiResult<CmsOrder> get(@PathVariable("id") Integer id) {
+        // 使用关联查询
+        return success(cmsOrderService.getByIdRel(id));
+    }
+
+    @Operation(summary = "添加网站订单")
+    @PostMapping()
+    public ApiResult<?> save(@RequestBody CmsOrder cmsOrder) {
+
+        if (cmsOrderService.save(cmsOrder)) {
+            return success("添加成功");
+        }
+        return fail("添加失败");
+    }
+
+    @PreAuthorize("hasAuthority('cms:cmsOrder:update')")
+    @OperationLog
+    @Operation(summary = "修改网站订单")
+    @PutMapping()
+    public ApiResult<?> update(@RequestBody CmsOrder cmsOrder) {
+        if (cmsOrderService.updateById(cmsOrder)) {
+            return success("修改成功");
+        }
+        return fail("修改失败");
+    }
+
+    @PreAuthorize("hasAuthority('cms:cmsOrder:remove')")
+    @OperationLog
+    @Operation(summary = "删除网站订单")
+    @DeleteMapping("/{id}")
+    public ApiResult<?> remove(@PathVariable("id") Integer id) {
+        if (cmsOrderService.removeById(id)) {
+            return success("删除成功");
+        }
+        return fail("删除失败");
+    }
+
+    @PreAuthorize("hasAuthority('cms:cmsOrder:save')")
+    @OperationLog
+    @Operation(summary = "批量添加网站订单")
+    @PostMapping("/batch")
+    public ApiResult<?> saveBatch(@RequestBody List<CmsOrder> list) {
+        if (cmsOrderService.saveBatch(list)) {
+            return success("添加成功");
+        }
+        return fail("添加失败");
+    }
+
+    @PreAuthorize("hasAuthority('cms:cmsOrder:update')")
+    @OperationLog
+    @Operation(summary = "批量修改网站订单")
+    @PutMapping("/batch")
+    public ApiResult<?> removeBatch(@RequestBody BatchParam<CmsOrder> batchParam) {
+        if (batchParam.update(cmsOrderService, "id")) {
+            return success("修改成功");
+        }
+        return fail("修改失败");
+    }
+
+    @PreAuthorize("hasAuthority('cms:cmsOrder:remove')")
+    @OperationLog
+    @Operation(summary = "批量删除网站订单")
+    @DeleteMapping("/batch")
+    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
+        if (cmsOrderService.removeByIds(ids)) {
+            return success("删除成功");
+        }
+        return fail("删除失败");
+    }
+
+}

src/main/java/com/gxwebsoft/cms/entity/CmsNavigation.java

@@ -43,6 +43,10 @@ public class CmsNavigation implements Serializable {
     @Schema(description = "模型")
     private String model;
 
+    @Schema(description = "模型名称")
+    @TableField(exist = false)
+    private String modelName;
+
     @Schema(description = "标识")
     private String code;
 
@@ -114,9 +118,6 @@ public class CmsNavigation implements Serializable {
     @TableField(exist = false)
     private Integer parentPosition;
 
-    @Schema(description = "模型名称")
-    private String modelName;
-
     @Schema(description = "绑定的页面（已废弃）")
     private Integer pageId;
 

src/main/java/com/gxwebsoft/cms/entity/CmsOrder.java

@@ -0,0 +1,266 @@
+package com.gxwebsoft.cms.entity;
+
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import java.io.Serializable;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+/**
+ * 网站订单
+ *
+ * @author 科技小王子
+ * @since 2026-01-27 13:03:24
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Schema(name = "CmsOrder对象", description = "网站订单")
+public class CmsOrder implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @Schema(description = "id")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    @Schema(description = "订单类型，0售前咨询 1售后服务 2意见反馈")
+    private Integer type;
+
+    @Schema(description = "订单标题")
+    private String title;
+
+    @Schema(description = "公司/团队名称")
+    private String company;
+
+    @Schema(description = "订单内容")
+    private String content;
+
+    @Schema(description = "订单编号")
+    private String orderNo;
+
+    @Schema(description = "快递/自提")
+    private Integer deliveryType;
+
+    @Schema(description = "下单渠道，0网站 1微信小程序 2其他")
+    private Integer channel;
+
+    @Schema(description = "微信支付交易号号")
+    private String transactionId;
+
+    @Schema(description = "微信退款订单号")
+    private String refundOrder;
+
+    @Schema(description = "商户ID")
+    private Integer merchantId;
+
+    @Schema(description = "商户名称")
+    private String merchantName;
+
+    @Schema(description = "商户编号")
+    private String merchantCode;
+
+    @Schema(description = "使用的优惠券id")
+    private Integer couponId;
+
+    @Schema(description = "使用的会员卡id")
+    private String cardId;
+
+    @Schema(description = "关联管理员id")
+    private Integer adminId;
+
+    @Schema(description = "核销管理员id")
+    private Integer confirmId;
+
+    @Schema(description = "IC卡号")
+    private String icCard;
+
+    @Schema(description = "真实姓名")
+    private String realName;
+
+    @Schema(description = "关联收货地址")
+    private Integer addressId;
+
+    @Schema(description = "收货地址")
+    private String address;
+
+    private String addressLat;
+
+    private String addressLng;
+
+    @Schema(description = "自提店铺id")
+    private Integer selfTakeMerchantId;
+
+    @Schema(description = "自提店铺")
+    private String selfTakeMerchantName;
+
+    @Schema(description = "配送开始时间")
+    private String sendStartTime;
+
+    @Schema(description = "配送结束时间")
+    private String sendEndTime;
+
+    @Schema(description = "发货店铺id")
+    private Integer expressMerchantId;
+
+    @Schema(description = "发货店铺")
+    private String expressMerchantName;
+
+    @Schema(description = "订单总额")
+    private BigDecimal totalPrice;
+
+    @Schema(description = "减少的金额，使用VIP会员折扣、优惠券抵扣、优惠券折扣后减去的价格")
+    private BigDecimal reducePrice;
+
+    @Schema(description = "实际付款")
+    private BigDecimal payPrice;
+
+    @Schema(description = "用于统计")
+    private BigDecimal price;
+
+    @Schema(description = "价钱，用于积分赠送")
+    private BigDecimal money;
+
+    @Schema(description = "取消时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime cancelTime;
+
+    @Schema(description = "取消原因")
+    private String cancelReason;
+
+    @Schema(description = "退款金额")
+    private BigDecimal refundMoney;
+
+    @Schema(description = "教练价格")
+    private BigDecimal coachPrice;
+
+    @Schema(description = "购买数量")
+    private Integer totalNum;
+
+    @Schema(description = "教练id")
+    private Integer coachId;
+
+    @Schema(description = "商品ID")
+    private Integer formId;
+
+    @Schema(description = "支付的用户id")
+    private Integer payUserId;
+
+    @Schema(description = "0余额支付，1微信支付，2支付宝支付，3银联支付，4现金支付，5POS机支付，6免费，7积分支付")
+    private Integer payType;
+
+    @Schema(description = "微信支付子类型：JSAPI小程序支付，NATIVE扫码支付")
+    private String wechatPayType;
+
+    @Schema(description = "0余额支付，1微信支付，2支付宝支付，3银联支付，4现金支付，5POS机支付，6免费，7积分支付")
+    private Integer friendPayType;
+
+    @Schema(description = "0未付款，1已付款")
+    private Integer payStatus;
+
+    @Schema(description = "0未使用，1已完成，2已取消，3取消中，4退款申请中，5退款被拒绝，6退款成功，7客户端申请退款")
+    private Integer orderStatus;
+
+    @Schema(description = "发货状态(10未发货 20已发货 30部分发货)")
+    private Integer deliveryStatus;
+
+    @Schema(description = "无需发货备注")
+    private String deliveryNote;
+
+    @Schema(description = "发货时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime deliveryTime;
+
+    @Schema(description = "评价状态(0未评价 1已评价)")
+    private Integer evaluateStatus;
+
+    @Schema(description = "评价时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime evaluateTime;
+
+    @Schema(description = "优惠类型：0无、1抵扣优惠券、2折扣优惠券、3、VIP月卡、4VIP年卡，5VIP次卡、6VIP会员卡、7IC月卡、8IC年卡、9IC次卡、10IC会员卡、11免费订单、12VIP充值卡、13IC充值卡、14VIP季卡、15IC季卡")
+    private Integer couponType;
+
+    @Schema(description = "优惠说明")
+    private String couponDesc;
+
+    @Schema(description = "二维码地址，保存订单号，支付成功后才生成")
+    private String qrcode;
+
+    @Schema(description = "vip月卡年卡、ic月卡年卡回退次数")
+    private Integer returnNum;
+
+    @Schema(description = "vip充值回退金额")
+    private BigDecimal returnMoney;
+
+    @Schema(description = "预约详情开始时间数组")
+    private String startTime;
+
+    @Schema(description = "是否已开具发票：0未开发票，1已开发票，2不能开具发票")
+    private Integer isInvoice;
+
+    @Schema(description = "发票流水号")
+    private String invoiceNo;
+
+    @Schema(description = "商家留言")
+    private String merchantRemarks;
+
+    @Schema(description = "支付时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime payTime;
+
+    @Schema(description = "退款时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime refundTime;
+
+    @Schema(description = "申请退款时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime refundApplyTime;
+
+    @Schema(description = "过期时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime expirationTime;
+
+    @Schema(description = "自提码")
+    private String selfTakeCode;
+
+    @Schema(description = "是否已收到赠品")
+    private Boolean hasTakeGift;
+
+    @Schema(description = "对账情况：0=未对账；1=已对账；3=已对账，金额对不上；4=未查询到该订单")
+    private Integer checkBill;
+
+    @Schema(description = "订单是否已结算(0未结算 1已结算)")
+    private Integer isSettled;
+
+    @Schema(description = "系统版本号 0当前版本 value=其他版本")
+    private Integer version;
+
+    @Schema(description = "用户id")
+    private Integer userId;
+
+    @Schema(description = "备注")
+    private String comments;
+
+    @Schema(description = "排序号")
+    private Integer sortNumber;
+
+    @Schema(description = "是否删除, 0否, 1是")
+    @TableLogic
+    private Integer deleted;
+
+    @Schema(description = "租户id")
+    private Integer tenantId;
+
+    @Schema(description = "修改时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime updateTime;
+
+    @Schema(description = "创建时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime createTime;
+
+}

src/main/java/com/gxwebsoft/cms/mapper/CmsOrderMapper.java

@@ -0,0 +1,37 @@
+package com.gxwebsoft.cms.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.gxwebsoft.cms.entity.CmsOrder;
+import com.gxwebsoft.cms.param.CmsOrderParam;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 网站订单Mapper
+ *
+ * @author 科技小王子
+ * @since 2026-01-27 13:03:24
+ */
+public interface CmsOrderMapper extends BaseMapper<CmsOrder> {
+
+    /**
+     * 分页查询
+     *
+     * @param page  分页对象
+     * @param param 查询参数
+     * @return List<CmsOrder>
+     */
+    List<CmsOrder> selectPageRel(@Param("page") IPage<CmsOrder> page,
+                             @Param("param") CmsOrderParam param);
+
+    /**
+     * 查询全部
+     *
+     * @param param 查询参数
+     * @return List<User>
+     */
+    List<CmsOrder> selectListRel(@Param("param") CmsOrderParam param);
+
+}

src/main/java/com/gxwebsoft/cms/mapper/xml/CmsNavigationMapper.xml

@@ -4,9 +4,11 @@
 
     <!-- 关联查询sql -->
     <sql id="selectSql">
-        SELECT a.*, b.title as parentName, b.position as parentPosition
+        SELECT a.*, b.title as parentName, b.position as parentPosition, c.name as modelName
         FROM cms_navigation a
-        LEFT JOIN cms_navigation b ON a.parent_id = b.navigation_id
+        LEFT JOIN cms_navigation b ON a.parent_id = b.navigation_id AND b.deleted = 0 AND b.tenant_id = a.tenant_id
+        <!-- c.model = 0 会触发 MySQL 字符串转数字比较，导致几乎所有模型都匹配，从而把导航行成倍放大 -->
+        LEFT JOIN cms_model c ON a.model = c.model AND c.deleted = 0 AND c.tenant_id = a.tenant_id
         <where>
             <if test="param.navigationId != null">
                 AND a.navigation_id = #{param.navigationId}

src/main/java/com/gxwebsoft/cms/mapper/xml/CmsOrderMapper.xml

@@ -0,0 +1,258 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.gxwebsoft.cms.mapper.CmsOrderMapper">
+
+    <!-- 关联查询sql -->
+    <sql id="selectSql">
+        SELECT a.*
+        FROM cms_order a
+        <where>
+            <if test="param.id != null">
+                AND a.id = #{param.id}
+            </if>
+            <if test="param.type != null">
+                AND a.type = #{param.type}
+            </if>
+            <if test="param.title != null">
+                AND a.title LIKE CONCAT('%', #{param.title}, '%')
+            </if>
+            <if test="param.company != null">
+                AND a.company LIKE CONCAT('%', #{param.company}, '%')
+            </if>
+            <if test="param.content != null">
+                AND a.content LIKE CONCAT('%', #{param.content}, '%')
+            </if>
+            <if test="param.orderNo != null">
+                AND a.order_no LIKE CONCAT('%', #{param.orderNo}, '%')
+            </if>
+            <if test="param.deliveryType != null">
+                AND a.delivery_type = #{param.deliveryType}
+            </if>
+            <if test="param.channel != null">
+                AND a.channel = #{param.channel}
+            </if>
+            <if test="param.transactionId != null">
+                AND a.transaction_id LIKE CONCAT('%', #{param.transactionId}, '%')
+            </if>
+            <if test="param.refundOrder != null">
+                AND a.refund_order LIKE CONCAT('%', #{param.refundOrder}, '%')
+            </if>
+            <if test="param.merchantId != null">
+                AND a.merchant_id = #{param.merchantId}
+            </if>
+            <if test="param.merchantName != null">
+                AND a.merchant_name LIKE CONCAT('%', #{param.merchantName}, '%')
+            </if>
+            <if test="param.merchantCode != null">
+                AND a.merchant_code LIKE CONCAT('%', #{param.merchantCode}, '%')
+            </if>
+            <if test="param.couponId != null">
+                AND a.coupon_id = #{param.couponId}
+            </if>
+            <if test="param.cardId != null">
+                AND a.card_id LIKE CONCAT('%', #{param.cardId}, '%')
+            </if>
+            <if test="param.adminId != null">
+                AND a.admin_id = #{param.adminId}
+            </if>
+            <if test="param.confirmId != null">
+                AND a.confirm_id = #{param.confirmId}
+            </if>
+            <if test="param.icCard != null">
+                AND a.ic_card LIKE CONCAT('%', #{param.icCard}, '%')
+            </if>
+            <if test="param.realName != null">
+                AND a.real_name LIKE CONCAT('%', #{param.realName}, '%')
+            </if>
+            <if test="param.addressId != null">
+                AND a.address_id = #{param.addressId}
+            </if>
+            <if test="param.address != null">
+                AND a.address LIKE CONCAT('%', #{param.address}, '%')
+            </if>
+            <if test="param.addressLat != null">
+                AND a.address_lat LIKE CONCAT('%', #{param.addressLat}, '%')
+            </if>
+            <if test="param.addressLng != null">
+                AND a.address_lng LIKE CONCAT('%', #{param.addressLng}, '%')
+            </if>
+            <if test="param.selfTakeMerchantId != null">
+                AND a.self_take_merchant_id = #{param.selfTakeMerchantId}
+            </if>
+            <if test="param.selfTakeMerchantName != null">
+                AND a.self_take_merchant_name LIKE CONCAT('%', #{param.selfTakeMerchantName}, '%')
+            </if>
+            <if test="param.sendStartTime != null">
+                AND a.send_start_time LIKE CONCAT('%', #{param.sendStartTime}, '%')
+            </if>
+            <if test="param.sendEndTime != null">
+                AND a.send_end_time LIKE CONCAT('%', #{param.sendEndTime}, '%')
+            </if>
+            <if test="param.expressMerchantId != null">
+                AND a.express_merchant_id = #{param.expressMerchantId}
+            </if>
+            <if test="param.expressMerchantName != null">
+                AND a.express_merchant_name LIKE CONCAT('%', #{param.expressMerchantName}, '%')
+            </if>
+            <if test="param.totalPrice != null">
+                AND a.total_price = #{param.totalPrice}
+            </if>
+            <if test="param.reducePrice != null">
+                AND a.reduce_price = #{param.reducePrice}
+            </if>
+            <if test="param.payPrice != null">
+                AND a.pay_price = #{param.payPrice}
+            </if>
+            <if test="param.price != null">
+                AND a.price = #{param.price}
+            </if>
+            <if test="param.money != null">
+                AND a.money = #{param.money}
+            </if>
+            <if test="param.cancelTime != null">
+                AND a.cancel_time LIKE CONCAT('%', #{param.cancelTime}, '%')
+            </if>
+            <if test="param.cancelReason != null">
+                AND a.cancel_reason LIKE CONCAT('%', #{param.cancelReason}, '%')
+            </if>
+            <if test="param.refundMoney != null">
+                AND a.refund_money = #{param.refundMoney}
+            </if>
+            <if test="param.coachPrice != null">
+                AND a.coach_price = #{param.coachPrice}
+            </if>
+            <if test="param.totalNum != null">
+                AND a.total_num = #{param.totalNum}
+            </if>
+            <if test="param.coachId != null">
+                AND a.coach_id = #{param.coachId}
+            </if>
+            <if test="param.formId != null">
+                AND a.form_id = #{param.formId}
+            </if>
+            <if test="param.payUserId != null">
+                AND a.pay_user_id = #{param.payUserId}
+            </if>
+            <if test="param.payType != null">
+                AND a.pay_type = #{param.payType}
+            </if>
+            <if test="param.wechatPayType != null">
+                AND a.wechat_pay_type LIKE CONCAT('%', #{param.wechatPayType}, '%')
+            </if>
+            <if test="param.friendPayType != null">
+                AND a.friend_pay_type = #{param.friendPayType}
+            </if>
+            <if test="param.payStatus != null">
+                AND a.pay_status = #{param.payStatus}
+            </if>
+            <if test="param.orderStatus != null">
+                AND a.order_status = #{param.orderStatus}
+            </if>
+            <if test="param.deliveryStatus != null">
+                AND a.delivery_status = #{param.deliveryStatus}
+            </if>
+            <if test="param.deliveryNote != null">
+                AND a.delivery_note LIKE CONCAT('%', #{param.deliveryNote}, '%')
+            </if>
+            <if test="param.deliveryTime != null">
+                AND a.delivery_time LIKE CONCAT('%', #{param.deliveryTime}, '%')
+            </if>
+            <if test="param.evaluateStatus != null">
+                AND a.evaluate_status = #{param.evaluateStatus}
+            </if>
+            <if test="param.evaluateTime != null">
+                AND a.evaluate_time LIKE CONCAT('%', #{param.evaluateTime}, '%')
+            </if>
+            <if test="param.couponType != null">
+                AND a.coupon_type = #{param.couponType}
+            </if>
+            <if test="param.couponDesc != null">
+                AND a.coupon_desc LIKE CONCAT('%', #{param.couponDesc}, '%')
+            </if>
+            <if test="param.qrcode != null">
+                AND a.qrcode LIKE CONCAT('%', #{param.qrcode}, '%')
+            </if>
+            <if test="param.returnNum != null">
+                AND a.return_num = #{param.returnNum}
+            </if>
+            <if test="param.returnMoney != null">
+                AND a.return_money = #{param.returnMoney}
+            </if>
+            <if test="param.startTime != null">
+                AND a.start_time LIKE CONCAT('%', #{param.startTime}, '%')
+            </if>
+            <if test="param.isInvoice != null">
+                AND a.is_invoice = #{param.isInvoice}
+            </if>
+            <if test="param.invoiceNo != null">
+                AND a.invoice_no LIKE CONCAT('%', #{param.invoiceNo}, '%')
+            </if>
+            <if test="param.merchantRemarks != null">
+                AND a.merchant_remarks LIKE CONCAT('%', #{param.merchantRemarks}, '%')
+            </if>
+            <if test="param.payTime != null">
+                AND a.pay_time LIKE CONCAT('%', #{param.payTime}, '%')
+            </if>
+            <if test="param.refundTime != null">
+                AND a.refund_time LIKE CONCAT('%', #{param.refundTime}, '%')
+            </if>
+            <if test="param.refundApplyTime != null">
+                AND a.refund_apply_time LIKE CONCAT('%', #{param.refundApplyTime}, '%')
+            </if>
+            <if test="param.expirationTime != null">
+                AND a.expiration_time LIKE CONCAT('%', #{param.expirationTime}, '%')
+            </if>
+            <if test="param.selfTakeCode != null">
+                AND a.self_take_code LIKE CONCAT('%', #{param.selfTakeCode}, '%')
+            </if>
+            <if test="param.hasTakeGift != null">
+                AND a.has_take_gift = #{param.hasTakeGift}
+            </if>
+            <if test="param.checkBill != null">
+                AND a.check_bill = #{param.checkBill}
+            </if>
+            <if test="param.isSettled != null">
+                AND a.is_settled = #{param.isSettled}
+            </if>
+            <if test="param.version != null">
+                AND a.version = #{param.version}
+            </if>
+            <if test="param.userId != null">
+                AND a.user_id = #{param.userId}
+            </if>
+            <if test="param.comments != null">
+                AND a.comments LIKE CONCAT('%', #{param.comments}, '%')
+            </if>
+            <if test="param.sortNumber != null">
+                AND a.sort_number = #{param.sortNumber}
+            </if>
+            <if test="param.deleted != null">
+                AND a.deleted = #{param.deleted}
+            </if>
+            <if test="param.deleted == null">
+                AND a.deleted = 0
+            </if>
+            <if test="param.createTimeStart != null">
+                AND a.create_time &gt;= #{param.createTimeStart}
+            </if>
+            <if test="param.createTimeEnd != null">
+                AND a.create_time &lt;= #{param.createTimeEnd}
+            </if>
+            <if test="param.keywords != null">
+                AND (a.comments LIKE CONCAT('%', #{param.keywords}, '%')
+                )
+              </if>
+        </where>
+    </sql>
+
+    <!-- 分页查询 -->
+    <select id="selectPageRel" resultType="com.gxwebsoft.cms.entity.CmsOrder">
+        <include refid="selectSql"></include>
+    </select>
+
+    <!-- 查询全部 -->
+    <select id="selectListRel" resultType="com.gxwebsoft.cms.entity.CmsOrder">
+        <include refid="selectSql"></include>
+    </select>
+
+</mapper>

src/main/java/com/gxwebsoft/cms/param/CmsNavigationImportParam.java

@@ -0,0 +1,123 @@
+package com.gxwebsoft.cms.param;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 网站导航导入参数（Excel 批量导入）
+ */
+@Data
+public class CmsNavigationImportParam implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @Excel(name = "导航ID")
+    private Integer navigationId;
+
+    @Excel(name = "类型")
+    private Integer type;
+
+    @Excel(name = "菜单名称")
+    private String title;
+
+    @Excel(name = "上级id")
+    private Integer parentId;
+
+    @Excel(name = "模型")
+    private String model;
+
+    @Excel(name = "标识")
+    private String code;
+
+    @Excel(name = "菜单路由地址")
+    private String path;
+
+    @Excel(name = "菜单组件地址")
+    private String component;
+
+    @Excel(name = "打开位置")
+    private String target;
+
+    @Excel(name = "菜单图标")
+    private String icon;
+
+    @Excel(name = "图标颜色")
+    private String color;
+
+    @Excel(name = "是否隐藏")
+    private Integer hide;
+
+    @Excel(name = "可见类型")
+    private Integer permission;
+
+    @Excel(name = "访问密码")
+    private String password;
+
+    @Excel(name = "位置")
+    private Integer position;
+
+    @Excel(name = "仅在顶部显示")
+    private Integer top;
+
+    @Excel(name = "仅在底部显示")
+    private Integer bottom;
+
+    @Excel(name = "选中path")
+    private String active;
+
+    @Excel(name = "其它路由元信息")
+    private String meta;
+
+    @Excel(name = "css样式")
+    private String style;
+
+    @Excel(name = "模型名称")
+    private String modelName;
+
+    @Excel(name = "页面ID")
+    private Integer pageId;
+
+    @Excel(name = "详情页ID")
+    private Integer itemId;
+
+    @Excel(name = "是否微信小程序菜单")
+    private Boolean isMpWeixin;
+
+    @Excel(name = "菜单间距")
+    private Integer gutter;
+
+    @Excel(name = "菜单宽度")
+    private Integer span;
+
+    @Excel(name = "阅读量")
+    private Integer readNum;
+
+    @Excel(name = "商户ID")
+    private Long merchantId;
+
+    @Excel(name = "国际化语言")
+    private String lang;
+
+    @Excel(name = "设为首页")
+    private Integer home;
+
+    @Excel(name = "是否推荐")
+    private Boolean recommend;
+
+    @Excel(name = "排序")
+    private Integer sortNumber;
+
+    @Excel(name = "备注")
+    private String comments;
+
+    @Excel(name = "状态")
+    private Integer status;
+
+    @Excel(name = "用户ID")
+    private Integer userId;
+
+    @Excel(name = "租户ID")
+    private Integer tenantId;
+}
+

src/main/java/com/gxwebsoft/cms/param/CmsOrderParam.java

@@ -0,0 +1,284 @@
+package com.gxwebsoft.cms.param;
+
+import java.math.BigDecimal;
+import com.gxwebsoft.common.core.annotation.QueryField;
+import com.gxwebsoft.common.core.annotation.QueryType;
+import com.gxwebsoft.common.core.web.BaseParam;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 网站订单查询参数
+ *
+ * @author 科技小王子
+ * @since 2026-01-27 13:03:24
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@Schema(name = "CmsOrderParam对象", description = "网站订单查询参数")
+public class CmsOrderParam extends BaseParam {
+    private static final long serialVersionUID = 1L;
+
+    @Schema(description = "id")
+    @QueryField(type = QueryType.EQ)
+    private Integer id;
+
+    @Schema(description = "订单类型，0售前咨询 1售后服务 2意见反馈")
+    @QueryField(type = QueryType.EQ)
+    private Integer type;
+
+    @Schema(description = "订单标题")
+    private String title;
+
+    @Schema(description = "公司/团队名称")
+    private String company;
+
+    @Schema(description = "订单内容")
+    private String content;
+
+    @Schema(description = "订单编号")
+    private String orderNo;
+
+    @Schema(description = "快递/自提")
+    @QueryField(type = QueryType.EQ)
+    private Integer deliveryType;
+
+    @Schema(description = "下单渠道，0网站 1微信小程序 2其他")
+    @QueryField(type = QueryType.EQ)
+    private Integer channel;
+
+    @Schema(description = "微信支付交易号号")
+    private String transactionId;
+
+    @Schema(description = "微信退款订单号")
+    private String refundOrder;
+
+    @Schema(description = "商户ID")
+    @QueryField(type = QueryType.EQ)
+    private Long merchantId;
+
+    @Schema(description = "商户名称")
+    private String merchantName;
+
+    @Schema(description = "商户编号")
+    private String merchantCode;
+
+    @Schema(description = "使用的优惠券id")
+    @QueryField(type = QueryType.EQ)
+    private Integer couponId;
+
+    @Schema(description = "使用的会员卡id")
+    private String cardId;
+
+    @Schema(description = "关联管理员id")
+    @QueryField(type = QueryType.EQ)
+    private Integer adminId;
+
+    @Schema(description = "核销管理员id")
+    @QueryField(type = QueryType.EQ)
+    private Integer confirmId;
+
+    @Schema(description = "IC卡号")
+    private String icCard;
+
+    @Schema(description = "真实姓名")
+    private String realName;
+
+    @Schema(description = "关联收货地址")
+    @QueryField(type = QueryType.EQ)
+    private Integer addressId;
+
+    @Schema(description = "收货地址")
+    private String address;
+
+    private String addressLat;
+
+    private String addressLng;
+
+    @Schema(description = "自提店铺id")
+    @QueryField(type = QueryType.EQ)
+    private Integer selfTakeMerchantId;
+
+    @Schema(description = "自提店铺")
+    private String selfTakeMerchantName;
+
+    @Schema(description = "配送开始时间")
+    private String sendStartTime;
+
+    @Schema(description = "配送结束时间")
+    private String sendEndTime;
+
+    @Schema(description = "发货店铺id")
+    @QueryField(type = QueryType.EQ)
+    private Integer expressMerchantId;
+
+    @Schema(description = "发货店铺")
+    private String expressMerchantName;
+
+    @Schema(description = "订单总额")
+    @QueryField(type = QueryType.EQ)
+    private BigDecimal totalPrice;
+
+    @Schema(description = "减少的金额，使用VIP会员折扣、优惠券抵扣、优惠券折扣后减去的价格")
+    @QueryField(type = QueryType.EQ)
+    private BigDecimal reducePrice;
+
+    @Schema(description = "实际付款")
+    @QueryField(type = QueryType.EQ)
+    private BigDecimal payPrice;
+
+    @Schema(description = "用于统计")
+    @QueryField(type = QueryType.EQ)
+    private BigDecimal price;
+
+    @Schema(description = "价钱，用于积分赠送")
+    @QueryField(type = QueryType.EQ)
+    private BigDecimal money;
+
+    @Schema(description = "取消时间")
+    private String cancelTime;
+
+    @Schema(description = "取消原因")
+    private String cancelReason;
+
+    @Schema(description = "退款金额")
+    @QueryField(type = QueryType.EQ)
+    private BigDecimal refundMoney;
+
+    @Schema(description = "教练价格")
+    @QueryField(type = QueryType.EQ)
+    private BigDecimal coachPrice;
+
+    @Schema(description = "购买数量")
+    @QueryField(type = QueryType.EQ)
+    private Integer totalNum;
+
+    @Schema(description = "教练id")
+    @QueryField(type = QueryType.EQ)
+    private Integer coachId;
+
+    @Schema(description = "商品ID")
+    @QueryField(type = QueryType.EQ)
+    private Integer formId;
+
+    @Schema(description = "支付的用户id")
+    @QueryField(type = QueryType.EQ)
+    private Integer payUserId;
+
+    @Schema(description = "0余额支付，1微信支付，2支付宝支付，3银联支付，4现金支付，5POS机支付，6免费，7积分支付")
+    @QueryField(type = QueryType.EQ)
+    private Integer payType;
+
+    @Schema(description = "微信支付子类型：JSAPI小程序支付，NATIVE扫码支付")
+    private String wechatPayType;
+
+    @Schema(description = "0余额支付，1微信支付，2支付宝支付，3银联支付，4现金支付，5POS机支付，6免费，7积分支付")
+    @QueryField(type = QueryType.EQ)
+    private Integer friendPayType;
+
+    @Schema(description = "0未付款，1已付款")
+    @QueryField(type = QueryType.EQ)
+    private Integer payStatus;
+
+    @Schema(description = "0未使用，1已完成，2已取消，3取消中，4退款申请中，5退款被拒绝，6退款成功，7客户端申请退款")
+    @QueryField(type = QueryType.EQ)
+    private Integer orderStatus;
+
+    @Schema(description = "发货状态(10未发货 20已发货 30部分发货)")
+    @QueryField(type = QueryType.EQ)
+    private Integer deliveryStatus;
+
+    @Schema(description = "无需发货备注")
+    private String deliveryNote;
+
+    @Schema(description = "发货时间")
+    private String deliveryTime;
+
+    @Schema(description = "评价状态(0未评价 1已评价)")
+    @QueryField(type = QueryType.EQ)
+    private Integer evaluateStatus;
+
+    @Schema(description = "评价时间")
+    private String evaluateTime;
+
+    @Schema(description = "优惠类型：0无、1抵扣优惠券、2折扣优惠券、3、VIP月卡、4VIP年卡，5VIP次卡、6VIP会员卡、7IC月卡、8IC年卡、9IC次卡、10IC会员卡、11免费订单、12VIP充值卡、13IC充值卡、14VIP季卡、15IC季卡")
+    @QueryField(type = QueryType.EQ)
+    private Integer couponType;
+
+    @Schema(description = "优惠说明")
+    private String couponDesc;
+
+    @Schema(description = "二维码地址，保存订单号，支付成功后才生成")
+    private String qrcode;
+
+    @Schema(description = "vip月卡年卡、ic月卡年卡回退次数")
+    @QueryField(type = QueryType.EQ)
+    private Integer returnNum;
+
+    @Schema(description = "vip充值回退金额")
+    @QueryField(type = QueryType.EQ)
+    private BigDecimal returnMoney;
+
+    @Schema(description = "预约详情开始时间数组")
+    private String startTime;
+
+    @Schema(description = "是否已开具发票：0未开发票，1已开发票，2不能开具发票")
+    @QueryField(type = QueryType.EQ)
+    private Integer isInvoice;
+
+    @Schema(description = "发票流水号")
+    private String invoiceNo;
+
+    @Schema(description = "商家留言")
+    private String merchantRemarks;
+
+    @Schema(description = "支付时间")
+    private String payTime;
+
+    @Schema(description = "退款时间")
+    private String refundTime;
+
+    @Schema(description = "申请退款时间")
+    private String refundApplyTime;
+
+    @Schema(description = "过期时间")
+    private String expirationTime;
+
+    @Schema(description = "自提码")
+    private String selfTakeCode;
+
+    @Schema(description = "是否已收到赠品")
+    @QueryField(type = QueryType.EQ)
+    private Boolean hasTakeGift;
+
+    @Schema(description = "对账情况：0=未对账；1=已对账；3=已对账，金额对不上；4=未查询到该订单")
+    @QueryField(type = QueryType.EQ)
+    private Integer checkBill;
+
+    @Schema(description = "订单是否已结算(0未结算 1已结算)")
+    @QueryField(type = QueryType.EQ)
+    private Integer isSettled;
+
+    @Schema(description = "系统版本号 0当前版本 value=其他版本")
+    @QueryField(type = QueryType.EQ)
+    private Integer version;
+
+    @Schema(description = "用户id")
+    @QueryField(type = QueryType.EQ)
+    private Integer userId;
+
+    @Schema(description = "备注")
+    private String comments;
+
+    @Schema(description = "排序号")
+    @QueryField(type = QueryType.EQ)
+    private Integer sortNumber;
+
+    @Schema(description = "是否删除, 0否, 1是")
+    @QueryField(type = QueryType.EQ)
+    private Integer deleted;
+
+}

src/main/java/com/gxwebsoft/cms/service/CmsOrderService.java

@@ -0,0 +1,42 @@
+package com.gxwebsoft.cms.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.gxwebsoft.common.core.web.PageResult;
+import com.gxwebsoft.cms.entity.CmsOrder;
+import com.gxwebsoft.cms.param.CmsOrderParam;
+
+import java.util.List;
+
+/**
+ * 网站订单Service
+ *
+ * @author 科技小王子
+ * @since 2026-01-27 13:03:24
+ */
+public interface CmsOrderService extends IService<CmsOrder> {
+
+    /**
+     * 分页关联查询
+     *
+     * @param param 查询参数
+     * @return PageResult<CmsOrder>
+     */
+    PageResult<CmsOrder> pageRel(CmsOrderParam param);
+
+    /**
+     * 关联查询全部
+     *
+     * @param param 查询参数
+     * @return List<CmsOrder>
+     */
+    List<CmsOrder> listRel(CmsOrderParam param);
+
+    /**
+     * 根据id查询
+     *
+     * @param id id
+     * @return CmsOrder
+     */
+    CmsOrder getByIdRel(Integer id);
+
+}

src/main/java/com/gxwebsoft/cms/service/impl/CmsOrderServiceImpl.java

@@ -0,0 +1,47 @@
+package com.gxwebsoft.cms.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.gxwebsoft.cms.mapper.CmsOrderMapper;
+import com.gxwebsoft.cms.service.CmsOrderService;
+import com.gxwebsoft.cms.entity.CmsOrder;
+import com.gxwebsoft.cms.param.CmsOrderParam;
+import com.gxwebsoft.common.core.web.PageParam;
+import com.gxwebsoft.common.core.web.PageResult;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 网站订单Service实现
+ *
+ * @author 科技小王子
+ * @since 2026-01-27 13:03:24
+ */
+@Service
+public class CmsOrderServiceImpl extends ServiceImpl<CmsOrderMapper, CmsOrder> implements CmsOrderService {
+
+    @Override
+    public PageResult<CmsOrder> pageRel(CmsOrderParam param) {
+        PageParam<CmsOrder, CmsOrderParam> page = new PageParam<>(param);
+        page.setDefaultOrder("sort_number asc, create_time desc");
+        List<CmsOrder> list = baseMapper.selectPageRel(page, param);
+        return new PageResult<>(list, page.getTotal());
+    }
+
+    @Override
+    public List<CmsOrder> listRel(CmsOrderParam param) {
+        List<CmsOrder> list = baseMapper.selectListRel(param);
+        // 排序
+        PageParam<CmsOrder, CmsOrderParam> page = new PageParam<>();
+        page.setDefaultOrder("sort_number asc, create_time desc");
+        return page.sortRecords(list);
+    }
+
+    @Override
+    public CmsOrder getByIdRel(Integer id) {
+        CmsOrderParam param = new CmsOrderParam();
+        param.setId(id);
+        return param.getOne(baseMapper.selectListRel(param));
+    }
+
+}

src/main/java/com/gxwebsoft/cms/service/impl/CmsWebsiteServiceImpl.java

@@ -337,9 +337,16 @@ public class CmsWebsiteServiceImpl extends ServiceImpl<CmsWebsiteMapper, CmsWebs
     if (StrUtil.isNotBlank(siteInfo)) {
       log.info("从缓存获取网站信息，租户ID: {}", tenantId);
       try {
-        return JSONUtil.parseObject(siteInfo, ShopVo.class);
+        // 兼容历史缓存：JSON "null" 会被解析为 null；此时应视为未命中并回源数据库。
+        ShopVo cacheVo = JSONUtil.parseObject(siteInfo, ShopVo.class);
+        if (cacheVo != null) {
+          return cacheVo;
+        }
+        log.warn("网站信息缓存命中但内容为空(null)，清理缓存后回源数据库，租户ID: {}", tenantId);
+        redisUtil.delete(cacheKey);
       } catch (Exception e) {
-        log.warn("缓存解析失败，从数据库重新获取: {}", e.getMessage());
+        log.warn("缓存解析失败，清理缓存后从数据库重新获取: {}", e.getMessage());
+        redisUtil.delete(cacheKey);
       }
     }
 

src/main/java/com/gxwebsoft/common/core/config/ConfigProperties.java

@@ -92,6 +92,11 @@ public class ConfigProperties {
    */
   private String serverUrl;
 
+  /**
+   * API网关地址
+   */
+  private String apiUrl;
+
   /**
    * 阿里云存储 OSS
    * Endpoint

src/main/java/com/gxwebsoft/common/core/config/JacksonConfig.java

@@ -4,7 +4,6 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
-import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
 import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

src/main/java/com/gxwebsoft/common/core/config/LocalDateTimeDeserializer.java

@@ -1,11 +1,14 @@
 package com.gxwebsoft.common.core.config;
 
 import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.core.JsonToken;
 import com.fasterxml.jackson.databind.DeserializationContext;
 import com.fasterxml.jackson.databind.JsonDeserializer;
 
 import java.io.IOException;
+import java.time.Instant;
 import java.time.LocalDateTime;
+import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
 
 /**
@@ -16,14 +19,43 @@ import java.time.format.DateTimeFormatter;
  */
 public class LocalDateTimeDeserializer extends JsonDeserializer<LocalDateTime> {
 
-    private static final DateTimeFormatter FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+    private final DateTimeFormatter formatter;
+
+    public LocalDateTimeDeserializer() {
+        this(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+    }
+
+    public LocalDateTimeDeserializer(DateTimeFormatter formatter) {
+        this.formatter = formatter;
+    }
 
     @Override
     public LocalDateTime deserialize(JsonParser p, DeserializationContext ctxt) throws IOException {
-        String value = p.getValueAsString();
-        if (value != null && !value.isEmpty()) {
-            return LocalDateTime.parse(value, FORMATTER);
+        JsonToken t = p.currentToken();
+        ZoneId zoneId = ctxt.getTimeZone() != null ? ctxt.getTimeZone().toZoneId() : ZoneId.systemDefault();
+
+        // Accept epoch timestamps (seconds or millis) for compatibility with frontends that send numbers.
+        if (t == JsonToken.VALUE_NUMBER_INT) {
+            long ts = p.getLongValue();
+            // Heuristic: 10+ digits is seconds; 13+ digits is millis (most common in JS).
+            Instant instant = (String.valueOf(Math.abs(ts)).length() >= 13)
+                    ? Instant.ofEpochMilli(ts)
+                    : Instant.ofEpochSecond(ts);
+            return LocalDateTime.ofInstant(instant, zoneId);
         }
+
+        String value = p.getValueAsString();
+        if (value == null || value.isEmpty()) {
             return null;
         }
+
+        // Handle numeric timestamps passed as strings, e.g. "1769618486000"
+        if (value.chars().allMatch(Character::isDigit)) {
+            long ts = Long.parseLong(value);
+            Instant instant = (value.length() >= 13) ? Instant.ofEpochMilli(ts) : Instant.ofEpochSecond(ts);
+            return LocalDateTime.ofInstant(instant, zoneId);
+        }
+
+        return LocalDateTime.parse(value, formatter);
+    }
 }