|
|
@@ -11,6 +11,7 @@ import com.izouma.nineth.repo.AssetSuperimpositionRepo;
|
|
|
import com.izouma.nineth.utils.JpaUtils;
|
|
|
import lombok.AllArgsConstructor;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
+import org.apache.commons.collections.CollectionUtils;
|
|
|
import org.springframework.data.domain.Page;
|
|
|
import org.springframework.scheduling.annotation.Async;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
@@ -72,9 +73,9 @@ public class AssetSuperimpositionService {
|
|
|
// 查询非盲盒数量
|
|
|
List<AssetSuperimposition> notBlindBoxAssets = assetSuperimpositionRepo.find(userId);
|
|
|
assetSuperimpositions.addAll(notBlindBoxAssets);
|
|
|
- AssetSuperimposition isExist = assetSuperimpositionRepo.findById(userId).orElse(null);
|
|
|
- if (Objects.nonNull(isExist)) {
|
|
|
- assetSuperimpositionRepo.deleteById(userId);
|
|
|
+ List<AssetSuperimposition> isExist = assetSuperimpositionRepo.findByUserId(userId);
|
|
|
+ if (CollectionUtils.isNotEmpty(isExist)) {
|
|
|
+ assetSuperimpositionRepo.deleteByUserId(userId);
|
|
|
}
|
|
|
assetSuperimpositions.forEach(this::setAssetStatus);
|
|
|
log.info(JSONObject.toJSONString(assetSuperimpositions), true);
|