diff --git a/src/main/java/com/sb/web/account/dto/WalletRequest.java b/src/main/java/com/sb/web/account/dto/WalletRequest.java index 90e7585..5cb3c18 100644 --- a/src/main/java/com/sb/web/account/dto/WalletRequest.java +++ b/src/main/java/com/sb/web/account/dto/WalletRequest.java @@ -14,7 +14,7 @@ import java.time.LocalDate; public class WalletRequest { @NotBlank(message = "유형을 선택하세요.") - @Pattern(regexp = "BANK|CARD|LOAN|INVEST", message = "유형이 올바르지 않습니다.") + @Pattern(regexp = "BANK|CASH|CARD|LOAN|INVEST", message = "유형이 올바르지 않습니다.") private String type; @NotBlank(message = "이름을 입력하세요.") diff --git a/src/main/java/com/sb/web/account/service/AccountService.java b/src/main/java/com/sb/web/account/service/AccountService.java index 90fcd09..780a2d5 100644 --- a/src/main/java/com/sb/web/account/service/AccountService.java +++ b/src/main/java/com/sb/web/account/service/AccountService.java @@ -390,7 +390,7 @@ public class AccountService { .toList(); } - /** 순자산 = 총자산(BANK) − 총부채(CARD/LOAN) */ + /** 순자산 = 총자산(BANK/CASH/INVEST) − 총부채(CARD/LOAN) */ public NetWorthResponse netWorth(Long memberId) { Map balances = balanceMap(memberId); Map inv = investService.valuationByWallet(memberId); @@ -407,7 +407,7 @@ public class AccountService { InvestService.WalletInvest wi = inv.getOrDefault(w.getId(), new InvestService.WalletInvest()); assets += bal + wi.cashDelta + wi.stockEval; } - } else if ("BANK".equals(w.getType())) { + } else if ("BANK".equals(w.getType()) || "CASH".equals(w.getType())) { assets += bal; } else { liabilities += -bal; // 부채는 음수 잔액 → 양수 부채로 표시