chenbiao 2 anni fa
parent
commit
a011c72263

+ 2 - 2
midjourney/src/main/java/com/yhlxj/service/midjourney/impl/MidjourneyServiceImpl.java

@@ -732,7 +732,7 @@ public class MidjourneyServiceImpl implements MidjourneyService {
                 if ("SUCCESS".equals(dbConversation.getStatus()) || "FAILURE".equals(dbConversation.getStatus())) {
                     return;
                 }
-                if (conversation.getProgressNum() <= dbConversation.getProgressNum()){
+                if (conversation.getProgressNum() <= dbConversation.getProgressNum() && !conversation.getStatus().equals("FAILURE")){
                     return;
                 }
                 conversation.setId(dbConversation.getId());
@@ -749,7 +749,7 @@ public class MidjourneyServiceImpl implements MidjourneyService {
                 //    }
                 //});
                 //失败返还次数
-                if ("FAILURE".equals(conversation.getStatus())){
+                if ("FAILURE".equals(conversation.getStatus()) && !dbConversation.getStatus().equals("MODEL")){
                     if (StringUtils.equals("未知频道",conversation.getFailReason())) {
                         redisService.hdel(RedisService.key.MIDJOURNEY_ACCOUNT.getName(),dbConversation.getInstanceId().toString());
                         String finalAccountWithMinUsage = dbConversation.getInstanceId().toString();