From 126ac209c64305169417e87e3ea7ad0040460c80 Mon Sep 17 00:00:00 2001 From: xupei Date: Wed, 27 Aug 2025 14:15:58 +0800 Subject: [PATCH] =?UTF-8?q?BUGFIX:=E6=99=AE=E9=80=9A=E7=94=9F=E6=88=90?= =?UTF-8?q?=E7=A7=AF=E5=88=86=E6=89=A3=E9=99=A4=E6=9C=89=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../da/common/RabbitMQ/GenerateConsumer.java | 7 ------ .../com/ai/da/service/AccountService.java | 2 +- .../da/service/impl/AccountServiceImpl.java | 24 +++++++++---------- .../da/service/impl/CreditsServiceImpl.java | 14 ++++++----- .../da/service/impl/GenerateServiceImpl.java | 5 ++-- 5 files changed, 23 insertions(+), 29 deletions(-) diff --git a/src/main/java/com/ai/da/common/RabbitMQ/GenerateConsumer.java b/src/main/java/com/ai/da/common/RabbitMQ/GenerateConsumer.java index 3e0a6e9a..a48e781f 100644 --- a/src/main/java/com/ai/da/common/RabbitMQ/GenerateConsumer.java +++ b/src/main/java/com/ai/da/common/RabbitMQ/GenerateConsumer.java @@ -150,13 +150,6 @@ public class GenerateConsumer { // 存redis redisUtil.addToMap(exceptionMapKey, exceptionInfo); } - } catch (BusinessException e){ - log.error(e.getMsg()); - try { - channel.basicAck(msg.getMessageProperties().getDeliveryTag(), false); - } catch (IOException exception) { - log.error("手动确认，取消返回队列，不再重新消费"); - } } catch (Exception e) { log.error(e.getMessage()); try { diff --git a/src/main/java/com/ai/da/service/AccountService.java b/src/main/java/com/ai/da/service/AccountService.java index bfb792e3..36a0e582 100644 --- a/src/main/java/com/ai/da/service/AccountService.java +++ b/src/main/java/com/ai/da/service/AccountService.java @@ -141,7 +141,7 @@ public interface AccountService extends IService { void moveLibraryDate(); - void updateCreditsAndEndTime(Long accountId, String value, Long endTime, BigDecimal creditsUsage); + void updateCreditsAndEndTime(Account account, String value, Long endTime, BigDecimal creditsUsage); Boolean designWorksRegister(AccountDesignWorksRegisterDTO accountDesignWorksRegisterDTO); diff --git a/src/main/java/com/ai/da/service/impl/AccountServiceImpl.java b/src/main/java/com/ai/da/service/impl/AccountServiceImpl.java index 1682b4c1..9b86d8e0 100644 --- a/src/main/java/com/ai/da/service/impl/AccountServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/AccountServiceImpl.java @@ -1146,24 +1146,24 @@ public class AccountServiceImpl extends ServiceImpl impl // 未迁移过的进行迁移，注意模特数据迁移打点信息以及转换模特格式 } - public void updateCreditsAndEndTime(Long accountId, String value, Long endTime, BigDecimal creditsUsage) { - Account account = new Account(); - account.setId(accountId); - account.setCredits(new BigDecimal(value)); + public void updateCreditsAndEndTime(Account account, String value, Long endTime, BigDecimal creditsUsage) { + Account updateAcc = new Account(); + updateAcc.setId(account.getId()); + updateAcc.setCredits(new BigDecimal(value)); if (Objects.nonNull(endTime)){ - account.setValidEndTime(toDayEnd(endTime)); + updateAcc.setValidEndTime(toDayEnd(endTime)); } if (Objects.nonNull(creditsUsage)){ // 机构的积分使用量不会超过上限 - if (creditsUsage.compareTo(account.getCreditsUsageLimit()) > 0){ - account.setCreditsUsage(account.getCreditsUsageLimit()); + BigDecimal creditsUsageLimit = Objects.isNull(account.getCreditsUsageLimit()) ? BigDecimal.ZERO : account.getCreditsUsageLimit(); + if (creditsUsage.compareTo(creditsUsageLimit) > 0){ + updateAcc.setCreditsUsage(creditsUsageLimit); } else { - account.setCreditsUsage(creditsUsage); + updateAcc.setCreditsUsage(creditsUsage); } } - account.setUpdateDate(new Date()); - int i = accountMapper.updateById(account); - log.info("更新用户信息，影响条数：{}，用户信息：{}", i, JSON.toJSON(account)); + updateAcc.setUpdateDate(new Date()); + int i = accountMapper.updateById(updateAcc); } @Override @@ -1594,7 +1594,7 @@ public class AccountServiceImpl extends ServiceImpl impl // 3.3、更新 t_account 表 if (account.getValidEndTime() != null && account.getValidEndTime() < 1720972799000L){ - updateCreditsAndEndTime(account.getId(), added.toString(), 1720972799000L, null); + updateCreditsAndEndTime(account, added.toString(), 1720972799000L, null); } } 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 b0f5c6ca..663446e1 100644 --- a/src/main/java/com/ai/da/service/impl/CreditsServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/CreditsServiceImpl.java @@ -47,10 +47,11 @@ public class CreditsServiceImpl extends ServiceImpl i generateDetail.setCreateDate(LocalDateTime.now()); generateDetail.setMd5(md5); // 将相应的url保存到数据库 - int insert = generateDetailMapper.insert(generateDetail); - log.info("添加 {} 条数据到t_generate_detail", insert); + generateDetailMapper.insert(generateDetail); // String uuid = taskId.substring(0, taskId.substring(0, taskId.lastIndexOf("-")).lastIndexOf("-")); String key = generateResultKey + ":" + taskId; @@ -1251,7 +1250,7 @@ public class GenerateServiceImpl extends ServiceImpl i creditsUsage = Objects.isNull(account.getCreditsUsage()) ? BigDecimal.ZERO : account.getCreditsUsage(); creditsUsage = creditsUsage.add(new BigDecimal(event.getValue())); } - accountService.updateCreditsAndEndTime(accountId, subtract.toString(), null, creditsUsage); + accountService.updateCreditsAndEndTime(account, subtract.toString(), null, creditsUsage); creditsService.preInsert(accountId, event.getName(), null, Boolean.FALSE, event.getValue()); }