diff --git a/src/main/java/ewha/lux/once/domain/card/dto/MyWalletResponseDto.java b/src/main/java/ewha/lux/once/domain/card/dto/MyWalletResponseDto.java index fd7a5e1..6eb4e09 100644 --- a/src/main/java/ewha/lux/once/domain/card/dto/MyWalletResponseDto.java +++ b/src/main/java/ewha/lux/once/domain/card/dto/MyWalletResponseDto.java @@ -14,6 +14,7 @@ public class MyWalletResponseDto { @NoArgsConstructor @Builder public static class MyWalletProfileDto { + private String nickname; List ownedCardList; } @@ -24,6 +25,7 @@ public static class MyWalletProfileDto { public static class OwnedCardListDto { private Long ownedCardId; private String cardName; + private String cardCompany; private int cardType; private String cardImg; private boolean isMaincard; diff --git a/src/main/java/ewha/lux/once/domain/card/service/CardService.java b/src/main/java/ewha/lux/once/domain/card/service/CardService.java index d2f2aca..25c297c 100644 --- a/src/main/java/ewha/lux/once/domain/card/service/CardService.java +++ b/src/main/java/ewha/lux/once/domain/card/service/CardService.java @@ -18,7 +18,6 @@ import lombok.extern.slf4j.Slf4j; import org.json.simple.JSONArray; import org.json.simple.JSONObject; -import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Service; import java.util.*; @@ -56,6 +55,7 @@ public MyWalletResponseDto.MyWalletProfileDto getMyWalletInfo(Users nowUser) thr return new MyWalletResponseDto.OwnedCardListDto( ownedCard.getId(), ownedCard.getCard().getName(), + ownedCard.getCard().getCardCompany().getName(), ownedCard.getCard().getType().ordinal(), ownedCard.getCard().getImgUrl(), ownedCard.isMain(), @@ -68,6 +68,7 @@ public MyWalletResponseDto.MyWalletProfileDto getMyWalletInfo(Users nowUser) thr .toList(); return MyWalletResponseDto.MyWalletProfileDto.builder() + .nickname(nowUser.getNickname()) .ownedCardList(ownedCardList) .build(); } @@ -119,6 +120,7 @@ public MontlyBenefitResponseDto.MontlyBenefitProfileDto getMontlyBenefitInfo(Use )) .collect(Collectors.toList()); + return MontlyBenefitResponseDto.MontlyBenefitProfileDto.builder() .month(month) .receivedSum(receivedSum)