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<>();