BUGFIX:token过期都返回401

.gitea/workflows/prod_build_commit.yaml

@@ -0,0 +1,147 @@
+name: git commit 控制 连卡佛 back-java prod 分支构建部署
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - prod/release_1.0
+
+jobs:
+  build_and_deploy:
+    runs-on: ubuntu-latest
+    if: "contains(github.event.head_commit.message, '[run build]')"
+
+    permissions:
+      contents: read
+      packages: write
+
+    env:
+      REMOTE_DEPLOY_PATH: /workspace/workspace_lanecrawford/back
+
+    steps:
+      - name: 1.检出代码
+        uses: actions/checkout@v4
+        with:
+          ref: prod/release_1.0
+
+      - name: Set up JDK 21
+        uses: actions/setup-java@v4
+        with:
+          java-version: '21'
+          distribution: 'temurin'
+
+      - name: 2.设置JAVA Maven 环境
+        run: |
+          # 适配act的root用户和Gitea Runner普通用户
+          SUDO=""
+          [ "$(id -u)" != "0" ] && SUDO="sudo"
+          
+          # 安装依赖
+          $SUDO apt update && $SUDO apt install -y wget tar --no-install-recommends
+          
+          # 下载并安装Maven
+          MAVEN_VERSION="3.6.3"
+          MAVEN_TAR="apache-maven-${MAVEN_VERSION}-bin.tar.gz"
+          MAVEN_URL="https://archive.apache.org/dist/maven/maven-3/${MAVEN_VERSION}/binaries/${MAVEN_TAR}"
+          wget --no-verbose -O /tmp/${MAVEN_TAR} ${MAVEN_URL}
+          
+          # 解压+软链接
+          $SUDO tar -xzf /tmp/${MAVEN_TAR} -C /usr/local/
+          $SUDO ln -sf /usr/local/apache-maven-${MAVEN_VERSION} /usr/local/maven
+          
+          # 配置PATH
+          echo "/usr/local/maven/bin" >> $GITHUB_PATH
+          export PATH="/usr/local/maven/bin:$PATH"
+          
+          # 验证
+          mvn -v
+
+      - name: 2.构建jar包
+        run:
+          mvn -B clean package -DskipTests --file pom.xml
+
+      - name: 3.检查 Runner 本地文件
+        run: |
+          echo "当前目录：$(pwd)"
+          echo "target 目录内容："
+          ls -la ./target/
+          
+          # 容错:处理通配符无匹配的情况
+          JAR_FILE=$(ls ./target/*.jar 2>/dev/null | head -n1)
+          if [ -z "$JAR_FILE" ] || [ ! -f "$JAR_FILE" ]; then
+            echo "❌ Runner 本地无有效 JAR 包！"
+            exit 1
+          fi
+          
+          # 检查Docker配置文件
+          for FILE in Dockerfile docker-compose.yml; do
+            if [ ! -f "./$FILE" ]; then
+              echo "❌ 缺失文件：$FILE"
+              exit 1
+            fi
+          done
+          echo "✅ 本地文件校验通过！"
+
+      - name: 4. 同步文件到远程服务器
+        uses: appleboy/scp-action@v0.1.7
+        with:
+          host: ${{ secrets.SERVER_HOST }}
+          username: ${{ secrets.SERVER_USER }}
+          key: ${{ secrets.SSH_KEY }}
+          source: "./target/*.jar,./Dockerfile,./docker-compose.yml"
+          target: ${{ env.REMOTE_DEPLOY_PATH }}
+          ssh_options: "-o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null"
+          strip_components: 0
+
+      - name: 5. 验证远程文件
+        uses: appleboy/ssh-action@v1.0.3
+        with:
+          host: ${{ secrets.SERVER_HOST }}
+          username: ${{ secrets.SERVER_USER }}
+          key: ${{ secrets.SSH_KEY }}
+          script: |
+            echo "===== 远程部署目录文件列表 ====="
+            ls -la ${{ env.REMOTE_DEPLOY_PATH }}
+            
+            # 容错:检查JAR包
+            REMOTE_JAR=$(ls ${{ env.REMOTE_DEPLOY_PATH }}/target/*.jar 2>/dev/null | head -n1)
+            if [ -z "$REMOTE_JAR" ] || [ ! -f "$REMOTE_JAR" ]; then
+              echo "❌ 远程服务器无有效 JAR 包！"
+              exit 1
+            fi
+            
+            # 检查Docker文件
+            for FILE in Dockerfile docker-compose.yml; do
+              if [ ! -f "${{ env.REMOTE_DEPLOY_PATH }}/$FILE" ]; then
+                echo "❌ 远程缺失文件：$FILE"
+                exit 1
+              fi
+            done
+            echo "✅ 远程文件校验通过！"
+
+      - name: 6. 部署和运行服务
+        uses: appleboy/ssh-action@v1.0.3
+        with:
+          host: ${{ secrets.SERVER_HOST }}
+          username: ${{ secrets.SERVER_USER }}
+          key: ${{ secrets.SSH_KEY }}
+          script: |
+            echo "===== 开始部署服务 ====="
+            cd ${{ env.REMOTE_DEPLOY_PATH }}
+            
+            # 容错:停止旧容器（不存在则跳过）
+            echo "停止旧容器..."
+            docker compose down || true
+            
+            # 清理无效镜像（可选，释放空间）
+            docker system prune -f
+            
+            # 构建并启动新容器
+            echo "构建Docker镜像..."
+            docker compose build --no-cache
+            echo "启动服务..."
+            docker compose up -d
+            
+            # 验证服务状态
+            echo "验证容器状态..."
+            docker compose ps
+            echo "✅ 部署完成！"

.gitea/workflows/prod_build_manual.yaml

@@ -0,0 +1,143 @@
+name: 手动 连卡佛 back-java prod 分支构建部署
+on:
+  workflow_dispatch:
+
+jobs:
+  build_and_deploy:
+    runs-on: ubuntu-latest
+
+    permissions:
+      contents: read
+      packages: write
+
+    env:
+      REMOTE_DEPLOY_PATH: /workspace/workspace_lanecrawford/back
+
+    steps:
+      - name: 1.检出代码
+        uses: actions/checkout@v4
+        with:
+          ref: prod/release_1.0
+
+      - name: Set up JDK 21
+        uses: actions/setup-java@v4
+        with:
+          java-version: '21'
+          distribution: 'temurin'
+
+      - name: 2.设置JAVA Maven 环境
+        run: |
+          # 适配act的root用户和Gitea Runner普通用户
+          SUDO=""
+          [ "$(id -u)" != "0" ] && SUDO="sudo"
+          
+          # 安装依赖
+          $SUDO apt update && $SUDO apt install -y wget tar --no-install-recommends
+          
+          # 下载并安装Maven
+          MAVEN_VERSION="3.6.3"
+          MAVEN_TAR="apache-maven-${MAVEN_VERSION}-bin.tar.gz"
+          MAVEN_URL="https://archive.apache.org/dist/maven/maven-3/${MAVEN_VERSION}/binaries/${MAVEN_TAR}"
+          wget --no-verbose -O /tmp/${MAVEN_TAR} ${MAVEN_URL}
+          
+          # 解压+软链接
+          $SUDO tar -xzf /tmp/${MAVEN_TAR} -C /usr/local/
+          $SUDO ln -sf /usr/local/apache-maven-${MAVEN_VERSION} /usr/local/maven
+          
+          # 配置PATH
+          echo "/usr/local/maven/bin" >> $GITHUB_PATH
+          export PATH="/usr/local/maven/bin:$PATH"
+          
+          # 验证
+          mvn -v
+
+      - name: 2.构建jar包
+        run:
+          mvn -B clean package -DskipTests --file pom.xml
+
+      - name: 3.检查 Runner 本地文件
+        run: |
+          echo "当前目录：$(pwd)"
+          echo "target 目录内容："
+          ls -la ./target/
+          
+          # 容错:处理通配符无匹配的情况
+          JAR_FILE=$(ls ./target/*.jar 2>/dev/null | head -n1)
+          if [ -z "$JAR_FILE" ] || [ ! -f "$JAR_FILE" ]; then
+            echo "❌ Runner 本地无有效 JAR 包！"
+            exit 1
+          fi
+          
+          # 检查Docker配置文件
+          for FILE in Dockerfile docker-compose.yml; do
+            if [ ! -f "./$FILE" ]; then
+              echo "❌ 缺失文件：$FILE"
+              exit 1
+            fi
+          done
+          echo "✅ 本地文件校验通过！"
+
+      - name: 4. 同步文件到远程服务器
+        uses: appleboy/scp-action@v0.1.7
+        with:
+          host: ${{ secrets.SERVER_HOST }}
+          username: ${{ secrets.SERVER_USER }}
+          key: ${{ secrets.SSH_KEY }}
+          source: "./target/*.jar,./Dockerfile,./docker-compose.yml"
+          target: ${{ env.REMOTE_DEPLOY_PATH }}
+          ssh_options: "-o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null"
+          strip_components: 0
+
+      - name: 5. 验证远程文件
+        uses: appleboy/ssh-action@v1.0.3
+        with:
+          host: ${{ secrets.SERVER_HOST }}
+          username: ${{ secrets.SERVER_USER }}
+          key: ${{ secrets.SSH_KEY }}
+          script: |
+            echo "===== 远程部署目录文件列表 ====="
+            ls -la ${{ env.REMOTE_DEPLOY_PATH }}
+            
+            # 容错:检查JAR包
+            REMOTE_JAR=$(ls ${{ env.REMOTE_DEPLOY_PATH }}/target/*.jar 2>/dev/null | head -n1)
+            if [ -z "$REMOTE_JAR" ] || [ ! -f "$REMOTE_JAR" ]; then
+              echo "❌ 远程服务器无有效 JAR 包！"
+              exit 1
+            fi
+            
+            # 检查Docker文件
+            for FILE in Dockerfile docker-compose.yml; do
+              if [ ! -f "${{ env.REMOTE_DEPLOY_PATH }}/$FILE" ]; then
+                echo "❌ 远程缺失文件：$FILE"
+                exit 1
+              fi
+            done
+            echo "✅ 远程文件校验通过！"
+
+      - name: 6. 部署和运行服务
+        uses: appleboy/ssh-action@v1.0.3
+        with:
+          host: ${{ secrets.SERVER_HOST }}
+          username: ${{ secrets.SERVER_USER }}
+          key: ${{ secrets.SSH_KEY }}
+          script: |
+            echo "===== 开始部署服务 ====="
+            cd ${{ env.REMOTE_DEPLOY_PATH }}
+            
+            # 容错:停止旧容器（不存在则跳过）
+            echo "停止旧容器..."
+            docker compose down || true
+            
+            # 清理无效镜像（可选，释放空间）
+            docker system prune -f
+            
+            # 构建并启动新容器
+            echo "构建Docker镜像..."
+            docker compose build --no-cache
+            echo "启动服务..."
+            docker compose up -d
+            
+            # 验证服务状态
+            echo "验证容器状态..."
+            docker compose ps
+            echo "✅ 部署完成！"

.gitea/workflows/prod_build_schedule.yaml

@@ -0,0 +1,146 @@
+name: 定时 连卡佛 back-java prod 分支构建部署
+on:
+  schedule:
+    #       cron为UTC时区，构建时间=部署时间-8小时 {*分 (-8)时 *日 *月  *周}  ---
+    #      示例： 1月1日22点22分触发构建 cron写作 - '22 14 1 1 *'
+    - cron: '22 14 1 1 *'
+
+jobs:
+  build_and_deploy:
+    runs-on: ubuntu-latest
+
+    permissions:
+      contents: read
+      packages: write
+
+    env:
+      REMOTE_DEPLOY_PATH: /workspace/workspace_lanecrawford/back
+
+    steps:
+      - name: 1.检出代码
+        uses: actions/checkout@v4
+        with:
+          ref: prod/release_1.0
+
+      - name: Set up JDK 21
+        uses: actions/setup-java@v4
+        with:
+          java-version: '21'
+          distribution: 'temurin'
+
+      - name: 2.设置JAVA Maven 环境
+        run: |
+          # 适配act的root用户和Gitea Runner普通用户
+          SUDO=""
+          [ "$(id -u)" != "0" ] && SUDO="sudo"
+          
+          # 安装依赖
+          $SUDO apt update && $SUDO apt install -y wget tar --no-install-recommends
+          
+          # 下载并安装Maven
+          MAVEN_VERSION="3.6.3"
+          MAVEN_TAR="apache-maven-${MAVEN_VERSION}-bin.tar.gz"
+          MAVEN_URL="https://archive.apache.org/dist/maven/maven-3/${MAVEN_VERSION}/binaries/${MAVEN_TAR}"
+          wget --no-verbose -O /tmp/${MAVEN_TAR} ${MAVEN_URL}
+          
+          # 解压+软链接
+          $SUDO tar -xzf /tmp/${MAVEN_TAR} -C /usr/local/
+          $SUDO ln -sf /usr/local/apache-maven-${MAVEN_VERSION} /usr/local/maven
+          
+          # 配置PATH
+          echo "/usr/local/maven/bin" >> $GITHUB_PATH
+          export PATH="/usr/local/maven/bin:$PATH"
+          
+          # 验证
+          mvn -v
+
+      - name: 2.构建jar包
+        run:
+          mvn -B clean package -DskipTests --file pom.xml
+
+      - name: 3.检查 Runner 本地文件
+        run: |
+          echo "当前目录：$(pwd)"
+          echo "target 目录内容："
+          ls -la ./target/
+          
+          # 容错:处理通配符无匹配的情况
+          JAR_FILE=$(ls ./target/*.jar 2>/dev/null | head -n1)
+          if [ -z "$JAR_FILE" ] || [ ! -f "$JAR_FILE" ]; then
+            echo "❌ Runner 本地无有效 JAR 包！"
+            exit 1
+          fi
+          
+          # 检查Docker配置文件
+          for FILE in Dockerfile docker-compose.yml; do
+            if [ ! -f "./$FILE" ]; then
+              echo "❌ 缺失文件：$FILE"
+              exit 1
+            fi
+          done
+          echo "✅ 本地文件校验通过！"
+
+      - name: 4. 同步文件到远程服务器
+        uses: appleboy/scp-action@v0.1.7
+        with:
+          host: ${{ secrets.SERVER_HOST }}
+          username: ${{ secrets.SERVER_USER }}
+          key: ${{ secrets.SSH_KEY }}
+          source: "./target/*.jar,./Dockerfile,./docker-compose.yml"
+          target: ${{ env.REMOTE_DEPLOY_PATH }}
+          ssh_options: "-o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null"
+          strip_components: 0
+
+      - name: 5. 验证远程文件
+        uses: appleboy/ssh-action@v1.0.3
+        with:
+          host: ${{ secrets.SERVER_HOST }}
+          username: ${{ secrets.SERVER_USER }}
+          key: ${{ secrets.SSH_KEY }}
+          script: |
+            echo "===== 远程部署目录文件列表 ====="
+            ls -la ${{ env.REMOTE_DEPLOY_PATH }}
+            
+            # 容错:检查JAR包
+            REMOTE_JAR=$(ls ${{ env.REMOTE_DEPLOY_PATH }}/target/*.jar 2>/dev/null | head -n1)
+            if [ -z "$REMOTE_JAR" ] || [ ! -f "$REMOTE_JAR" ]; then
+              echo "❌ 远程服务器无有效 JAR 包！"
+              exit 1
+            fi
+            
+            # 检查Docker文件
+            for FILE in Dockerfile docker-compose.yml; do
+              if [ ! -f "${{ env.REMOTE_DEPLOY_PATH }}/$FILE" ]; then
+                echo "❌ 远程缺失文件：$FILE"
+                exit 1
+              fi
+            done
+            echo "✅ 远程文件校验通过！"
+
+      - name: 6. 部署和运行服务
+        uses: appleboy/ssh-action@v1.0.3
+        with:
+          host: ${{ secrets.SERVER_HOST }}
+          username: ${{ secrets.SERVER_USER }}
+          key: ${{ secrets.SSH_KEY }}
+          script: |
+            echo "===== 开始部署服务 ====="
+            cd ${{ env.REMOTE_DEPLOY_PATH }}
+            
+            # 容错:停止旧容器（不存在则跳过）
+            echo "停止旧容器..."
+            docker compose down || true
+            
+            # 清理无效镜像（可选，释放空间）
+            docker system prune -f
+            
+            # 构建并启动新容器
+            echo "构建Docker镜像..."
+            docker compose build --no-cache
+            echo "启动服务..."
+            docker compose up -d
+            
+            # 验证服务状态
+            echo "验证容器状态..."
+            docker compose ps
+            echo "✅ 部署完成！"

docker-compose.yml

@@ -6,4 +6,4 @@ services:
       # 日志目录映射
       - ./log:/log
     ports:
-      - '10010:8080'
+      - '10095:8080'

src/main/java/com/aida/lanecarford/common/security/JwtInterceptor.java

@@ -2,7 +2,6 @@ package com.aida.lanecarford.common.security;
 
 import com.aida.lanecarford.common.security.config.JwtProperties;
 import com.aida.lanecarford.common.security.context.UserContext;
-import com.aida.lanecarford.exception.BusinessException;
 import com.aida.lanecarford.util.CacheUtil;
 import com.aida.lanecarford.vo.AuthPrincipalVO;
 import com.alibaba.fastjson.JSONObject;
@@ -25,7 +24,7 @@ public class JwtInterceptor implements HandlerInterceptor {
     private final JwtProperties jwtProperties;
 
     @Override
-    public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
+    public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) {
         if ("OPTIONS".equalsIgnoreCase(request.getMethod())) {
             return true;
         }
@@ -41,7 +40,8 @@ public class JwtInterceptor implements HandlerInterceptor {
             String extracted = jwtUtil.extractUserinfo(jwtToken);
             if (StringUtil.isNullOrEmpty(extracted)) {
                 log.warn("TOKEN已过期，请重新登录！(token without userInfo)");
-                throw new BusinessException("Token has expired, please log in again.");
+                response.setStatus(HttpServletResponse.SC_UNAUTHORIZED);
+//                throw new BusinessException("Token has expired, please log in again.");
             }
 
             AuthPrincipalVO authPrincipalVO = JSONObject.parseObject(extracted, AuthPrincipalVO.class);
@@ -54,10 +54,12 @@ public class JwtInterceptor implements HandlerInterceptor {
 
             if (Objects.isNull(token)) {
                 log.warn("TOKEN已过期，请重新登录！(local cache empty)");
-                throw new BusinessException("Token has expired, please log in again.");
+                response.setStatus(HttpServletResponse.SC_UNAUTHORIZED);
+//                throw new BusinessException("Token has expired, please log in again.");
             } else if (!token.toString().equals(jwtToken)) {
                 log.warn("TOKEN已过期，请重新登录！(token not match local cache)");
-                throw new BusinessException("Token has expired, please log in again.");
+                response.setStatus(HttpServletResponse.SC_UNAUTHORIZED);
+//                throw new BusinessException("Token has expired, please log in again.");
             }
             return true;
         }

src/main/java/com/aida/lanecarford/controller/CustomerController.java

@@ -2,6 +2,7 @@ package com.aida.lanecarford.controller;
 
 import com.aida.lanecarford.common.ApiResponse;
 import com.aida.lanecarford.dto.BaseRequest;
+import com.aida.lanecarford.entity.Customer;
 import com.aida.lanecarford.service.CustomerService;
 import com.aida.lanecarford.vo.CustomerCheckInVO;
 import com.aida.lanecarford.vo.CustomerVO;
@@ -25,11 +26,11 @@ public class CustomerController {
 
     @Operation(
         summary = "顾客入店登记", 
-        description = "验证顾客身份并创建入店记录，如果是新顾客则自动注册到系统中。"
+        description = "验证顾客身份并创建入店记录"
     )
     @GetMapping("/checkIn")
-    public ApiResponse<CustomerCheckInVO> customerCheckIn(@RequestParam String name, @RequestParam String email) {
-        return ApiResponse.success(customerService.customerCheckIn(name, email));
+    public ApiResponse<CustomerCheckInVO> customerCheckIn(@RequestParam String nickname) {
+        return ApiResponse.success(customerService.customerCheckIn(nickname));
     }
 
     @PostMapping("/getAllCustomer")
@@ -37,4 +38,15 @@ public class CustomerController {
         return ApiResponse.success(customerService.getAllCustomer(request));
     }
 
+    @Operation(
+            summary = "新增顾客",
+            description = "根据用户提供的vipId和昵称与当前sales绑定，创建账号"
+    )
+    @GetMapping("/createCustomer")
+    public ApiResponse<Customer> createCustomer(@RequestParam String vipId, @RequestParam String nickname) {
+        return ApiResponse.success(customerService.createCustomer(vipId, nickname));
+    }
+
+
+
 }

src/main/java/com/aida/lanecarford/controller/StyleController.java

@@ -78,4 +78,15 @@ public class StyleController {
         return ApiResponse.success(styleService.getOutfitResult(requestIDs));
     }
 
+    @Operation(
+            summary = "回溯历史对话，重新生成搭配图",
+            description = "根据当前的穿搭结果，回溯历史穿搭请求数据及历史对话，重新生成搭配"
+    )
+    @GetMapping("/retrieveAndRegenerate")
+    public ApiResponse<List<String>> retrieveAndRegenerate(
+            @Parameter(description = "tryOn后的图片id", required = true, example = "1369")
+            @RequestParam Long tryOnEffectsId) {
+        return ApiResponse.success(styleService.retrieveAndRegenerate(tryOnEffectsId));
+    }
+
 }

src/main/java/com/aida/lanecarford/dto/OutfitCallbackDTO.java

@@ -16,4 +16,8 @@ public class OutfitCallbackDTO {
     private String path;
 
     private List<Map<String, String>> items;
+
+    private String request_summary;
+
+    private List<String> occasions;
 }

src/main/java/com/aida/lanecarford/dto/RequestOutfitDTO.java

@@ -1,9 +1,12 @@
 package com.aida.lanecarford.dto;
 
+import io.swagger.v3.oas.annotations.Hidden;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 
+import java.util.List;
+
 
 @Data
 @Schema(description = "AI穿搭推荐请求参数")
@@ -59,4 +62,10 @@ public class RequestOutfitDTO {
     )
     private String sessionId;
 
+    @Hidden
+    private String summary;
+
+    @Hidden
+    private List<String> occasion;
+
 }

src/main/java/com/aida/lanecarford/entity/Customer.java

@@ -20,6 +20,18 @@ import java.time.LocalDateTime;
 @TableName("customers")
 public class Customer extends BaseEntity {
 
+    /**
+     * 导购id,即user表的主键id
+     */
+    @TableField("user_id")
+    private Long salesId;
+
+    /**
+     * vip ID
+     */
+    @TableField("vip_id")
+    private String vipId;
+
     /**
      * 顾客姓名
      */

src/main/java/com/aida/lanecarford/entity/OutfitRequest.java

@@ -31,4 +31,9 @@ public class OutfitRequest extends BaseEntity{
      * 当前任务状态
      */
     private int status;
+
+    /**
+     * 会话记录id
+     */
+    private Long sessionRecordId;
 }

src/main/java/com/aida/lanecarford/entity/SessionRecord.java

@@ -0,0 +1,51 @@
+package com.aida.lanecarford.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+import org.apache.commons.lang3.StringUtils;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = true)
+@TableName("session_record")
+public class SessionRecord extends BaseEntity{
+
+    private Long visitRecordId;
+
+    private String sessionId;
+
+    private String requestSummary;
+
+    private String occasions;
+
+    // 获取时转换为List
+    @JsonIgnore
+    public List<String> getOccasionsList() {
+        if (StringUtils.isBlank(this.occasions)) {
+            return new ArrayList<>();
+        }
+        // 使用特定分隔符，确保不会出现在内容中
+        return Arrays.asList(this.occasions.split("\\|\\|"));
+    }
+
+    // 设置时转换为String
+    public void setOccasionsList(List<String> occasionsList) {
+        if (occasionsList == null || occasionsList.isEmpty()) {
+            this.occasions = null;
+        } else {
+            this.occasions = String.join("||", occasionsList);
+        }
+    }
+
+}

src/main/java/com/aida/lanecarford/mapper/SessionRecordMapper.java

@@ -0,0 +1,9 @@
+package com.aida.lanecarford.mapper;
+
+import com.aida.lanecarford.entity.SessionRecord;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface SessionRecordMapper extends BaseMapper<SessionRecord> {
+}

src/main/java/com/aida/lanecarford/service/CustomerService.java

@@ -12,8 +12,10 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface CustomerService extends IService<Customer> {
 
-    CustomerCheckInVO customerCheckIn(String name, String email);
+    CustomerCheckInVO customerCheckIn(String vipId);
 
     IPage<CustomerVO> getAllCustomer(BaseRequest request);
 
+    Customer createCustomer(String vipId, String nickname);
+
 }

src/main/java/com/aida/lanecarford/service/StyleService.java

@@ -19,4 +19,6 @@ public interface StyleService extends IService<Style> {
 
     List<OutfitResultVO> getOutfitResult(List<String> requestIDs);
 
+    List<String> retrieveAndRegenerate(Long tryOnEffectsId);
+
 }

src/main/java/com/aida/lanecarford/service/impl/CustomerServiceImpl.java

@@ -1,9 +1,11 @@
 package com.aida.lanecarford.service.impl;
 
+import com.aida.lanecarford.common.response.ResultEnum;
 import com.aida.lanecarford.common.security.context.UserContext;
 import com.aida.lanecarford.dto.BaseRequest;
 import com.aida.lanecarford.entity.Customer;
 import com.aida.lanecarford.entity.VisitRecord;
+import com.aida.lanecarford.exception.BusinessException;
 import com.aida.lanecarford.mapper.CustomerMapper;
 import com.aida.lanecarford.service.CustomerService;
 import com.aida.lanecarford.service.VisitRecordService;
@@ -15,6 +17,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.RequiredArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
@@ -30,10 +33,16 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerMapper, Customer> i
     private final VisitRecordService visitRecordService;
 
     // 选择顾客登录并添加入店记录
-    public CustomerCheckInVO customerCheckIn(String name, String email) {
+    public CustomerCheckInVO customerCheckIn(String nickname) {
+        // sales ID即当前的用户id
+        Long salesId = UserContext.getUserHolder().getId();
+        if (StringUtils.isBlank(nickname)) {
+            throw new BusinessException("Please enter a nickname.", ResultEnum.PROMPT.getCode());
+        }
         // 1. 判断当前顾客信息在数据库中是否有存储
         LambdaQueryWrapper<Customer> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(Customer::getName, name).eq(Customer::getEmail, email);
+        queryWrapper.eq(Customer::getName, nickname)
+                .eq(Customer::getSalesId, salesId);
 
         Customer customer = getOne(queryWrapper);
 
@@ -41,27 +50,28 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerMapper, Customer> i
         if (Objects.isNull(customer)) {
             // todo 从连卡佛数据库查数据
             // 先假设都找不到
-            // throw new BusinessException("This customer does not currently have a registered VIP account.");
+             throw new BusinessException("This customer does not currently have a registered VIP account.");
             // 如果找到了，则添加到数据库
             // 3. 添加当前顾客到本系统数据库
-            customer = new Customer();
-            customer.setName(name);
-            customer.setEmail(email);
-            customer.setCreatedTime(LocalDateTime.now());
-
-            save(customer);
+//            customer = new Customer();
+//            customer.setVipId(vipId);
+//            customer.setCreatedTime(LocalDateTime.now());
+//
+//            save(customer);
         }
 
         // 4. 添加入店记录
-        VisitRecord visitRecord = visitRecordService.addRecord(customer.getId(), UserContext.getUserHolder().getId());
+        VisitRecord visitRecord = visitRecordService.addRecord(customer.getId(), salesId);
 
         return new CustomerCheckInVO(customer.getId(), visitRecord.getId());
     }
 
     // 获取所有的顾客名单
     public IPage<CustomerVO> getAllCustomer(BaseRequest request) {
+        Long salesId = UserContext.getUserHolder().getId();
         LambdaQueryWrapper<Customer> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.select(Customer::getName, Customer::getEmail);
+        queryWrapper.eq(Customer::getSalesId, salesId);
+        queryWrapper.select(Customer::getName, Customer::getVipId);
 
         Page<Customer> page = page(new Page<>(request.getCurrent(), request.getSize()), queryWrapper);
 
@@ -73,4 +83,36 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerMapper, Customer> i
         });
     }
 
+    public Customer createCustomer(String vipId, String nickname) {
+        Long salesId = UserContext.getUserHolder().getId();
+        // 1. 确认nickname是否有重复，有，返回提示信息
+        boolean nicknameExists = lambdaQuery().eq(Customer::getName, nickname)
+                .eq(Customer::getSalesId, salesId).count() > 0;
+        if (nicknameExists) {
+            throw new BusinessException("'" + nickname + "' already exists. Please choose a different nickname.");
+        }
+
+        // 2. 确认输入的vipId是否已存在账号
+        LambdaQueryWrapper<Customer> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(Customer::getVipId, vipId)
+                .eq(Customer::getSalesId, salesId);
+
+        Customer customer = getOne(queryWrapper);
+
+        // 3. 不存在则新建
+        if (Objects.isNull(customer)) {
+            customer = new Customer();
+            customer.setVipId(vipId);
+            customer.setName(nickname);
+            customer.setSalesId(salesId);
+            customer.setCreatedTime(LocalDateTime.now());
+
+            save(customer);
+        } else {
+            throw new BusinessException("VIP ID'" + vipId + "' already exists.Please proceed directly to check-in.");
+        }
+
+        return customer;
+    }
+
 }

src/main/java/com/aida/lanecarford/service/impl/StyleServiceImpl.java

@@ -7,10 +7,14 @@ import com.aida.lanecarford.common.enums.StylistPathEnum;
 import com.aida.lanecarford.dto.OutfitCallbackDTO;
 import com.aida.lanecarford.dto.RequestOutfitDTO;
 import com.aida.lanecarford.entity.OutfitRequest;
+import com.aida.lanecarford.entity.SessionRecord;
 import com.aida.lanecarford.entity.Style;
+import com.aida.lanecarford.entity.TryOnEffect;
 import com.aida.lanecarford.exception.BusinessException;
 import com.aida.lanecarford.mapper.OutfitRequestMapper;
+import com.aida.lanecarford.mapper.SessionRecordMapper;
 import com.aida.lanecarford.mapper.StyleMapper;
+import com.aida.lanecarford.mapper.TryOnEffectMapper;
 import com.aida.lanecarford.service.StyleService;
 import com.aida.lanecarford.util.CacheUtil;
 import com.aida.lanecarford.util.MinioUtil;
@@ -20,12 +24,16 @@ import com.aida.lanecarford.vo.OutfitResultVO;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson2.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import io.netty.util.internal.StringUtil;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.jetbrains.annotations.NotNull;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 
 import java.time.LocalDateTime;
 import java.util.*;
@@ -41,6 +49,8 @@ public class StyleServiceImpl extends ServiceImpl<StyleMapper, Style> implements
     private final CacheUtil cacheUtil;
     private final MinioUtil minioUtil;
     private final OutfitRequestMapper outfitRequestMapper;
+    private final SessionRecordMapper sessionRecordMapper;
+    private final TryOnEffectMapper tryOnEffectMapper;
 
     @Value("${webhook.domain}")
     private String webhookDomain;
@@ -51,14 +61,16 @@ public class StyleServiceImpl extends ServiceImpl<StyleMapper, Style> implements
         // 请求需要顾客id, 生成的数量，风格
 
         StylistPathEnum stylistPathEnum = StylistPathEnum.of(requestOutfitDTO.getStylist());
-        Map<String, Object> params = setRequestOutfitParams(requestOutfitDTO.getCustomerId(), requestOutfitDTO.getNum(),
-                stylistPathEnum.getPath(), requestOutfitDTO.getGender(), requestOutfitDTO.getSessionId());
+        Map<String, Object> params = setRequestOutfitParams(requestOutfitDTO, stylistPathEnum);
+
+        SessionRecord sessionRecord = saveOrUpdateSession(requestOutfitDTO.getSessionId(), requestOutfitDTO.getCheckInId(), null, null);
 
         OutfitRequest outfitRequest = new OutfitRequest();
         outfitRequest.setCustomerId(requestOutfitDTO.getCustomerId());
         outfitRequest.setVisitRecordId(requestOutfitDTO.getCheckInId());
         outfitRequest.setStylist(requestOutfitDTO.getStylist());
         outfitRequest.setGender(requestOutfitDTO.getGender());
+        outfitRequest.setSessionRecordId(sessionRecord.getId());
         outfitRequestMapper.insert(outfitRequest);
 
         log.info("agent request params: {}", JSON.toJSONString(params));
@@ -94,15 +106,22 @@ public class StyleServiceImpl extends ServiceImpl<StyleMapper, Style> implements
 
     }
 
-    private Map<String, Object> setRequestOutfitParams(Long customerId, int num, String stylistPath, String gender, String sessionId) {
+    private Map<String, Object> setRequestOutfitParams(RequestOutfitDTO requestOutfitDTO, StylistPathEnum stylistPathEnum) {
         HashMap<String, Object> params = new HashMap<>();
-        params.put("user_id", customerId.toString());
-        params.put("num_outfits", num);
-        params.put("stylist_path", stylistPath);
+        params.put("user_id", requestOutfitDTO.getCustomerId().toString());
+        params.put("num_outfits", requestOutfitDTO.getNum());
+        params.put("stylist_path", stylistPathEnum.getName());
         params.put("callback_url", webhookDomain);
-        params.put("gender", gender);
-        params.put("max_len", 9);
-        params.put("session_id", sessionId);
+        params.put("gender", requestOutfitDTO.getGender());
+//        params.put("max_len", 5);
+        params.put("session_id", requestOutfitDTO.getSessionId());
+        params.put("batch_sources", Collections.singleton("2025_q4"));
+        if (StringUtils.isNotBlank(requestOutfitDTO.getSummary())) {
+            params.put("request_summary", requestOutfitDTO.getSummary());
+        }
+        if (!CollectionUtils.isEmpty(requestOutfitDTO.getOccasion())) {
+            params.put("occasions", requestOutfitDTO.getOccasion());
+        }
 
         return params;
     }
@@ -165,6 +184,13 @@ public class StyleServiceImpl extends ServiceImpl<StyleMapper, Style> implements
             outfit.setItems(itemsJson);
 
             updateById(outfit);
+            OutfitRequest outfitRequest = outfitRequestMapper.selectById(outfit.getOutfitRequestId());
+            if (Objects.nonNull(outfitRequest) && Objects.nonNull(outfitRequest.getSessionRecordId())) {
+                SessionRecord sessionRecord = sessionRecordMapper.selectById(outfitRequest.getSessionRecordId());
+                saveOrUpdateSession(sessionRecord.getSessionId(), sessionRecord.getVisitRecordId(),
+                        callbackDTO.getRequest_summary(), callbackDTO.getOccasions());
+            }
+
         }
     }
 
@@ -205,4 +231,77 @@ public class StyleServiceImpl extends ServiceImpl<StyleMapper, Style> implements
         return resultVOS;
     }
 
+    public SessionRecord saveOrUpdateSession(String sessionId, Long visitsId, String summary, List<String> occasion) {
+        // 判断同一次进店记录中，当前会话id是否已存在
+        QueryWrapper<SessionRecord> queryWrapper = new QueryWrapper<>();
+        queryWrapper.lambda().eq(SessionRecord::getVisitRecordId, visitsId)
+                .eq(SessionRecord::getSessionId, sessionId);
+        SessionRecord sessionRecord = sessionRecordMapper.selectOne(queryWrapper);
+        if (Objects.isNull(sessionRecord)) {
+            sessionRecord = new SessionRecord();
+            sessionRecord.setVisitRecordId(visitsId);
+            sessionRecord.setSessionId(sessionId);
+            sessionRecord.setRequestSummary(summary);
+            sessionRecord.setOccasionsList(occasion);
+            sessionRecord.setCreatedTime(LocalDateTime.now());
+            int insert = sessionRecordMapper.insert(sessionRecord);
+            log.info("新增session record，影响{}条记录", insert);
+        } else {
+            sessionRecord.setRequestSummary(summary);
+            sessionRecord.setOccasionsList(occasion);
+            sessionRecord.setUpdatedTime(LocalDateTime.now());
+            int row = sessionRecordMapper.updateById(sessionRecord);
+            log.info("更新session record，影响{}条记录", row);
+        }
+        return sessionRecord;
+    }
+
+    public List<String> retrieveAndRegenerate(Long tryOnEffectsId) {
+        // 1. 判断id是否有效
+        TryOnEffect tryOnEffect = tryOnEffectMapper.selectById(tryOnEffectsId);
+        if (Objects.isNull(tryOnEffect)) {
+            log.error("无效id: {}", tryOnEffectsId);
+            throw new BusinessException("Error: Invalid ID.");
+        }
+        if (Objects.isNull(tryOnEffect.getStyleId())) {
+            log.error("Id 为：{} 的tryOnEffects记录,没有style_id", tryOnEffectsId);
+            throw new BusinessException("Cannot recreate outfit from past data.");
+        }
+
+        // 2. 组装参数
+        Style style = baseMapper.selectById(tryOnEffect.getStyleId());
+        if (Objects.nonNull(style)) {
+            OutfitRequest outfitRequest = outfitRequestMapper.selectById(style.getOutfitRequestId());
+            if (Objects.isNull(outfitRequest)){
+                log.error("找不到Id 为：{} 的OutfitRequest记录", style.getOutfitRequestId());
+                throw new BusinessException("Cannot recreate outfit from past data.");
+            }
+            SessionRecord sessionRecord = sessionRecordMapper.selectById(outfitRequest.getSessionRecordId());
+            if (Objects.isNull(sessionRecord)){
+                log.error("找不到Id 为：{} 的SessionRecord记录", outfitRequest.getSessionRecordId());
+                throw new BusinessException("Cannot recreate outfit from past data.");
+            }
+            RequestOutfitDTO requestOutfitDTO = getRequestOutfitDTO(outfitRequest, sessionRecord);
+
+            return requestOutfit(requestOutfitDTO);
+        } else {
+            log.error("找不到Id 为：{} 的Style记录", tryOnEffect.getStyleId());
+            throw new BusinessException("Cannot recreate outfit from past data.");
+        }
+    }
+
+    @NotNull
+    private static RequestOutfitDTO getRequestOutfitDTO(OutfitRequest outfitRequest, SessionRecord sessionRecord) {
+        RequestOutfitDTO requestOutfitDTO = new RequestOutfitDTO();
+        requestOutfitDTO.setCustomerId(outfitRequest.getCustomerId());
+        requestOutfitDTO.setCheckInId(outfitRequest.getVisitRecordId());
+        requestOutfitDTO.setStylist(outfitRequest.getStylist());
+        requestOutfitDTO.setGender(outfitRequest.getGender());
+        requestOutfitDTO.setNum(1);
+        requestOutfitDTO.setSessionId(sessionRecord.getSessionId());
+        requestOutfitDTO.setSummary(sessionRecord.getRequestSummary());
+        requestOutfitDTO.setOccasion(sessionRecord.getOccasionsList());
+        return requestOutfitDTO;
+    }
+
 }

src/main/java/com/aida/lanecarford/vo/CustomerVO.java

@@ -16,12 +16,15 @@ public class CustomerVO {
     /**
      * 顾客姓名
      */
-    @Schema(description = "顾客姓名", example = "张三", required = true)
+    @Schema(description = "顾客姓名", example = "张三")
     private String name;
 
     /**
      * 顾客邮箱
      */
-    @Schema(description = "顾客邮箱地址", example = "zhangsan@example.com", required = true)
+    @Schema(description = "顾客邮箱地址", example = "zhangsan@example.com")
     private String email;
+
+    @Schema(description = "顾客vipId", example = "1")
+    private String vipId;
 }