♻️ : 전월 기부금 추가

TEAMMatchDev · Jan 17, 2024 · 27b1341 · 27b1341
1 parent d2caae3
commit 27b1341
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/...h-Api/src/main/java/com/example/matchapi/admin/donation/service/AdminDonationService.java b/...h-Api/src/main/java/com/example/matchapi/admin/donation/service/AdminDonationService.java
@@ -63,6 +63,7 @@ public DonationRes.DonationInfo getDonationInfo() {
         int weekendDonationAmount = 0;
         int monthlyDonationAmount = 0;
         int totalDonationAmount = 0;
+        int beforeMonthRegularAmount = 0;
         for (DonationUser donationUser : donationUsers) {
             if(donationUser.getCreatedAt().isAfter(LocalDateTime.parse(localDate+FIRST_TIME))&&donationUser.getCreatedAt().isBefore(LocalDateTime.parse(localDate+LAST_TIME))){
                 oneDayDonationAmount += donationUser.getPrice();
@@ -73,10 +74,13 @@ public DonationRes.DonationInfo getDonationInfo() {
             if(donationUser.getCreatedAt().isAfter(LocalDateTime.parse(localDate.with(TemporalAdjusters.firstDayOfMonth())+FIRST_TIME))&&donationUser.getCreatedAt().isBefore( LocalDateTime.parse(localDate.with(TemporalAdjusters.lastDayOfMonth())+LAST_TIME))){
                 monthlyDonationAmount += donationUser.getPrice();
             }
+            if(donationUser.getCreatedAt().isAfter(LocalDateTime.parse(localDate.minusMonths(1)+FIRST_TIME))&&donationUser.getCreatedAt().isBefore(LocalDateTime.parse(localDate+LAST_TIME))){
+                beforeMonthRegularAmount += donationUser.getPrice();
+            }
             totalDonationAmount += donationUser.getPrice();
         }
 
-        return new DonationRes.DonationInfo(donationHelper.parsePriceComma(oneDayDonationAmount),donationHelper.parsePriceComma(weekendDonationAmount),donationHelper.parsePriceComma(monthlyDonationAmount), donationHelper.parsePriceComma(totalDonationAmount));
+        return new DonationRes.DonationInfo(donationHelper.parsePriceComma(oneDayDonationAmount),donationHelper.parsePriceComma(weekendDonationAmount),donationHelper.parsePriceComma(monthlyDonationAmount), donationHelper.parsePriceComma(totalDonationAmount), donationHelper.parsePriceComma(beforeMonthRegularAmount));
     }
 
     public DonationRes.DonationDetail getDonationDetail(Long donationId) {

diff --git a/Match-Api/src/main/java/com/example/matchapi/donation/dto/DonationRes.java b/Match-Api/src/main/java/com/example/matchapi/donation/dto/DonationRes.java
@@ -79,6 +79,8 @@ public static class DonationInfo {
         private String monthDonation;
 
         private String totalDonation;
+
+        private String beforeMonthDonation;
     }
 
     @Getter