Skip to content

Commit 6b3803e

Browse files
authored
fix(settlement): 정산 상태 리스트 실제 수입명 수정
fix(settlement): 정산 상태 리스트 실제 수입명 수정
2 parents 7b478ec + 2e66670 commit 6b3803e

1 file changed

Lines changed: 7 additions & 15 deletions

File tree

src/repository/settlement_status_list_repository.ts

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -107,22 +107,14 @@ export class SettlementStatusListRepository {
107107
const expectedIncome = Math.floor((hourlyRate * workMinutes) / 60);
108108

109109
// income_log가 여러개면 합산 (보너스 등)
110-
const rawAmount = (log.income_log ?? []).reduce((sum, x) => sum + (x.amount ?? 0), 0);
110+
//const amount = (log.income_log ?? []).reduce((sum, x) => sum + (x.amount ?? 0), 0);
111+
let amount = expectedIncome;
111112
const settlementStatus =
112-
log.status === 'settled'
113-
? 'paid'
114-
: (log.alba_posting?.user_alba?.[0]?.settlement_status ?? 'unpaid');
115-
116-
let amount = 0;
117-
if (settlementStatus === 'paid') {
118-
if (log.alba_posting) {
119-
// 알바 공고 기반 → income_log 사용
120-
amount = rawAmount;
121-
} else {
122-
// 일정 기반 → 예상 수입 사용
123-
amount = expectedIncome;
124-
}
125-
}
113+
(log.alba_posting?.user_alba?.[0]?.settlement_status as SettlementStatusDb | undefined) ??
114+
'unpaid';
115+
amount = (settlementStatus === 'unpaid' || settlementStatus === 'waiting')
116+
? 0
117+
: expectedIncome;
126118

127119
return {
128120
work_date: log.work_date ? log.work_date.toISOString().slice(0, 10) : null,

0 commit comments

Comments
 (0)