From 9c6573f1a67d438eada5d7477fc3328191583c0f Mon Sep 17 00:00:00 2001 From: xupei Date: Fri, 22 Aug 2025 15:27:09 +0800 Subject: [PATCH] =?UTF-8?q?BUGFIX:=E5=88=A0=E9=99=A4library=E5=85=83?= =?UTF-8?q?=E7=B4=A0=E6=97=B6=E6=B2=A1=E6=9C=89=E5=B0=86brand=E4=B8=AD?= =?UTF-8?q?=E5=85=B3=E8=81=94=E7=9A=84=E6=95=B0=E6=8D=AE=E5=88=A0=E9=99=A4?= =?UTF-8?q?=EF=BC=8C=E5=AF=BC=E8=87=B4=E5=87=BA=E7=8E=B0=E7=A9=BA=E6=8C=87?= =?UTF-8?q?=E9=92=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ai/da/service/impl/AccountServiceImpl.java | 1 + .../java/com/ai/da/service/impl/LibraryServiceImpl.java | 6 ++++++ .../com/ai/da/service/impl/ProductImageServiceImpl.java | 5 ++++- 3 files changed, 11 insertions(+), 1 deletion(-) 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 7275b9ca..35f59a88 100644 --- a/src/main/java/com/ai/da/service/impl/AccountServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/AccountServiceImpl.java @@ -2478,6 +2478,7 @@ public class AccountServiceImpl extends ServiceImpl impl if (returnCredits && unusedCreditsTotal.compareTo(BigDecimal.ZERO) != 0){ BigDecimal subtracted = adminAcc.getCreditsUsage().subtract(unusedCreditsTotal); adminAcc.setCreditsUsage(subtracted.compareTo(BigDecimal.ZERO) < 0 ? BigDecimal.ZERO : subtracted); + adminAcc.setCredits(adminAcc.getCreditsUsageLimit().subtract(adminAcc.getCreditsUsage())); adminAcc.setUpdateDate(new Date()); baseMapper.updateById(adminAcc); } diff --git a/src/main/java/com/ai/da/service/impl/LibraryServiceImpl.java b/src/main/java/com/ai/da/service/impl/LibraryServiceImpl.java index 1bc0e725..40bcfedb 100644 --- a/src/main/java/com/ai/da/service/impl/LibraryServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/LibraryServiceImpl.java @@ -554,6 +554,12 @@ public class LibraryServiceImpl extends ServiceImpl impl deleteDTO.getTimeZone() ); } + + // 判断当前libraryId是否被brand_rel_library引用 + QueryWrapper brandRelLibraryQueryWrapper = new QueryWrapper<>(); + brandRelLibraryQueryWrapper.lambda().in(BrandRelLibrary::getLibraryId, deleteDTO.getLibraryIds()); + + brandRelLibraryMapper.delete(brandRelLibraryQueryWrapper); // for (Library library : librarys) { // if (library.getUrl().startsWith(sysImage)) { // continue; diff --git a/src/main/java/com/ai/da/service/impl/ProductImageServiceImpl.java b/src/main/java/com/ai/da/service/impl/ProductImageServiceImpl.java index be1e5c63..e3fca190 100644 --- a/src/main/java/com/ai/da/service/impl/ProductImageServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/ProductImageServiceImpl.java @@ -22,11 +22,11 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.scheduling.annotation.Async; -import org.springframework.stereotype.Component; import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.List; +import java.util.Objects; import java.util.Set; import java.util.UUID; import java.util.stream.Collectors; @@ -71,6 +71,9 @@ public class ProductImageServiceImpl implements ProductImageService { int current = 0; for (Long libraryId : libraryIds) { Library library = libraryMapper.selectById(libraryId); + if (Objects.isNull(library)){ + continue; + } String url = library.getUrl(); QueryWrapper qw = new QueryWrapper<>();