fix: Donate历史

backend/src/main/java/com/openisle/dto/PostChangeLogDto.java

@@ -29,4 +29,5 @@ public class PostChangeLogDto {
   private LocalDateTime newPinnedAt;
   private Boolean oldFeatured;
   private Boolean newFeatured;
+  private Integer amount;
 }

backend/src/main/java/com/openisle/mapper/PostChangeLogMapper.java

@@ -52,6 +52,8 @@ public class PostChangeLogMapper {
     } else if (log instanceof PostFeaturedChangeLog f) {
       dto.setOldFeatured(f.isOldFeatured());
       dto.setNewFeatured(f.isNewFeatured());
+    } else if (log instanceof PostDonateChangeLog d) {
+      dto.setAmount(d.getAmount());
     }
     return dto;
   }

backend/src/main/java/com/openisle/model/PostChangeType.java

@@ -10,4 +10,5 @@ public enum PostChangeType {
   FEATURED,
   VOTE_RESULT,
   LOTTERY_RESULT,
+  DONATE,
 }

backend/src/main/java/com/openisle/model/PostDonateChangeLog.java

@@ -0,0 +1,19 @@
+package com.openisle.model;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+@Getter
+@Setter
+@NoArgsConstructor
+@Entity
+@Table(name = "post_donate_change_logs")
+public class PostDonateChangeLog extends PostChangeLog {
+
+  @Column(nullable = false)
+  private int amount;
+}

backend/src/main/java/com/openisle/service/PointService.java

@@ -25,6 +25,7 @@ public class PointService {
   private final CommentRepository commentRepository;
   private final PointHistoryRepository pointHistoryRepository;
   private final NotificationService notificationService;
+  private final PostChangeLogService postChangeLogService;
 
   public int awardForPost(String userName, Long postId) {
     User user = userRepository.findByUsername(userName).orElseThrow();
@@ -304,6 +305,7 @@ public class PointService {
       null,
       String.valueOf(amount)
     );
+    postChangeLogService.recordDonation(post, donor, amount);
     DonationResponse response = buildDonationResponse(post);
     response.setBalance(donor.getPoint());
     return response;
@@ -322,19 +324,38 @@ public class PointService {
       );
     List<DonationDto> donations = histories
       .stream()
-      .map(history -> {
+      .collect(Collectors.collectingAndThen(Collectors.toMap(
-        DonationDto dto = new DonationDto();
+          history -> {
-        User donor = history.getFromUser();
+            User donor = history.getFromUser();
-        if (donor != null) {
+            if (donor != null && donor.getId() != null) {
-          dto.setUserId(donor.getId());
+              return "user:" + donor.getId();
-          dto.setUsername(donor.getUsername());
+            }
-          dto.setAvatar(donor.getAvatar());
+            return "history:" + history.getId();
-        }
+          },
-        dto.setAmount(history.getAmount());
+          history -> {
-        dto.setCreatedAt(history.getCreatedAt());
+            DonationDto dto = new DonationDto();
-        return dto;
+            User donor = history.getFromUser();
-      })
+            if (donor != null) {
-      .collect(Collectors.toList());
+              dto.setUserId(donor.getId());
+              dto.setUsername(donor.getUsername());
+              dto.setAvatar(donor.getAvatar());
+            }
+            dto.setAmount(history.getAmount());
+            dto.setCreatedAt(history.getCreatedAt());
+            return dto;
+          },
+          (left, right) -> {
+            left.setAmount(left.getAmount() + right.getAmount());
+            if (
+              left.getCreatedAt() == null ||
+              (right.getCreatedAt() != null && right.getCreatedAt().isAfter(left.getCreatedAt()))
+            ) {
+              left.setCreatedAt(right.getCreatedAt());
+            }
+            return left;
+          },
+          java.util.LinkedHashMap::new
+        ), map -> new java.util.ArrayList<>(map.values())));
     Long total = pointHistoryRepository.sumAmountByPostAndType(
       post,
       PointHistoryType.DONATE_RECEIVED

backend/src/main/java/com/openisle/service/PostChangeLogService.java

@@ -115,6 +115,15 @@ public class PostChangeLogService {
     logRepository.save(log);
   }
 
+  public void recordDonation(Post post, User donor, int amount) {
+    PostDonateChangeLog log = new PostDonateChangeLog();
+    log.setPost(post);
+    log.setUser(donor);
+    log.setType(PostChangeType.DONATE);
+    log.setAmount(amount);
+    logRepository.save(log);
+  }
+
   public void deleteLogsForPost(Post post) {
     logRepository.deleteByPost(post);
   }

frontend_nuxt/components/PostChangeLogItem.vue

@@ -42,6 +42,9 @@
       <span v-else-if="log.type === 'LOTTERY_RESULT'" class="change-log-content"
         >系统已「精密计算」抽奖结果 (=ﾟωﾟ)ﾉ</span
       >
+      <span v-else-if="log.type === 'DONATE'" class="change-log-content"
+        >为文章打赏了 {{ log.amount ?? 0 }} 积分</span
+      >
     </div>
     <div class="change-log-time">{{ log.time }}</div>
     <div

frontend_nuxt/pages/posts/[id]/index.vue

@@ -412,6 +412,8 @@ const changeLogIcon = (l) => {
     return 'check-one'
   } else if (l.type === 'LOTTERY_RESULT') {
     return 'gift'
+  } else if (l.type === 'DONATE') {
+    return 'financing'
   } else {
     return 'info'
   }
@@ -436,6 +438,7 @@ const mapChangeLog = (l) => ({
   newCategory: l.newCategory,
   oldTags: l.oldTags,
   newTags: l.newTags,
+  amount: l.amount,
   icon: changeLogIcon(l),
 })