From 9fc8f52acad1e9a18b34dd59f0d8dcd86b7862e9 Mon Sep 17 00:00:00 2001 From: xupei Date: Mon, 7 Jul 2025 18:32:14 +0800 Subject: [PATCH] =?UTF-8?q?BUGFIX:=201=E3=80=81=E5=AF=B9=E8=AF=9D=E5=8E=86?= =?UTF-8?q?=E5=8F=B2=E8=AE=B0=E5=BD=95=20=E6=9C=89=E7=9A=84=E5=9B=9E?= =?UTF-8?q?=E7=AD=94=E6=B2=A1=E6=9C=89=E6=B7=B1=E5=BA=A6=E6=80=9D=E8=80=83?= =?UTF-8?q?=E6=A0=87=E8=AF=86=202=E3=80=81=E6=89=B9=E9=87=8F=E7=94=9F?= =?UTF-8?q?=E6=88=90=EF=BC=8C=E7=A7=AF=E5=88=86=E6=89=A3=E9=99=A4=E4=B8=8D?= =?UTF-8?q?=E8=B6=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/ai/da/service/CreditsService.java | 2 ++ .../com/ai/da/service/impl/CreditsServiceImpl.java | 6 ++++++ .../java/com/ai/da/service/impl/DesignServiceImpl.java | 10 +++++----- .../java/com/ai/da/service/impl/LLMServiceImpl.java | 1 + 4 files changed, 14 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/ai/da/service/CreditsService.java b/src/main/java/com/ai/da/service/CreditsService.java index ab8ac126..aba4d027 100644 --- a/src/main/java/com/ai/da/service/CreditsService.java +++ b/src/main/java/com/ai/da/service/CreditsService.java @@ -33,6 +33,8 @@ public interface CreditsService extends IService { void addRecordToCreditsDeduction(Long accountId, String taskId, CreditsEventsEnum creditsEventsEnum); + void addRecordToCreditsDeduction(Long accountId, String taskId, CreditsEventsEnum creditsEventsEnum, Integer num); + Boolean taskCreditsDeduction(Long accountId, String taskId); CreditsDetail getByAccountIdAndChangeEvent(Long accountId, String changeEvent, String changedCredits); diff --git a/src/main/java/com/ai/da/service/impl/CreditsServiceImpl.java b/src/main/java/com/ai/da/service/impl/CreditsServiceImpl.java index b6ca3287..3f2c57e6 100644 --- a/src/main/java/com/ai/da/service/impl/CreditsServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/CreditsServiceImpl.java @@ -266,6 +266,12 @@ public class CreditsServiceImpl extends ServiceImpl impleme toProductImageResultMapper.insert(toProductImageResult); result.add(toProductImageResult); // 添加需要扣除的积分到预扣除区 - creditsService.addRecordToCreditsDeduction(userHolder.getId(), taskId, CreditsEventsEnum.TO_PRODUCT_IMAGE); + creditsService.addRecordToCreditsDeduction(userHolder.getId(), taskId, CreditsEventsEnum.TO_PRODUCT_IMAGE, cloudTaskDTO.getNums()); i ++; } pythonService.toProductImageBatch(batchTaskId, paramList, userHolder.getId().toString()); @@ -2083,7 +2083,7 @@ public class DesignServiceImpl extends ServiceImpl impleme toProductImageResultMapper.insert(toProductImageResult); result.add(toProductImageResult); // 添加需要扣除的积分到预扣除区 - creditsService.addRecordToCreditsDeduction(userHolder.getId(), taskId, CreditsEventsEnum.TO_PRODUCT_IMAGE); + creditsService.addRecordToCreditsDeduction(userHolder.getId(), taskId, CreditsEventsEnum.TO_PRODUCT_IMAGE, cloudTaskDTO.getNums()); i ++; } pythonService.toProductImageBatch(batchTaskId, paramList, userHolder.getId().toString()); @@ -2208,7 +2208,7 @@ public class DesignServiceImpl extends ServiceImpl impleme result.add(toProductImageResult); // 添加需要扣除的积分到预扣除区 - creditsService.addRecordToCreditsDeduction(userHolder.getId(), taskId, CreditsEventsEnum.RELIGHT); + creditsService.addRecordToCreditsDeduction(userHolder.getId(), taskId, CreditsEventsEnum.RELIGHT, cloudTaskDTO.getNums()); i ++; } // 走模型 @@ -2251,7 +2251,7 @@ public class DesignServiceImpl extends ServiceImpl impleme result.add(toProductImageResult); // 添加需要扣除的积分到预扣除区 - creditsService.addRecordToCreditsDeduction(userHolder.getId(), taskId, CreditsEventsEnum.RELIGHT); + creditsService.addRecordToCreditsDeduction(userHolder.getId(), taskId, CreditsEventsEnum.RELIGHT, cloudTaskDTO.getNums()); i ++; } // 走模型 @@ -2325,7 +2325,7 @@ public class DesignServiceImpl extends ServiceImpl impleme Boolean b = pythonService.poseTransformationBatch(poseTransformBatchDTO.getProductImage(), poseTransformBatchDTO.getPoseId(), taskId); if (b){ // 6、添加预扣除积分到redis - creditsService.addRecordToCreditsDeduction(accountId, uuid, creditsEventsEnum); + creditsService.addRecordToCreditsDeduction(accountId, uuid, creditsEventsEnum, cloudTaskDTO.getNums()); // 6.1 添加积分扣除记录到db creditsService.preInsert(accountId, creditsEventsEnum.getName(), uuid, Boolean.TRUE, null); }else { diff --git a/src/main/java/com/ai/da/service/impl/LLMServiceImpl.java b/src/main/java/com/ai/da/service/impl/LLMServiceImpl.java index 8bb8e980..e87c2291 100644 --- a/src/main/java/com/ai/da/service/impl/LLMServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/LLMServiceImpl.java @@ -353,6 +353,7 @@ public class LLMServiceImpl implements LLMService { chatMessageMapper.insert(systemMessage); systemMessage.setId(null); responseContentBuilder = new StringBuilder(); + contentType = null; } String toolsName = json.getString("tools_name"); JSONObject toolsData = json.getJSONObject("content");