Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[FIX] 당겨쓰기 EVENLY옵션 로직 수정 #57

Merged
merged 2 commits into from
Aug 15, 2024
Merged

[FIX] 당겨쓰기 EVENLY옵션 로직 수정 #57

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ee8005d
[FIX] 당겨쓰기 EVENLY옵션 로직 수정
jimmy0524 Aug 13, 2024
02f0573
[FIX] 주석 수정
jimmy0524 Aug 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 10 additions & 9 deletions src/main/java/umc/haruchi/service/BudgetRedistributionService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ public PullMinusClosing pull(BudgetRedistributionRequestDTO.createPullDTO reques
long dayCount = monthBudget.getDayBudgetList().stream()
.filter(dayBudget -> dayBudget.getDay() >= localNowDay).count() - 1;

//고르게 당겨쓰기(233원씩 당겨온다고하면 200 * 일수 당겨와서 target에 저장, 233원씩 차감, 67원씩 세이프박스로))
//0813 수정 : 233 * 일수 당겨와서 target에 저장, 233원씩 차감, 67원씩 세이프박스, target 절사 후 세이프박스
if (request.getRedistributionOption().equals(EVENLY)) {

//dayCount가 0일때 -> 마지막 날일 때 예외처리
Expand All @@ -224,11 +224,8 @@ public PullMinusClosing pull(BudgetRedistributionRequestDTO.createPullDTO reques
// 금액 분배 계산
long splitAmount = totalAmount / dayCount;

//10의 자리 이하 절사
int distributedAmount = (int) (roundDownToNearestHundred(splitAmount));

// target amount에 더하기
targetBudget.pushAmount((int) (distributedAmount * dayCount));
// target amount에 더하기 233 * 일수
targetBudget.pushAmount((int) (splitAmount * dayCount));

// 각 DayBudget에서 빼기
monthBudget.getDayBudgetList().stream()
Expand All @@ -240,8 +237,8 @@ public PullMinusClosing pull(BudgetRedistributionRequestDTO.createPullDTO reques
dayBudget.subAmount((int) splitAmount); //467,567 다양하게 있을 수 있음
});

//33원 * 일 수 + 딱 떨어지지 않았을 때의 값(totalAmount - splitAmount * dayCount) + target day가 음수에서 양수로 변했을 때의 값 -> 세이프박스
long safeBoxAmount = (splitAmount - distributedAmount) * dayCount + (totalAmount - splitAmount * dayCount) +
//source day들에서 양수일때만 절사 + target day가 음수에서 양수로 변했을 때의 값 -> 세이프박스
long safeBoxAmount =
monthBudget.getDayBudgetList().stream()
.filter(dayBudget -> dayBudget.getDay() >= localNowDay && !dayBudget.getDay().equals(targetDay))
.mapToLong(dayBudget -> {
Expand All @@ -252,7 +249,11 @@ public PullMinusClosing pull(BudgetRedistributionRequestDTO.createPullDTO reques
}) // 10 단위 이하
.sum();

// sourceBudget에서 10 단위 이하 금액 절사 * 양수일 때 *
if(targetBudget.getDayBudget() > 0) {
safeBoxAmount += targetBudget.getDayBudget() % 100;
}

// 각 sourceday에서 양수일 때 10 단위 이하 금액 절사
monthBudget.getDayBudgetList().stream()
.filter(dayBudget -> dayBudget.getDay() >= localNowDay && !dayBudget.getDay().equals(targetDay))
.forEach(dayBudget -> {
Expand Down
Loading