资产记录区分平台

src/main/java/com/izouma/nineth/repo/AssetRepo.java

@@ -30,6 +30,8 @@ public interface AssetRepo extends JpaRepository<Asset, Long>, JpaSpecificationE
 
     List<Asset> findByTokenIdIn(Iterable<String> tokenId);
 
+    List<Asset> findByTokenIdInAndProjectId(Iterable<String> tokenId, int projectId);
+
     List<Asset> findByTokenIdOrderByCreatedAt(String tokenId);
 
     List<Asset> findByOrderId(Long orderId);

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

@@ -345,10 +345,10 @@ public class AssetService {
         });
     }
 
-    public Page<UserHistory> userHistory(Long userId, Pageable pageable) {
+    public Page<UserHistory> userHistory(Long userId, Pageable pageable, int projectId) {
         Page<TokenHistory> page = tokenHistoryRepo.userHistory(userId, pageable);
         Set<String> tokenIds = page.stream().map(TokenHistory::getTokenId).collect(Collectors.toSet());
-        List<Asset> assets = tokenIds.isEmpty() ? new ArrayList<>() : assetRepo.findByTokenIdIn(tokenIds);
+        List<Asset> assets = tokenIds.isEmpty() ? new ArrayList<>() : assetRepo.findByTokenIdInAndProjectId(tokenIds, projectId);
         return page.map(tokenHistory -> {
             UserHistory userHistory = new UserHistory();
             BeanUtils.copyProperties(tokenHistory, userHistory);

src/main/java/com/izouma/nineth/web/AssetController.java

@@ -115,8 +115,8 @@ public class AssetController extends BaseController {
 
     @GetMapping("/userHistory")
     @ApiOperation("交易历史")
-    public Page<UserHistory> userHistory(Pageable pageable) {
-        return assetService.userHistory(SecurityUtils.getAuthenticatedUser().getId(), pageable);
+    public Page<UserHistory> userHistory(Pageable pageable, int projectId) {
+        return assetService.userHistory(SecurityUtils.getAuthenticatedUser().getId(), pageable, projectId);
     }
 
     @PostMapping("/holdQuery")