交易历史

src/main/java/com/izouma/nineth/service/AssetService.java

@@ -380,14 +380,17 @@ public class AssetService {
         Page<TokenHistory> page = tokenHistoryRepo.findAll(((root, criteriaQuery, criteriaBuilder) -> {
             List<Predicate> and = JpaUtils.toPredicates(pageQuery, TokenHistory.class, root, criteriaQuery, criteriaBuilder);
             Map<String, Object> query = pageQuery.getQuery();
-            if (ObjectUtils.isEmpty(query.get("toUserId"))) {
-                and.add(criteriaBuilder.and(criteriaBuilder.equal(root.get("toUserId"), userId)));
-            }
-            if (ObjectUtils.isEmpty(query.get("fromUserId"))) {
-                and.add(criteriaBuilder.and(criteriaBuilder.equal(root.get("fromUserId"), userId)));
+            if (ObjectUtils.isEmpty(query.get("toUserId")) && ObjectUtils.isEmpty(query.get("fromUserId"))) {
+                and.add(criteriaBuilder.or(criteriaBuilder.equal(root.get("toUserId"), userId), criteriaBuilder.equal(root.get("fromUserId"), userId)));
+            } else {
+                if (ObjectUtils.isNotEmpty(query.get("toUserId"))) {
+                    and.add(criteriaBuilder.and(criteriaBuilder.equal(root.get("toUserId"), userId)));
+                } else {
+                    and.add(criteriaBuilder.and(criteriaBuilder.equal(root.get("fromUserId"), userId)));
+                }
             }
             return criteriaBuilder.and(and.toArray(new Predicate[0]));
-        }),JpaUtils.toPageRequest(pageQuery));
+        }), JpaUtils.toPageRequest(pageQuery));
 
         Set<String> tokenIds = page.stream().map(TokenHistory::getTokenId).collect(Collectors.toSet());
         List<Asset> assets = tokenIds.isEmpty() ? new ArrayList<>() : assetRepo.findByTokenIdIn(tokenIds);
@@ -426,12 +429,10 @@ public class AssetService {
     public Map<String, BigDecimal> userHistory(Long userId) {
         List<TokenHistory> page = tokenHistoryRepo.userHistory(userId);
         Set<String> tokenIds = page.stream().map(TokenHistory::getTokenId).collect(Collectors.toSet());
-        List<Asset> assets = tokenIds.isEmpty() ? new ArrayList<>() : assetRepo.findByTokenIdIn(tokenIds);
         BigDecimal sales = BigDecimal.ZERO;
         BigDecimal buy = BigDecimal.ZERO;
         page.stream().map(tokenHistory -> {
-            Optional<Asset> asset = assets.stream().filter(a -> a.getTokenId().equals(tokenHistory.getTokenId()))
-                    .findAny();
+
 
 //            switch (tokenHistory.getOperation()) {
 //                case "出售":

src/main/java/com/izouma/nineth/service/CollectionService.java

@@ -60,21 +60,21 @@ public class CollectionService {
 
     private final Map<Long, ScheduledFuture<?>> tasks = new HashMap<>();
 
-    @PostConstruct
-    public void init() {
-        List<Collection> collections = collectionRepo.findByScheduleSaleTrueAndOnShelfFalseAndStartTimeBeforeAndDelFalse(LocalDateTime.now());
-        for (Collection collection : collections) {
-            onShelfTask(collection);
-        }
-        for (CollectionStockAndSale collection : collectionRepo.getStockAndSale()) {
-            if (redisTemplate.opsForValue().get("collectionStock::" + collection.getId()) == null) {
-                redisTemplate.opsForValue().set("collectionStock::" + collection.getId(), collection.getStock());
-            }
-            if (redisTemplate.opsForValue().get("collectionSale::" + collection.getId()) == null) {
-                redisTemplate.opsForValue().set("collectionSale::" + collection.getId(), collection.getSale());
-            }
-        }
-    }
+//    @PostConstruct
+//    public void init() {
+//        List<Collection> collections = collectionRepo.findByScheduleSaleTrueAndOnShelfFalseAndStartTimeBeforeAndDelFalse(LocalDateTime.now());
+//        for (Collection collection : collections) {
+//            onShelfTask(collection);
+//        }
+//        for (CollectionStockAndSale collection : collectionRepo.getStockAndSale()) {
+//            if (redisTemplate.opsForValue().get("collectionStock::" + collection.getId()) == null) {
+//                redisTemplate.opsForValue().set("collectionStock::" + collection.getId(), collection.getStock());
+//            }
+//            if (redisTemplate.opsForValue().get("collectionSale::" + collection.getId()) == null) {
+//                redisTemplate.opsForValue().set("collectionSale::" + collection.getId(), collection.getSale());
+//            }
+//        }
+//    }
 
     public Page<Collection> all(PageQuery pageQuery) {
         pageQuery.getQuery().put("del", false);