diff --git a/src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java b/src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java index 0cd64ea8..ed3dbac8 100644 --- a/src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java @@ -297,8 +297,8 @@ public class GenerateServiceImpl extends ServiceImpl i if (!status.equals("Invalid")) { String accountId = taskId.substring(taskId.lastIndexOf("-") + 1); String uuid = taskId.substring(0, taskId.substring(0, taskId.lastIndexOf("-")).lastIndexOf("-")); - Boolean flag = creditsService.taskCreditsDeduction(Long.parseLong(accountId), taskId); - if (flag) creditsService.updateChangedCredits(accountId, taskId); + Boolean flag = creditsService.taskCreditsDeduction(Long.parseLong(accountId), uuid); + if (flag) creditsService.updateChangedCredits(accountId, uuid); } } @@ -564,7 +564,7 @@ public class GenerateServiceImpl extends ServiceImpl i // 校验后获取 generateThroughImageTextDTO.setGenerateType(generate.getGenerateType()); // creditsEventsEnum = CreditsEventsEnum.PATTERN; - creditsEventsEnum = CreditsEventsEnum.LOCAL_TEXT2IMG; + creditsEventsEnum = CreditsEventsEnum.PATTERN; // 模型迁移SD1.? -> flux,从而产生了不同模型的选择, // high -> 生成图片质量高,但生成速度慢,每次生成只返回一张图片 @@ -628,7 +628,7 @@ public class GenerateServiceImpl extends ServiceImpl i creditsEventsEnum = CreditsEventsEnum.LOGO; } } else if (generateThroughImageTextDTO.getLevel1Type().equals(MOOD_BOARD.getRealName())) { - creditsEventsEnum = CreditsEventsEnum.LOCAL_TEXT2IMG; + creditsEventsEnum = CreditsEventsEnum.MOOD_BOARD; if (!StringUtil.isNullOrEmpty(generateThroughImageTextDTO.getModelName()) && generateThroughImageTextDTO.getModelName().equals("high")){ creditsEventsEnum = CreditsEventsEnum.LOCAL_TEXT2IMG_HIGH; times = 1; @@ -674,13 +674,14 @@ public class GenerateServiceImpl extends ServiceImpl i // 5、将消息发布到MQ消息队列 rabbitMQService.publishMessageToGenerate(jsonString); - // update 积分扣除由按次收费改为按生成图片数量收费 - // 6、添加预扣除积分到redis - creditsService.addRecordToCreditsDeduction(generateThroughImageTextDTO.getUserId(), taskId, creditsEventsEnum); - // 6.1 添加积分扣除记录到db - creditsService.preInsert(generateThroughImageTextDTO.getUserId(), creditsEventsEnum.getName(), taskId, Boolean.TRUE, null); } + // update 积分扣除由按次收费改为按生成图片数量收费 --> 改回按次收费 + // 6、添加预扣除积分到redis + creditsService.addRecordToCreditsDeduction(generateThroughImageTextDTO.getUserId(), uuid, creditsEventsEnum); + // 6.1 添加积分扣除记录到db + creditsService.preInsert(generateThroughImageTextDTO.getUserId(), creditsEventsEnum.getName(), uuid, Boolean.TRUE, null); + // 7、返回唯一id return new PrepareForGenerateVO(taskIdList, 2); }