From f74685c4d1116a9c8b419e7edb1227500fa2544c Mon Sep 17 00:00:00 2001
From: xupei <xupei3360@163.com>
Date: Mon, 29 Dec 2025 16:19:42 +0800
Subject: [PATCH 1/7] =?UTF-8?q?BUGFIX:=20=E5=88=9B=E5=BB=BA=E8=B6=85?=
 =?UTF-8?q?=E8=BF=873=E5=88=86=E9=92=9F=E7=9A=84=E6=90=AD=E9=85=8D?=
 =?UTF-8?q?=E8=AF=B7=E6=B1=82=E8=AE=BE=E7=BD=AE=E4=B8=BA=E5=A4=B1=E8=B4=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lanecarford/common/enums/StatusEnum.java  |   5 +-
 .../lanecarford/dto/OutfitCallbackDTO.java    |   2 +-
 .../service/impl/StyleServiceImpl.java        | 126 ++++++++++++++----
 .../aida/lanecarford/vo/OutfitResultVO.java   |   2 +
 4 files changed, 104 insertions(+), 31 deletions(-)

diff --git a/src/main/java/com/aida/lanecarford/common/enums/StatusEnum.java b/src/main/java/com/aida/lanecarford/common/enums/StatusEnum.java
index 2582866..f5efc29 100644
--- a/src/main/java/com/aida/lanecarford/common/enums/StatusEnum.java
+++ b/src/main/java/com/aida/lanecarford/common/enums/StatusEnum.java
@@ -21,7 +21,10 @@ public enum StatusEnum {
     FAILED(2),
 
     @Schema(description = "运行中")
-    RUNNING(3);
+    RUNNING(3),
+
+    @Schema(description = "重试中")
+    RETRYING(4);
 
     private int code;
 
diff --git a/src/main/java/com/aida/lanecarford/dto/OutfitCallbackDTO.java b/src/main/java/com/aida/lanecarford/dto/OutfitCallbackDTO.java
index 8df956b..f59056f 100644
--- a/src/main/java/com/aida/lanecarford/dto/OutfitCallbackDTO.java
+++ b/src/main/java/com/aida/lanecarford/dto/OutfitCallbackDTO.java
@@ -10,7 +10,7 @@ public class OutfitCallbackDTO {
 
     private String outfit_id;
 
-    // 取值范围：ok || failed || stop
+    // 取值范围：ok || failed || stop || retrying
     private String status;
 
     private String path;
diff --git a/src/main/java/com/aida/lanecarford/service/impl/StyleServiceImpl.java b/src/main/java/com/aida/lanecarford/service/impl/StyleServiceImpl.java
index b32c298..7abde60 100644
--- a/src/main/java/com/aida/lanecarford/service/impl/StyleServiceImpl.java
+++ b/src/main/java/com/aida/lanecarford/service/impl/StyleServiceImpl.java
@@ -101,6 +101,7 @@ public class StyleServiceImpl extends ServiceImpl<StyleMapper, Style> implements
 
             String key = RedisURIConstants.outfitResultCache + requestId;
             OutfitResultVO outfitResultVO = new OutfitResultVO(style.getId(), requestId, StatusEnum.PENDING.name());
+            outfitResultVO.setCreateTimeStamp(System.currentTimeMillis());
             cacheUtil.setCache(key, outfitResultVO, RedisURIConstants.verifyCodeTimeout);
         }
         return requestIds;
@@ -133,40 +134,60 @@ public class StyleServiceImpl extends ServiceImpl<StyleMapper, Style> implements
             return;
         }
 
-        if ("ok".equals(callbackDTO.getStatus()) || "stop".equals(callbackDTO.getStatus())) {
-            // 1. 判断path是否为空，是 -> 不做任何处理
-            if (StringUtil.isNullOrEmpty(callbackDTO.getPath())) {
-                return;
+        // 1. 判断path是否为空，是 -> 不做任何处理
+        if (!"retrying".equals(callbackDTO.getStatus())
+                && !"failed".equals(callbackDTO.getStatus())
+                && StringUtil.isNullOrEmpty(callbackDTO.getPath())) {
+            return;
+        }
+
+        if (StringUtil.isNullOrEmpty(callbackDTO.getOutfit_id())) {
+            log.error("回调参数中，outfit_id为空");
+            return;
+        }
+
+        String requestId = callbackDTO.getOutfit_id();
+
+        // 2. 获取outfit_id,查询数据库
+        String key = RedisURIConstants.outfitResultCache + requestId;
+        Object outfitResult = cacheUtil.getCache(key);
+        if (Objects.isNull(outfitResult)) {
+            log.error("未知搭配请求");
+            return;
+        }
+
+        // 3.更新path, items, 状态
+        // 由于数据变化较频繁，考虑存到redis
+        if (outfitResult instanceof OutfitResultVO) {
+            ((OutfitResultVO) outfitResult).setPath(minioUtil.getPresignedUrl(callbackDTO.getPath(), CommonConstants.MINIO_PATH_TIMEOUT));
+            String status;
+            switch(callbackDTO.getStatus()) {
+                case "ok":
+                    status = StatusEnum.RUNNING.name();
+                    break;
+                case "stop":
+                    status = StatusEnum.SUCCEEDED.name();
+                    break;
+                case "failed":
+                    status = StatusEnum.FAILED.name();
+                    break;
+                case "retrying":
+                    status = StatusEnum.PENDING.name();
+                    ((OutfitResultVO) outfitResult).setCreateTimeStamp(System.currentTimeMillis());
+                    ((OutfitResultVO) outfitResult).setPath(null);
+                    break;
+                default:
+                    log.error("outfit_id为{}，回调状态未知{}", requestId, callbackDTO.getStatus());
+                    status = "failed";
             }
 
-            if (StringUtil.isNullOrEmpty(callbackDTO.getOutfit_id())) {
-                log.error("回调参数中，outfit_id为空");
-                return;
-            }
-
-            String requestId = callbackDTO.getOutfit_id();
-
-            // 2. 获取outfit_id,查询数据库
-            String key = RedisURIConstants.outfitResultCache + requestId;
-            Object outfitResult = cacheUtil.getCache(key);
-            if (Objects.isNull(outfitResult)) {
-                log.error("未知搭配请求");
-                return;
-            }
-
-            // 3.更新path, items, 状态
-            // 由于数据变化较频繁，考虑存到redis
-            if (outfitResult instanceof OutfitResultVO) {
-                ((OutfitResultVO) outfitResult).setPath(minioUtil.getPresignedUrl(callbackDTO.getPath(), CommonConstants.MINIO_PATH_TIMEOUT));
-                String status = "ok".equals(callbackDTO.getStatus()) ? StatusEnum.RUNNING.name() : StatusEnum.SUCCEEDED.name();
-                ((OutfitResultVO) outfitResult).setStatus(status);
-                cacheUtil.setCache(key, outfitResult, RedisURIConstants.outfitResultTimeout);
-            }
+            ((OutfitResultVO) outfitResult).setStatus(status);
+            cacheUtil.setCache(key, outfitResult, RedisURIConstants.outfitResultTimeout);
         }
 
         // 生成结束或失败时更新数据库
         if ("stop".equals(callbackDTO.getStatus()) || "failed".equals(callbackDTO.getStatus())) {
-            String requestId = callbackDTO.getOutfit_id();
+//            String requestId = callbackDTO.getOutfit_id();
 
             LambdaQueryWrapper<Style> queryWrapper = new LambdaQueryWrapper<>();
             queryWrapper.eq(Style::getPythonRequestId, requestId);
@@ -198,6 +219,7 @@ public class StyleServiceImpl extends ServiceImpl<StyleMapper, Style> implements
     public List<OutfitResultVO> getOutfitResult(List<String> requestIDs) {
         ArrayList<OutfitResultVO> resultVOS = new ArrayList<>();
         ArrayList<String> reQueryIds = new ArrayList<>();
+        List<String> expiredIds = new ArrayList<>();
         // 优先从redis中获取结果，没有再从数据库中查询
         for (String requestID : requestIDs) {
             String key = RedisURIConstants.outfitResultCache + requestID;
@@ -207,7 +229,24 @@ public class StyleServiceImpl extends ServiceImpl<StyleMapper, Style> implements
                 reQueryIds.add(requestID);
                 continue;
             }
-            resultVOS.add((OutfitResultVO) outfit);
+
+            // 判断这条记录的状态是否为成功或者失败，否，判断这条记录的创建时间是否超过3分钟，否，继续往后，是，设置为失败并更新数据库
+            if (outfit instanceof OutfitResultVO) {
+                if ((((OutfitResultVO) outfit).getStatus().equals(StatusEnum.PENDING.name())
+                        || ((OutfitResultVO) outfit).getStatus().equals(StatusEnum.RUNNING.name()))
+                        && isExpired(((OutfitResultVO) outfit).getCreateTimeStamp())) {
+                    // 设置状态为失败
+                    ((OutfitResultVO) outfit).setStatus(StatusEnum.FAILED.name());
+                    // 更新redis和数据库状态
+                    expiredIds.add(requestID);
+                    cacheUtil.setCache(key, outfit, RedisURIConstants.outfitResultTimeout);
+                }
+                resultVOS.add((OutfitResultVO) outfit);
+            }
+        }
+
+        if (!expiredIds.isEmpty()) {
+            batchUpdateExpiredRecords(expiredIds);
         }
 
         if (!reQueryIds.isEmpty()) {
@@ -216,6 +255,7 @@ public class StyleServiceImpl extends ServiceImpl<StyleMapper, Style> implements
 
             List<Style> list = list(queryWrapper);
             if (!list.isEmpty()) {
+                // 在数据库中的数据，都是处于成功或失败的状态
                 for (Style style : list) {
                     OutfitResultVO outfitResultVO = new OutfitResultVO();
                     outfitResultVO.setId(style.getId());
@@ -232,6 +272,34 @@ public class StyleServiceImpl extends ServiceImpl<StyleMapper, Style> implements
         return resultVOS;
     }
 
+    // 3分钟的毫秒数
+    private static final long THREE_MINUTES_IN_MILLIS = 3 * 60 * 1000;
+
+    private boolean isExpired(long createTimeMillis) {
+        long currentTimeMillis = System.currentTimeMillis();
+        return (currentTimeMillis - createTimeMillis) >= THREE_MINUTES_IN_MILLIS;
+    }
+
+    private void batchUpdateExpiredRecords(List<String> expiredIds) {
+        try {
+            if (CollectionUtils.isEmpty(expiredIds)) {
+                return;
+            }
+
+            // 批量更新，减少数据库压力
+            lambdaUpdate()
+                    .in(Style::getPythonRequestId, expiredIds)
+                    .set(Style::getGenerationStatus, StatusEnum.FAILED.getCode())
+                    .set(Style::getUpdatedTime, LocalDateTime.now())
+                    .update();
+
+            log.info("批量更新过期记录为失败状态，数量：{}", expiredIds.size());
+
+        } catch (Exception e) {
+            log.error("批量更新过期记录失败", e);
+        }
+    }
+
     @Override
     public void setFavoriteStyle(Long styleId) {
         if (styleId == null) {
diff --git a/src/main/java/com/aida/lanecarford/vo/OutfitResultVO.java b/src/main/java/com/aida/lanecarford/vo/OutfitResultVO.java
index 4423f7f..e79f702 100644
--- a/src/main/java/com/aida/lanecarford/vo/OutfitResultVO.java
+++ b/src/main/java/com/aida/lanecarford/vo/OutfitResultVO.java
@@ -26,6 +26,8 @@ public class OutfitResultVO {
     )
     private String status;
 
+    private Long createTimeStamp;
+
     public OutfitResultVO(Long id, String requestId, String status) {
         this.id = id;
         this.requestId = requestId;

From 595c1eeaa84c156794d317851e440f94a8ab4d60 Mon Sep 17 00:00:00 2001
From: xupei <xupei3360@163.com>
Date: Tue, 30 Dec 2025 10:56:22 +0800
Subject: [PATCH 2/7] =?UTF-8?q?BUGFIX:=20=E6=B7=BB=E5=8A=A0retry=5Ffailed?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=EF=BC=8C=E4=B8=8D=E5=A4=84=E7=90=86failed?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lanecarford/dto/OutfitCallbackDTO.java    |  2 +-
 .../service/impl/StyleServiceImpl.java        | 29 ++++++++++---------
 2 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/src/main/java/com/aida/lanecarford/dto/OutfitCallbackDTO.java b/src/main/java/com/aida/lanecarford/dto/OutfitCallbackDTO.java
index f59056f..ed30c5b 100644
--- a/src/main/java/com/aida/lanecarford/dto/OutfitCallbackDTO.java
+++ b/src/main/java/com/aida/lanecarford/dto/OutfitCallbackDTO.java
@@ -10,7 +10,7 @@ public class OutfitCallbackDTO {
 
     private String outfit_id;
 
-    // 取值范围：ok || failed || stop || retrying
+    // 取值范围：ok || failed || stop || retrying || retry_failed
     private String status;
 
     private String path;
diff --git a/src/main/java/com/aida/lanecarford/service/impl/StyleServiceImpl.java b/src/main/java/com/aida/lanecarford/service/impl/StyleServiceImpl.java
index 7abde60..04dec06 100644
--- a/src/main/java/com/aida/lanecarford/service/impl/StyleServiceImpl.java
+++ b/src/main/java/com/aida/lanecarford/service/impl/StyleServiceImpl.java
@@ -27,7 +27,6 @@ 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;
@@ -130,18 +129,19 @@ public class StyleServiceImpl extends ServiceImpl<StyleMapper, Style> implements
 
     // 搭配完成后的回调通知处理
     public void callback(OutfitCallbackDTO callbackDTO) {
-        if (Objects.isNull(callbackDTO.getStatus())) {
+        if (Objects.isNull(callbackDTO.getStatus()) || callbackDTO.getStatus().equals("failed")) {
             return;
         }
 
         // 1. 判断path是否为空，是 -> 不做任何处理
-        if (!"retrying".equals(callbackDTO.getStatus())
-                && !"failed".equals(callbackDTO.getStatus())
-                && StringUtil.isNullOrEmpty(callbackDTO.getPath())) {
+        if (("ok".equals(callbackDTO.getStatus())
+                || "stop".equals(callbackDTO.getStatus()))
+                && StringUtils.isBlank(callbackDTO.getPath())) {
+            log.error("状态为ok || stop时，path为空");
             return;
         }
 
-        if (StringUtil.isNullOrEmpty(callbackDTO.getOutfit_id())) {
+        if (StringUtils.isBlank(callbackDTO.getOutfit_id())) {
             log.error("回调参数中，outfit_id为空");
             return;
         }
@@ -159,26 +159,27 @@ public class StyleServiceImpl extends ServiceImpl<StyleMapper, Style> implements
         // 3.更新path, items, 状态
         // 由于数据变化较频繁，考虑存到redis
         if (outfitResult instanceof OutfitResultVO) {
-            ((OutfitResultVO) outfitResult).setPath(minioUtil.getPresignedUrl(callbackDTO.getPath(), CommonConstants.MINIO_PATH_TIMEOUT));
             String status;
             switch(callbackDTO.getStatus()) {
                 case "ok":
                     status = StatusEnum.RUNNING.name();
+                    ((OutfitResultVO) outfitResult).setPath(minioUtil.getPresignedUrl(callbackDTO.getPath(), CommonConstants.MINIO_PATH_TIMEOUT));
                     break;
                 case "stop":
                     status = StatusEnum.SUCCEEDED.name();
-                    break;
-                case "failed":
-                    status = StatusEnum.FAILED.name();
+                    ((OutfitResultVO) outfitResult).setPath(minioUtil.getPresignedUrl(callbackDTO.getPath(), CommonConstants.MINIO_PATH_TIMEOUT));
                     break;
                 case "retrying":
                     status = StatusEnum.PENDING.name();
                     ((OutfitResultVO) outfitResult).setCreateTimeStamp(System.currentTimeMillis());
                     ((OutfitResultVO) outfitResult).setPath(null);
                     break;
+                case /*"failed",*/ "retry_failed":
+                    status = StatusEnum.FAILED.name();
+                    break;
                 default:
                     log.error("outfit_id为{}，回调状态未知{}", requestId, callbackDTO.getStatus());
-                    status = "failed";
+                    status = StatusEnum.FAILED.name();
             }
 
             ((OutfitResultVO) outfitResult).setStatus(status);
@@ -186,7 +187,9 @@ public class StyleServiceImpl extends ServiceImpl<StyleMapper, Style> implements
         }
 
         // 生成结束或失败时更新数据库
-        if ("stop".equals(callbackDTO.getStatus()) || "failed".equals(callbackDTO.getStatus())) {
+        if ("stop".equals(callbackDTO.getStatus())
+                /*|| "failed".equals(callbackDTO.getStatus())*/
+                || "retry_failed".equals(callbackDTO.getStatus())) {
 //            String requestId = callbackDTO.getOutfit_id();
 
             LambdaQueryWrapper<Style> queryWrapper = new LambdaQueryWrapper<>();
@@ -261,7 +264,7 @@ public class StyleServiceImpl extends ServiceImpl<StyleMapper, Style> implements
                     outfitResultVO.setId(style.getId());
                     outfitResultVO.setRequestId(style.getPythonRequestId());
                     outfitResultVO.setStatus(StatusEnum.of(style.getGenerationStatus()).name());
-                    if (!StringUtil.isNullOrEmpty(style.getStyleImageUrl())) {
+                    if (!StringUtils.isBlank(style.getStyleImageUrl())) {
                         outfitResultVO.setPath(minioUtil.getPresignedUrl(style.getStyleImageUrl(), CommonConstants.MINIO_PATH_TIMEOUT));
                     }
                     resultVOS.add(outfitResultVO);

From fd61c6b588f43cc1fd065cdfd4ede05d332bf45c Mon Sep 17 00:00:00 2001
From: xupei <xupei3360@163.com>
Date: Tue, 30 Dec 2025 11:33:53 +0800
Subject: [PATCH 3/7] =?UTF-8?q?TASK:=E4=BB=8E=E5=8E=86=E5=8F=B2=E5=86=8D?=
 =?UTF-8?q?=E6=AC=A1=E7=94=9F=E6=88=90outfit,=E6=B7=BB=E5=8A=A0checkInId?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../aida/lanecarford/controller/StyleController.java |  6 ++++--
 .../com/aida/lanecarford/service/StyleService.java   |  2 +-
 .../lanecarford/service/impl/StyleServiceImpl.java   | 12 ++++++++----
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/aida/lanecarford/controller/StyleController.java b/src/main/java/com/aida/lanecarford/controller/StyleController.java
index 4c975c6..45f7c71 100644
--- a/src/main/java/com/aida/lanecarford/controller/StyleController.java
+++ b/src/main/java/com/aida/lanecarford/controller/StyleController.java
@@ -109,8 +109,10 @@ public class StyleController {
     @GetMapping("/retrieveAndRegenerate")
     public ApiResponse<List<String>> retrieveAndRegenerate(
             @Parameter(description = "tryOn后的图片id", required = true, example = "1369")
-            @RequestParam Long tryOnEffectsId) {
-        return ApiResponse.success(styleService.retrieveAndRegenerate(tryOnEffectsId));
+            @RequestParam Long tryOnEffectsId,
+            @Parameter(description = "用户进店记录", required = true, example = "3")
+            @RequestParam Long checkInId ) {
+        return ApiResponse.success(styleService.retrieveAndRegenerate(tryOnEffectsId, checkInId));
     }
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/aida/lanecarford/service/StyleService.java b/src/main/java/com/aida/lanecarford/service/StyleService.java
index 9760b8d..c0835d1 100644
--- a/src/main/java/com/aida/lanecarford/service/StyleService.java
+++ b/src/main/java/com/aida/lanecarford/service/StyleService.java
@@ -31,6 +31,6 @@ public interface StyleService extends IService<Style> {
      */
     void cancelFavoriteStyle(Long styleId);
 
-    List<String> retrieveAndRegenerate(Long tryOnEffectsId);
+    List<String> retrieveAndRegenerate(Long tryOnEffectsId, Long checkInId);
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/aida/lanecarford/service/impl/StyleServiceImpl.java b/src/main/java/com/aida/lanecarford/service/impl/StyleServiceImpl.java
index 04dec06..8fd798b 100644
--- a/src/main/java/com/aida/lanecarford/service/impl/StyleServiceImpl.java
+++ b/src/main/java/com/aida/lanecarford/service/impl/StyleServiceImpl.java
@@ -362,7 +362,7 @@ public class StyleServiceImpl extends ServiceImpl<StyleMapper, Style> implements
         return sessionRecord;
     }
 
-    public List<String> retrieveAndRegenerate(Long tryOnEffectsId) {
+    public List<String> retrieveAndRegenerate(Long tryOnEffectsId, Long checkInId) {
         // 1. 判断id是否有效
         TryOnEffect tryOnEffect = tryOnEffectMapper.selectById(tryOnEffectsId);
         if (Objects.isNull(tryOnEffect)) {
@@ -373,6 +373,10 @@ public class StyleServiceImpl extends ServiceImpl<StyleMapper, Style> implements
             log.error("Id 为：{} 的tryOnEffects记录,没有style_id", tryOnEffectsId);
             throw new BusinessException("Cannot recreate outfit from past data.");
         }
+        if (Objects.isNull(checkInId)) {
+            log.error("checkInId 为空");
+            throw new BusinessException("'checkInId' cannot be empty");
+        }
 
         // 2. 组装参数
         Style style = baseMapper.selectById(tryOnEffect.getStyleId());
@@ -387,7 +391,7 @@ public class StyleServiceImpl extends ServiceImpl<StyleMapper, Style> implements
                 log.error("找不到Id 为：{} 的SessionRecord记录", outfitRequest.getSessionRecordId());
                 throw new BusinessException("Cannot recreate outfit from past data.");
             }
-            RequestOutfitDTO requestOutfitDTO = getRequestOutfitDTO(outfitRequest, sessionRecord);
+            RequestOutfitDTO requestOutfitDTO = getRequestOutfitDTO(outfitRequest, sessionRecord, checkInId);
 
             return requestOutfit(requestOutfitDTO);
         } else {
@@ -397,10 +401,10 @@ public class StyleServiceImpl extends ServiceImpl<StyleMapper, Style> implements
     }
 
     @NotNull
-    private static RequestOutfitDTO getRequestOutfitDTO(OutfitRequest outfitRequest, SessionRecord sessionRecord) {
+    private static RequestOutfitDTO getRequestOutfitDTO(OutfitRequest outfitRequest, SessionRecord sessionRecord, Long checkInId) {
         RequestOutfitDTO requestOutfitDTO = new RequestOutfitDTO();
         requestOutfitDTO.setCustomerId(outfitRequest.getCustomerId());
-        requestOutfitDTO.setCheckInId(outfitRequest.getVisitRecordId());
+        requestOutfitDTO.setCheckInId(checkInId);
         requestOutfitDTO.setStylist(outfitRequest.getStylist());
         requestOutfitDTO.setGender(outfitRequest.getGender());
         requestOutfitDTO.setNum(1);

From d7d0fc53fd95ad93aeba89a71853a86fb19ea3b9 Mon Sep 17 00:00:00 2001
From: xupei <xupei3360@163.com>
Date: Wed, 31 Dec 2025 09:59:41 +0800
Subject: [PATCH 4/7] =?UTF-8?q?TASK:=E6=96=B0=E5=A2=9E=E7=8A=B6=E6=80=81AL?=
 =?UTF-8?q?MOST=5FDONE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/aida/lanecarford/common/enums/StatusEnum.java | 5 ++++-
 .../aida/lanecarford/service/impl/StyleServiceImpl.java    | 7 ++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/aida/lanecarford/common/enums/StatusEnum.java b/src/main/java/com/aida/lanecarford/common/enums/StatusEnum.java
index f5efc29..0f29090 100644
--- a/src/main/java/com/aida/lanecarford/common/enums/StatusEnum.java
+++ b/src/main/java/com/aida/lanecarford/common/enums/StatusEnum.java
@@ -24,7 +24,10 @@ public enum StatusEnum {
     RUNNING(3),
 
     @Schema(description = "重试中")
-    RETRYING(4);
+    RETRYING(4),
+
+    @Schema(description = "生成即将结束")
+    ALMOST_DONE(5);
 
     private int code;
 
diff --git a/src/main/java/com/aida/lanecarford/service/impl/StyleServiceImpl.java b/src/main/java/com/aida/lanecarford/service/impl/StyleServiceImpl.java
index 8fd798b..23cc2ed 100644
--- a/src/main/java/com/aida/lanecarford/service/impl/StyleServiceImpl.java
+++ b/src/main/java/com/aida/lanecarford/service/impl/StyleServiceImpl.java
@@ -174,6 +174,10 @@ public class StyleServiceImpl extends ServiceImpl<StyleMapper, Style> implements
                     ((OutfitResultVO) outfitResult).setCreateTimeStamp(System.currentTimeMillis());
                     ((OutfitResultVO) outfitResult).setPath(null);
                     break;
+                case "almost_done":
+                    // 此时是没有更新path的
+                    status = StatusEnum.ALMOST_DONE.name();
+                    break;
                 case /*"failed",*/ "retry_failed":
                     status = StatusEnum.FAILED.name();
                     break;
@@ -236,7 +240,8 @@ public class StyleServiceImpl extends ServiceImpl<StyleMapper, Style> implements
             // 判断这条记录的状态是否为成功或者失败，否，判断这条记录的创建时间是否超过3分钟，否，继续往后，是，设置为失败并更新数据库
             if (outfit instanceof OutfitResultVO) {
                 if ((((OutfitResultVO) outfit).getStatus().equals(StatusEnum.PENDING.name())
-                        || ((OutfitResultVO) outfit).getStatus().equals(StatusEnum.RUNNING.name()))
+                        || ((OutfitResultVO) outfit).getStatus().equals(StatusEnum.RUNNING.name())
+                        || ((OutfitResultVO) outfit).getStatus().equals(StatusEnum.ALMOST_DONE.name()))
                         && isExpired(((OutfitResultVO) outfit).getCreateTimeStamp())) {
                     // 设置状态为失败
                     ((OutfitResultVO) outfit).setStatus(StatusEnum.FAILED.name());

From c376acfb2c3b67223f3b972045b67a64e97c5c0b Mon Sep 17 00:00:00 2001
From: xupei <xupei3360@163.com>
Date: Wed, 7 Jan 2026 13:25:29 +0800
Subject: [PATCH 5/7] =?UTF-8?q?TASK:=E6=96=B0=E5=A2=9E=E7=8A=B6=E6=80=81co?=
 =?UTF-8?q?ntinue?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/aida/lanecarford/service/impl/StyleServiceImpl.java   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/aida/lanecarford/service/impl/StyleServiceImpl.java b/src/main/java/com/aida/lanecarford/service/impl/StyleServiceImpl.java
index 23cc2ed..ffb105f 100644
--- a/src/main/java/com/aida/lanecarford/service/impl/StyleServiceImpl.java
+++ b/src/main/java/com/aida/lanecarford/service/impl/StyleServiceImpl.java
@@ -129,7 +129,9 @@ public class StyleServiceImpl extends ServiceImpl<StyleMapper, Style> implements
 
     // 搭配完成后的回调通知处理
     public void callback(OutfitCallbackDTO callbackDTO) {
-        if (Objects.isNull(callbackDTO.getStatus()) || callbackDTO.getStatus().equals("failed")) {
+        if (Objects.isNull(callbackDTO.getStatus())
+                || callbackDTO.getStatus().equals("failed")
+                || callbackDTO.getStatus().equals("continue")) {
             return;
         }
 

From 413e4cb7fb708e38cc3ef6989289d0ffac56e05b Mon Sep 17 00:00:00 2001
From: xupei <xupei3360@163.com>
Date: Tue, 13 Jan 2026 14:12:49 +0800
Subject: [PATCH 6/7] =?UTF-8?q?TASK:=E6=96=B0=E5=A2=9E=E8=AE=BE=E8=AE=A1?=
 =?UTF-8?q?=E5=B8=88=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/aida/lanecarford/common/enums/StylistPathEnum.java  | 6 +++++-
 .../com/aida/lanecarford/service/impl/StyleServiceImpl.java | 4 ++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/aida/lanecarford/common/enums/StylistPathEnum.java b/src/main/java/com/aida/lanecarford/common/enums/StylistPathEnum.java
index 4038c25..888f575 100644
--- a/src/main/java/com/aida/lanecarford/common/enums/StylistPathEnum.java
+++ b/src/main/java/com/aida/lanecarford/common/enums/StylistPathEnum.java
@@ -11,7 +11,11 @@ public enum StylistPathEnum {
 
     STYLIST_ONE("crystal", "lanecarford/stylist_guide/latest/crystal_en.md"),
 
-    STYLIST_TWO("mini", "lanecarford/stylist_guide/latest/mini_en.md");
+    STYLIST_TWO("mini", "lanecarford/stylist_guide/latest/mini_en.md"),
+
+    STYLIST_THREE("sera", "lanecarford/stylist_guide/latest/mini_en.md"),
+
+    STYLIST_FOUR("edi", "lanecarford/stylist_guide/latest/mini_en.md");
 
     private String name;
 
diff --git a/src/main/java/com/aida/lanecarford/service/impl/StyleServiceImpl.java b/src/main/java/com/aida/lanecarford/service/impl/StyleServiceImpl.java
index ffb105f..7690fa0 100644
--- a/src/main/java/com/aida/lanecarford/service/impl/StyleServiceImpl.java
+++ b/src/main/java/com/aida/lanecarford/service/impl/StyleServiceImpl.java
@@ -61,6 +61,10 @@ public class StyleServiceImpl extends ServiceImpl<StyleMapper, Style> implements
         // 请求需要顾客id, 生成的数量，风格
 
         StylistPathEnum stylistPathEnum = StylistPathEnum.of(requestOutfitDTO.getStylist());
+        if (Objects.isNull(stylistPathEnum)) {
+            log.error("未知设计师： {}",requestOutfitDTO.getStylist() );
+            stylistPathEnum = StylistPathEnum.STYLIST_ONE;
+        }
         Map<String, Object> params = setRequestOutfitParams(requestOutfitDTO, stylistPathEnum);
 
         SessionRecord sessionRecord = saveOrUpdateSession(requestOutfitDTO.getSessionId(), requestOutfitDTO.getCheckInId(), null, null);

From 8bc8bc08da851b2b818998551eba1f48b156285a Mon Sep 17 00:00:00 2001
From: xupei <xupei3360@163.com>
Date: Tue, 13 Jan 2026 14:49:45 +0800
Subject: [PATCH 7/7] =?UTF-8?q?TASK:=E4=BF=AE=E6=94=B9=E8=AE=BE=E8=AE=A1?=
 =?UTF-8?q?=E5=B8=88=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/aida/lanecarford/common/enums/StylistPathEnum.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/aida/lanecarford/common/enums/StylistPathEnum.java b/src/main/java/com/aida/lanecarford/common/enums/StylistPathEnum.java
index 888f575..c9833b5 100644
--- a/src/main/java/com/aida/lanecarford/common/enums/StylistPathEnum.java
+++ b/src/main/java/com/aida/lanecarford/common/enums/StylistPathEnum.java
@@ -13,7 +13,7 @@ public enum StylistPathEnum {
 
     STYLIST_TWO("mini", "lanecarford/stylist_guide/latest/mini_en.md"),
 
-    STYLIST_THREE("sera", "lanecarford/stylist_guide/latest/mini_en.md"),
+    STYLIST_THREE("vera", "lanecarford/stylist_guide/latest/mini_en.md"),
 
     STYLIST_FOUR("edi", "lanecarford/stylist_guide/latest/mini_en.md");