Ver Fonte

调整叠加逻辑

sunkean há 3 anos atrás
pai
commit
bdfed15d81

+ 5 - 1
src/main/java/com/izouma/nineth/repo/AssetSuperimpositionRepo.java

@@ -7,7 +7,11 @@ import org.springframework.data.jpa.repository.Query;
 
 import java.util.List;
 
-public interface AssetSuperimpositionRepo extends JpaRepository<AssetSuperimposition, Long>, JpaSpecificationExecutor<AssetSuperimposition> { ;
+public interface AssetSuperimpositionRepo extends JpaRepository<AssetSuperimposition, Long>, JpaSpecificationExecutor<AssetSuperimposition> {
+
+    List<AssetSuperimposition> findByUserId(Long userId);
+
+    void deleteByUserId(Long userId);
     @Query(value = "SELECT " +
             "  a.id, " +
             "  'NORMAL' asset_status, " +

+ 4 - 3
src/main/java/com/izouma/nineth/service/AssetSuperimpositionService.java

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