Merge pull request #273 from sharemindteam/fix/270-counselor-payment

fix: 마인더 수익 관리 dto 필드 오류 수정
sharemindteam · Oct 31, 2024 · ea75121 · ea75121
2 parents d46bdf9 + b1d788e
commit ea75121
Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/src/main/java/com/example/sharemind/payment/application/PaymentServiceImpl.java b/src/main/java/com/example/sharemind/payment/application/PaymentServiceImpl.java
@@ -139,14 +139,13 @@ public PaymentGetCounselorResponses getPaymentsByCounselor(Long paymentId, Strin
         }
 
         Pageable pageable = PageRequest.of(DEFAULT_PAGE_NUMBER, PAYMENT_COUNSELOR_PAGE_SIZE);
-        Long finalTotal = total;
         Page<PaymentGetCounselorResponse> page =
                 (paymentId == 0 ?
                         paymentRepository.findAllByCounselorAndCounselorStatusAndUpdatedAtIsBefore(
                                 counselor, counselorStatus, sortTime, pageable) :
                         paymentRepository.findAllByPaymentIdLessThanAndCounselorAndCounselorStatusAndUpdatedAtIsBefore(
                                 paymentId, counselor, counselorStatus, sortTime, pageable))
-                        .map(payment -> PaymentGetCounselorResponse.of(payment, finalTotal));
+                        .map(PaymentGetCounselorResponse::of);
 
         return PaymentGetCounselorResponses.of(total, page.getContent());
     }

diff --git a/src/main/java/com/example/sharemind/payment/dto/response/PaymentGetCounselorResponse.java b/src/main/java/com/example/sharemind/payment/dto/response/PaymentGetCounselorResponse.java
@@ -45,16 +45,13 @@ public class PaymentGetCounselorResponse {
     @Schema(description = "지급 계좌")
     private final String account;
 
-    @Schema(description = "금액 합계")
-    private final Long total;
-
-    public static PaymentGetCounselorResponse of(Payment payment, Long total) {
+    public static PaymentGetCounselorResponse of(Payment payment) {
         Consult consult = payment.getConsult();
         Boolean isChat = consult.getChat() != null;
 
         return new PaymentGetCounselorResponse(payment.getPaymentId(),
                 consult.getCustomer().getNickname(), isChat, consult.getCost() - FEE,
                 consult.getCost(), FEE, consult.getConsultedAt(), payment.getSettledAt(),
-                consult.getCounselor().getAccount(), total);
+                consult.getCounselor().getAccount());
     }
 }