Skip to content

Develop #490

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

Merged
minij02 merged 2 commits into from
May 22, 2026
Merged

Develop #490

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c9a58b3
feat: μ •μ‚° ν†΅κ³„μ—μ„œ ν™˜λΆˆ(Refunded) 거래 뢄리 ν‘œμ‹œ (#488)
minij02 May 22, 2026
a1a0062
Merge pull request #489 from PromptPlace/feat/#488
minij02 May 22, 2026
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
12 changes: 8 additions & 4 deletions src/settlements/dtos/settlement.history.dto.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,16 @@ export interface MonthlySalesItemDto {
sale_price: number;
settled_amount: number;
fee: number;
status: 'Pending' | 'Succeed' | 'Failed';
status: 'Pending' | 'Succeed' | 'Failed' | 'Refunded';
}

export interface MonthlySalesSummaryDto {
count: number;
total_sales: number;
total_settled: number;
total_settled: number; // net β€” Succeed만, ν™˜λΆˆ μ œμ™Έ
total_fee: number;
refunded_count: number;
refunded_amount: number;
}

export interface MonthlySalesResponseDto {
Expand All @@ -32,11 +34,13 @@ export interface MonthlySalesResponseDto {
export interface YearlySettlementItemDto {
year: number;
count: number;
total_sales: number;
total_settled: number;
total_sales: number; // gross
total_settled: number; // net β€” ν™˜λΆˆ μ œμ™Έ, Succeed 합계
total_fee: number;
succeeded_amount: number;
pending_amount: number;
refunded_amount: number;
refunded_count: number;
}

export interface YearlySettlementResponseDto {
Expand Down
41 changes: 25 additions & 16 deletions src/settlements/repositories/settlement.history.repository.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,31 +55,35 @@ export const SettlementHistoryRepository = {
Array<{
year: number;
count: number;
total_sales: number;
total_settled: number;
total_fee: number;
succeeded_amount: number;
pending_amount: number;
total_sales: number; // gross β€” ν™˜λΆˆ 포함 (λΉ„κ΅μš©)
total_settled: number; // net β€” Succeed 합계 (ν™˜λΆˆ μ œμ™Έ)
total_fee: number; // gross fee (ν™˜λΆˆ 포함)
succeeded_amount: number; // Succeed만
pending_amount: number; // Pending만
refunded_amount: number; // Refunded만
refunded_count: number;
}>
> {
const rows = await prisma.$queryRaw<
Array<{
year: number;
count: bigint;
total_settled: bigint | null;
total_fee: bigint | null;
succeeded_amount: bigint | null;
pending_amount: bigint | null;
refunded_amount: bigint | null;
refunded_count: bigint;
total_sales: bigint | null;
}>
>`
SELECT
YEAR(s.created_at) AS year,
COUNT(*) AS count,
SUM(s.amount) AS total_settled,
SUM(s.fee) AS total_fee,
SUM(CASE WHEN s.status = ${Status.Succeed} THEN s.amount ELSE 0 END) AS succeeded_amount,
SUM(CASE WHEN s.status = ${Status.Pending} THEN s.amount ELSE 0 END) AS pending_amount,
SUM(CASE WHEN s.status = ${Status.Refunded} THEN s.amount ELSE 0 END) AS refunded_amount,
SUM(CASE WHEN s.status = ${Status.Refunded} THEN 1 ELSE 0 END) AS refunded_count,
SUM(p.amount) AS total_sales
FROM Settlement s
JOIN Payment pm ON pm.payment_id = s.payment_id
Expand All @@ -89,14 +93,19 @@ export const SettlementHistoryRepository = {
ORDER BY year DESC
`;

return rows.map((r) => ({
year: Number(r.year),
count: Number(r.count),
total_sales: Number(r.total_sales ?? 0),
total_settled: Number(r.total_settled ?? 0),
total_fee: Number(r.total_fee ?? 0),
succeeded_amount: Number(r.succeeded_amount ?? 0),
pending_amount: Number(r.pending_amount ?? 0),
}));
return rows.map((r) => {
const succeeded = Number(r.succeeded_amount ?? 0);
return {
year: Number(r.year),
count: Number(r.count),
total_sales: Number(r.total_sales ?? 0),
total_settled: succeeded, // net: ν™˜λΆˆ μ œμ™Έ, μ •μ‚° μ™„λ£Œλ§Œ
total_fee: Number(r.total_fee ?? 0),
succeeded_amount: succeeded,
pending_amount: Number(r.pending_amount ?? 0),
refunded_amount: Number(r.refunded_amount ?? 0),
refunded_count: Number(r.refunded_count ?? 0),
};
});
},
};
14 changes: 9 additions & 5 deletions src/settlements/routes/settlement.route.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -470,9 +470,11 @@ router.post("/register/business", authenticateJwt, registerBusiness);
* type: object
* properties:
* count: { type: integer, example: 3 }
* total_sales: { type: integer, example: 30000 }
* total_settled: { type: integer, example: 27000 }
* total_sales: { type: integer, description: μ›λž˜ νŒλ§€κ°€ 합계 (ν™˜λΆˆ 포함), example: 30000 }
* total_settled: { type: integer, description: net μ •μ‚° κΈˆμ•‘ (ν™˜λΆˆ μ œμ™Έ), example: 18000 }
* total_fee: { type: integer, example: 3000 }
* refunded_count: { type: integer, example: 1 }
* refunded_amount: { type: integer, example: 9000 }
* items:
* type: array
* items:
Expand All @@ -489,7 +491,7 @@ router.post("/register/business", authenticateJwt, registerBusiness);
* sale_price: { type: integer }
* settled_amount: { type: integer }
* fee: { type: integer }
* status: { type: string, enum: [Pending, Succeed, Failed] }
* status: { type: string, enum: [Pending, Succeed, Failed, Refunded] }
* statusCode: { type: integer, example: 200 }
* 400:
* description: 잘λͺ»λœ year/month
Expand Down Expand Up @@ -556,11 +558,13 @@ router.get("/sales/monthly", authenticateJwt, getMonthlySales);
* properties:
* year: { type: integer, example: 2026 }
* count: { type: integer, example: 50 }
* total_sales: { type: integer, example: 500000 }
* total_settled: { type: integer, example: 450000 }
* total_sales: { type: integer, description: gross β€” ν™˜λΆˆ 포함, example: 500000 }
* total_settled: { type: integer, description: net β€” Succeed 합계 (ν™˜λΆˆ μ œμ™Έ), example: 400000 }
* total_fee: { type: integer, example: 50000 }
* succeeded_amount: { type: integer, example: 400000 }
* pending_amount: { type: integer, example: 50000 }
* refunded_amount: { type: integer, example: 50000 }
* refunded_count: { type: integer, example: 5 }
* statusCode: { type: integer, example: 200 }
* 401:
* description: 둜그인 ν•„μš”
Expand Down
22 changes: 19 additions & 3 deletions src/settlements/services/settlement.history.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,22 @@ export const SettlementHistoryService = {
let total_sales = 0;
let total_settled = 0;
let total_fee = 0;
let refunded_count = 0;
let refunded_amount = 0;

const items = rows.map((r) => {
const sale_price = r.payment?.purchase?.amount ?? 0;
total_sales += sale_price;
total_settled += r.amount;
total_fee += r.fee;

// net μ •μ‚°κΈˆ: ν™˜λΆˆμ€ μ œμ™Έ (νšŒκ³„μƒ 판맀자 net 수읡)
if (r.status === 'Refunded') {
refunded_count += 1;
refunded_amount += r.amount;
} else {
total_settled += r.amount;
}

return {
settlement_id: r.settlement_id,
sold_at: r.created_at.toISOString(),
Expand All @@ -38,15 +47,22 @@ export const SettlementHistoryService = {
sale_price,
settled_amount: r.amount,
fee: r.fee,
status: r.status as 'Pending' | 'Succeed' | 'Failed',
status: r.status as 'Pending' | 'Succeed' | 'Failed' | 'Refunded',
};
});

return {
message: '월별 판맀 λ‚΄μ—­ 쑰회 성곡',
year,
month,
summary: { count: items.length, total_sales, total_settled, total_fee },
summary: {
count: items.length,
total_sales,
total_settled,
total_fee,
refunded_count,
refunded_amount,
},
items,
statusCode: 200,
};
Expand Down
27 changes: 24 additions & 3 deletions swagger.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7756,15 +7756,25 @@
},
"total_sales": {
"type": "integer",
"description": "μ›λž˜ νŒλ§€κ°€ 합계 (ν™˜λΆˆ 포함)",
"example": 30000
},
"total_settled": {
"type": "integer",
"example": 27000
"description": "net μ •μ‚° κΈˆμ•‘ (ν™˜λΆˆ μ œμ™Έ)",
"example": 18000
},
"total_fee": {
"type": "integer",
"example": 3000
},
"refunded_count": {
"type": "integer",
"example": 1
},
"refunded_amount": {
"type": "integer",
"example": 9000
}
}
},
Expand Down Expand Up @@ -7815,7 +7825,8 @@
"enum": [
"Pending",
"Succeed",
"Failed"
"Failed",
"Refunded"
]
}
}
Expand Down Expand Up @@ -7925,11 +7936,13 @@
},
"total_sales": {
"type": "integer",
"description": "gross β€” ν™˜λΆˆ 포함",
"example": 500000
},
"total_settled": {
"type": "integer",
"example": 450000
"description": "net β€” Succeed 합계 (ν™˜λΆˆ μ œμ™Έ)",
"example": 400000
},
"total_fee": {
"type": "integer",
Expand All @@ -7942,6 +7955,14 @@
"pending_amount": {
"type": "integer",
"example": 50000
},
"refunded_amount": {
"type": "integer",
"example": 50000
},
"refunded_count": {
"type": "integer",
"example": 5
}
}
}
Expand Down
Loading