From bb5daf02be77811c946dcb502aa51b877105823d Mon Sep 17 00:00:00 2001
From: yys <47@gamerwa.com>
Date: Fri, 10 Apr 2026 12:03:00 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=20=E7=94=9F=E6=88=90=E8=A7=86=E9=A2=91?=
 =?UTF-8?q?=E3=80=81=E4=BB=BB=E5=8A=A1=E5=9B=9E=E8=B0=83=20-=20=E6=A3=80?=
 =?UTF-8?q?=E6=9F=A5=E4=BB=A3=E7=A0=81=E5=B9=B6=E4=BF=AE=E6=94=B9=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3=E9=80=BB=E8=BE=91=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/ruoyi/api/ByteApiController.java | 21 ++++++++++++++-----
 .../com/ruoyi/api/PortalVideoController.java  |  1 +
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/web-api/ruoyi-admin/src/main/java/com/ruoyi/api/ByteApiController.java b/web-api/ruoyi-admin/src/main/java/com/ruoyi/api/ByteApiController.java
index 0e173ea..349606b 100644
--- a/web-api/ruoyi-admin/src/main/java/com/ruoyi/api/ByteApiController.java
+++ b/web-api/ruoyi-admin/src/main/java/com/ruoyi/api/ByteApiController.java
@@ -432,12 +432,23 @@ public class ByteApiController extends BaseController {
     }
 
     private AjaxResult volcCallbackByteCheck(VideoTaskCallBackRequest request, GetVideoGenerationTaskResponse taskResp) {
-        String status = request.getStatus().toLowerCase();
+        String requestStatus = request.getStatus().toLowerCase();
+        String responseStatus = taskResp.getStatus().toLowerCase();
         // 请求的状态与字节的状态是否一致
-        if (!status.equals(taskResp.getStatus().toLowerCase())) {
-            logger.error("volcCallback request's status != official status! order third party order num = {}, request's status = {}, official status = {}",
-                    request.getId(), status, taskResp.getStatus());
-            return AjaxResult.error();
+        if (!requestStatus.equals(responseStatus)) {
+            // 如果推送的是队列中、执行中，但官方任务可能已进到下一步的状态，（时间差）此种情况不处理，等待后续推送
+            if (requestStatus.equals(VideoTaskStatusType.QUEUED.getName())
+                || requestStatus.equals(VideoTaskStatusType.RUNNING.getName())) {
+                logger.warn("volcCallback request's status != official status, no process! order third party order num = {}, request's status = {}, official status = {}",
+                        request.getId(), requestStatus, responseStatus);
+                // 防止再次推送
+                return AjaxResult.success();
+            } else  {
+                logger.error("volcCallback request's status != official status! order third party order num = {}, request's status = {}, official status = {}",
+                        request.getId(), requestStatus, responseStatus);
+                // 不再让对方二次推送
+                return AjaxResult.error();
+            }
         }
         return null;
     }
diff --git a/web-api/ruoyi-admin/src/main/java/com/ruoyi/api/PortalVideoController.java b/web-api/ruoyi-admin/src/main/java/com/ruoyi/api/PortalVideoController.java
index 22bce23..57fff94 100644
--- a/web-api/ruoyi-admin/src/main/java/com/ruoyi/api/PortalVideoController.java
+++ b/web-api/ruoyi-admin/src/main/java/com/ruoyi/api/PortalVideoController.java
@@ -192,6 +192,7 @@ public class PortalVideoController extends BaseController {
     private void fillVideoOrderRecord(AiOrder aiOrder, PortalVideoGenRequest req, String mode, ByteBodyReq body, String functionTypeResolved) {
         aiOrder.setText(req.getText());
         aiOrder.setMode(mode);
+        aiOrder.setIsBackfilled(0);
         applyOrderImages(aiOrder, req);
         if (req.getDuration() != null) {
             aiOrder.setDuration(req.getDuration());