sb/sb-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev'
Deploy / deploy (push) Failing after 11m6s
Details
CI / build (push) Failing after 13m0s
Details

Browse Source
This commit is contained in:
ByungCheol
2026-06-14 15:43:30 +09:00
parent 1f8b968588 6eef6cbd29
commit 5230ba1587
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/sb/web/account/dto/WalletRequest.java
+1 -1
View File
@@ -14,7 +14,7 @@ import java.time.LocalDate;
public class WalletRequest { public class WalletRequest {
@NotBlank(message = "유형을 선택하세요.") @NotBlank(message = "유형을 선택하세요.")
@Pattern(regexp = "BANK|CARD|LOAN|INVEST", message = "유형이 올바르지 않습니다.") @Pattern(regexp = "BANK|CASH|CARD|LOAN|INVEST", message = "유형이 올바르지 않습니다.")
private String type; private String type;
@NotBlank(message = "이름을 입력하세요.") @NotBlank(message = "이름을 입력하세요.")
src/main/java/com/sb/web/account/service/AccountService.java
+2 -2
View File
@@ -390,7 +390,7 @@ public class AccountService {
.toList(); .toList();
} }
/** 순자산 = 총자산(BANK) − 총부채(CARD/LOAN) */ /** 순자산 = 총자산(BANK/CASH/INVEST) − 총부채(CARD/LOAN) */
public NetWorthResponse netWorth(Long memberId) { public NetWorthResponse netWorth(Long memberId) {
Map<Long, Long> balances = balanceMap(memberId); Map<Long, Long> balances = balanceMap(memberId);
Map<Long, InvestService.WalletInvest> inv = investService.valuationByWallet(memberId); Map<Long, InvestService.WalletInvest> inv = investService.valuationByWallet(memberId);
@@ -407,7 +407,7 @@ public class AccountService {
InvestService.WalletInvest wi = inv.getOrDefault(w.getId(), new InvestService.WalletInvest()); InvestService.WalletInvest wi = inv.getOrDefault(w.getId(), new InvestService.WalletInvest());
assets += bal + wi.cashDelta + wi.stockEval; assets += bal + wi.cashDelta + wi.stockEval;
} }
} else if ("BANK".equals(w.getType())) { } else if ("BANK".equals(w.getType()) || "CASH".equals(w.getType())) {
assets += bal; assets += bal;
} else { } else {
liabilities += -bal; // 부채는 음수 잔액 → 양수 부채로 표시 liabilities += -bal; // 부채는 음수 잔액 → 양수 부채로 표시