From e68eb4d38c2251b5f9c337a07cae228ede0990c0 Mon Sep 17 00:00:00 2001 From: jacy <18049821889@163.com> Date: Sun, 30 Aug 2026 15:25:56 +0800 Subject: [PATCH] =?UTF-8?q?feat(settlement):=20=E9=97=A8=E5=BA=97=E8=B4=A6?= =?UTF-8?q?=E5=8D=95=E7=A1=AE=E8=AE=A4=E6=89=93=E6=AC=BE=E6=94=AF=E6=8C=81?= =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E5=87=AD=E8=AF=81=E7=85=A7=E7=89=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 财务确认打款与提现通过可附带 OSS 凭证图，详情与导出展示。 Co-authored-by: Cursor --- .../src/components/FinancePayProof.tsx | 97 ++++++++++++ apps/admin-web/src/pages/StoreBillsPage.tsx | 149 ++++++++++-------- .../src/pages/StoreWithdrawalsPage.tsx | 65 ++++---- docs/杜康好客-v3-PRD.md | 2 +- docs/杜康好客-v3-现状对照.md | 1 + docs/杜康好客-v3编码手册.md | 2 + packages/shared-types/src/settlement.ts | 11 ++ .../migrate-store-bill-payment-proof.sql | 5 + server/dukang-api/prisma/schema.prisma | 16 +- .../settlement/settlement.controller.ts | 13 +- .../modules/settlement/settlement.service.ts | 46 +++++- 11 files changed, 293 insertions(+), 114 deletions(-) create mode 100644 apps/admin-web/src/components/FinancePayProof.tsx create mode 100644 server/dukang-api/prisma/migrate-store-bill-payment-proof.sql diff --git a/apps/admin-web/src/components/FinancePayProof.tsx b/apps/admin-web/src/components/FinancePayProof.tsx new file mode 100644 index 0000000..89b2256 --- /dev/null +++ b/apps/admin-web/src/components/FinancePayProof.tsx @@ -0,0 +1,97 @@ +import { useEffect, useState } from 'react'; +import { Image, Input, Modal, Space, Typography } from 'antd'; +import { PAYMENT_PROOF_IMAGE_MAX_COUNT } from '@dukang/shared-types'; +import MultiImageUpload from './MultiImageUpload'; + +export function parsePaymentProofUrls(raw: unknown): string[] { + if (!Array.isArray(raw)) return []; + return raw.map((u) => String(u ?? '').trim()).filter(Boolean); +} + +export function PaymentProofGallery({ urls }: { urls?: unknown }) { + const list = parsePaymentProofUrls(urls); + if (!list.length) return <>—; + return ( + + + {list.map((url, index) => ( + + ))} + + + ); +} + +type FinancePayProofModalProps = { + open: boolean; + title: string; + hint: string; + okText: string; + confirmLoading?: boolean; + onCancel: () => void; + onOk: (payload: { paymentRef?: string; paymentProofUrls?: string[] }) => Promise; +}; + +export function FinancePayProofModal({ + open, + title, + hint, + okText, + confirmLoading, + onCancel, + onOk, +}: FinancePayProofModalProps) { + const [paymentRef, setPaymentRef] = useState(''); + const [proofUrls, setProofUrls] = useState([]); + + useEffect(() => { + if (open) { + setPaymentRef(''); + setProofUrls([]); + } + }, [open]); + + return ( + { + await onOk({ + paymentRef: paymentRef.trim() || undefined, + paymentProofUrls: proofUrls.length ? proofUrls : undefined, + }); + }} + > + {hint} + setPaymentRef(e.target.value)} + style={{ marginBottom: 12 }} + /> + 打款凭证照片（可选，银行转账回单等） +
+ +
+ + ); +} diff --git a/apps/admin-web/src/pages/StoreBillsPage.tsx b/apps/admin-web/src/pages/StoreBillsPage.tsx index 11360b1..e27b449 100644 --- a/apps/admin-web/src/pages/StoreBillsPage.tsx +++ b/apps/admin-web/src/pages/StoreBillsPage.tsx @@ -18,6 +18,7 @@ import { Typography, message, } from 'antd'; +import { FinancePayProofModal, PaymentProofGallery } from '../components/FinancePayProof'; import type { ColumnsType } from 'antd/es/table'; import type { Dayjs } from 'dayjs'; import { @@ -113,6 +114,13 @@ export default function StoreBillsPage() { pendingCount: number; overdueCount: number; } | null>(null); + const [payModal, setPayModal] = useState<{ + ids: string[]; + amountHint?: number; + } | null>(null); + const [paySubmitting, setPaySubmitting] = useState(false); + const [withdrawApproveId, setWithdrawApproveId] = useState(null); + const [withdrawSubmitting, setWithdrawSubmitting] = useState(false); useEffect(() => { form.setFieldsValue({ @@ -134,77 +142,11 @@ export default function StoreBillsPage() { }, []); function confirmPay(ids: string[], amountHint?: number) { - let paymentRef = ''; - Modal.confirm({ - title: '确认打款？', - content: ( -
-
- 将确认 {ids.length} 笔 T+1 门店对账单 - {amountHint != null ? `，合计约 ¥${amountHint.toFixed(2)}` : ''}。此操作不可撤销。 -
- { - paymentRef = e.target.value; - }} - /> -
- ), - okText: '确认打款', - cancelText: '取消', - onOk: async () => { - const body = JSON.stringify({ paymentRef: paymentRef.trim() || undefined }); - if (ids.length === 1) { - await request(`/admin/store-bills/${ids[0]}/confirm`, { method: 'POST', body }); - } else { - setBatchLoading(true); - try { - await request('/admin/store-bills/batch-confirm', { - method: 'POST', - body: JSON.stringify({ ids }), - }); - } finally { - setBatchLoading(false); - } - } - message.success('已确认打款'); - setSelectedKeys([]); - reload(); - }, - }); + setPayModal({ ids, amountHint }); } function approveWithdraw(id: string) { - let paymentRef = ''; - Modal.confirm({ - title: '审核通过并标记已结算？', - content: ( - { - paymentRef = e.target.value; - }} - /> - ), - okText: '通过并结算', - cancelText: '取消', - onOk: async () => { - await request(`/admin/store-withdrawals/${id}/approve`, { - method: 'POST', - body: JSON.stringify({ paymentRef: paymentRef.trim() || undefined }), - }); - message.success('已通过并标记已结算'); - setDrawerOpen(false); - reload(); - void request<{ pendingCount: number; overdueCount: number }>( - '/admin/store-withdrawals/overdue-summary', - ) - .then(setOverdueSummary) - .catch(() => {}); - }, - }); + setWithdrawApproveId(id); } function rejectWithdraw(id: string) { @@ -565,6 +507,9 @@ export default function StoreBillsPage() { {detail.paymentRef ? String(detail.paymentRef) : '—'} + + + {(detail.storeAccount as { bankAccountName?: string; @@ -649,6 +594,9 @@ export default function StoreBillsPage() { {detail.paymentRef ? String(detail.paymentRef) : '—'} + + + {storeAccount ? ( <> @@ -719,6 +667,71 @@ export default function StoreBillsPage() { )} + + setPayModal(null)} + onOk={async (payload) => { + if (!payModal) return; + const { ids } = payModal; + setPaySubmitting(true); + if (ids.length > 1) setBatchLoading(true); + try { + const body = JSON.stringify({ + ...payload, + ...(ids.length > 1 ? { ids } : {}), + }); + if (ids.length === 1) { + await request(`/admin/store-bills/${ids[0]}/confirm`, { method: 'POST', body }); + } else { + await request('/admin/store-bills/batch-confirm', { method: 'POST', body }); + } + message.success('已确认打款'); + setPayModal(null); + setSelectedKeys([]); + reload(); + } finally { + setPaySubmitting(false); + setBatchLoading(false); + } + }} + /> + + setWithdrawApproveId(null)} + onOk={async (payload) => { + if (!withdrawApproveId) return; + setWithdrawSubmitting(true); + try { + await request(`/admin/store-withdrawals/${withdrawApproveId}/approve`, { + method: 'POST', + body: JSON.stringify(payload), + }); + message.success('已通过并标记已结算'); + setWithdrawApproveId(null); + setDrawerOpen(false); + reload(); + void request<{ pendingCount: number; overdueCount: number }>( + '/admin/store-withdrawals/overdue-summary', + ) + .then(setOverdueSummary) + .catch(() => {}); + } finally { + setWithdrawSubmitting(false); + } + }} + /> ); } diff --git a/apps/admin-web/src/pages/StoreWithdrawalsPage.tsx b/apps/admin-web/src/pages/StoreWithdrawalsPage.tsx index 4842157..04d11ac 100644 --- a/apps/admin-web/src/pages/StoreWithdrawalsPage.tsx +++ b/apps/admin-web/src/pages/StoreWithdrawalsPage.tsx @@ -23,6 +23,7 @@ import { useAdminList } from '../lib/useAdminList'; import { useAdminListColumns } from '../lib/useAdminListColumns'; import { AdminListHeader } from '../components/AdminListHeader'; import { AdminPrimaryLink } from '../components/AdminPrimaryLink'; +import { FinancePayProofModal, PaymentProofGallery } from '../components/FinancePayProof'; type Row = { @@ -70,6 +71,8 @@ export default function StoreWithdrawalsPage() { pendingCount: number; overdueCount: number; } | null>(null); + const [approveId, setApproveId] = useState(null); + const [approveSubmitting, setApproveSubmitting] = useState(false); useEffect(() => { void request>(`/admin/stores?pageSize=${ADMIN_OPTIONS_PAGE_SIZE}`) @@ -89,34 +92,7 @@ export default function StoreWithdrawalsPage() { } function approve(id: string) { - let paymentRef = ''; - Modal.confirm({ - title: '审核通过并标记已结算？', - content: ( - { - paymentRef = e.target.value; - }} - /> - ), - okText: '通过并结算', - cancelText: '取消', - onOk: async () => { - await request(`/admin/store-withdrawals/${id}/approve`, { - method: 'POST', - body: JSON.stringify({ paymentRef: paymentRef.trim() || undefined }), - }); - message.success('已通过并标记已结算'); - setDrawerOpen(false); - reload(); - void request<{ pendingCount: number; overdueCount: number }>( - '/admin/store-withdrawals/overdue-summary', - ) - .then(setOverdueSummary) - .catch(() => {}); - }, - }); + setApproveId(id); } function reject(id: string) { @@ -356,6 +332,9 @@ export default function StoreWithdrawalsPage() { {detail.paymentRef ? ( {String(detail.paymentRef)} ) : null} + + + {storeAccount?.bankAccountName || '—'} @@ -394,6 +373,36 @@ export default function StoreWithdrawalsPage() { ) : null} + + setApproveId(null)} + onOk={async (payload) => { + if (!approveId) return; + setApproveSubmitting(true); + try { + await request(`/admin/store-withdrawals/${approveId}/approve`, { + method: 'POST', + body: JSON.stringify(payload), + }); + message.success('已通过并标记已结算'); + setApproveId(null); + setDrawerOpen(false); + reload(); + void request<{ pendingCount: number; overdueCount: number }>( + '/admin/store-withdrawals/overdue-summary', + ) + .then(setOverdueSummary) + .catch(() => {}); + } finally { + setApproveSubmitting(false); + } + }} + /> ); } diff --git a/docs/杜康好客-v3-PRD.md b/docs/杜康好客-v3-PRD.md index 1947d79..41f8e0a 100644 --- a/docs/杜康好客-v3-PRD.md +++ b/docs/杜康好客-v3-PRD.md @@ -113,7 +113,7 @@ **HQ 财务打款信息**（`admin-web` 财务四页，v3.5.6）： - 门店/合伙人/酒厂/物流账单列表、详情、导出展示收款账户（户名、账号、开户行） -- 确认打款时可填写打款凭证号（`paymentRef`），已打款后在详情与导出中展示 +- 确认打款时可填写打款凭证号（`paymentRef`），并可上传凭证照片（`paymentProofUrls`，最多 9 张）；已打款后在详情与导出中展示 - 门店账单统一列表：T+1 终态「已打款」、手动提现终态「已结算」（均为 `PAID`，文案区分业务类型） - 门店 T+1「出账日」= 出账当天（核销窗口「昨日 00:00–今日 00:00」中的今天） - 核销详情展示核销门店主账户收款信息 diff --git a/docs/杜康好客-v3-现状对照.md b/docs/杜康好客-v3-现状对照.md index da07916..b6f386c 100644 --- a/docs/杜康好客-v3-现状对照.md +++ b/docs/杜康好客-v3-现状对照.md @@ -71,6 +71,7 @@ | 日期 | 说明 | |------|------| +| 2026-08-30 | HQ 门店账单确认打款支持上传凭证照片（`payment_proof_urls`） | | 2026-08-26 | v3.5.14：`order_submit`/`pay_success` 埋点改用真实 `clientApp`；线上这两类 `USER_H5` 回填为 `USER_MINI` | | 2026-08-26 | v3.5.12：订单大屏循环 BGM；HQ 日志/订单状态流转/用户行为时间线英文码改中文；修复删除门店分类后被 `ensureDefaults` 回种；HQ 侧栏按业务前 11 项重排、系统设置置底 | | 2026-08-26 | v3.5.11：城市三种履约起购；企微补提交人/订单规格物流收货/核销用户（昵称+明文手机+HQ备注）；`alert.settlement` 改名「结算任务失败通知」归入系统监控；补提现通过与四账单（城市/合伙人、笔数、累计金额、收款人账号开户行） | diff --git a/docs/杜康好客-v3编码手册.md b/docs/杜康好客-v3编码手册.md index 6b23b5b..d4a4b92 100644 --- a/docs/杜康好客-v3编码手册.md +++ b/docs/杜康好客-v3编码手册.md @@ -54,6 +54,8 @@ C 端购酒核销 · 门店扫码核销+打款 · 合伙人拓店履约 · WebAd **用户日志端（v3.5.14）**：`order_submit` / `pay_success` 的 `clientApp` 取 JWT（小程序 `USER_MINI`）；微信支付回调沿用该订单已有埋点，缺省小程序。禁止再写死 `USER_H5`。 +**HQ 门店账单打款凭证**：确认打款 / 提现通过可填 `paymentRef`，并可上传照片（`paymentProofUrls`，OSS `PAYMENT_PROOF`，最多 9 张）。详情与 T+1 导出展示。 + **合伙人关联与订单佣金（v4.0.1）**：规则见 v4-PRD。`user_user.assoc_partner_account_id` 首次扫码锁定；`user_order.partner_account_id_at_pay` 仅关联或代下单显式选择写入（禁止区县解析）。`partner_bill_item` 分酒单 / 核销两段。合伙人备注独立表 `partner_user_note`（勿写 `hq_remark`）。`POST /user/partner-assoc/bind` · `GET /partner/assoc` · `GET /partner/assoc/stats`（关联用户 / 当前关联用户已付购酒单，本日/本月）· `GET /partner/assoc/users?keyword&sort`（合伙人侧返回 `partnerRemark`，不返回 `hqRemark`）· `GET /partner/assoc/users/:userId/orders` · `GET /partner/assoc/orders` · `PUT /partner/assoc/users/:userId/remark` · HQ `GET /admin/users` 支持 `keyword`、`assocPartnerAccountId`（`none` / `any` / 主账号 ID）· `GET /admin/orders` 支持 `assocPartnerAccountId`（筛本单快照，`none`=无快照）· `PUT /admin/users/:id/assoc`（权限 `users_partner_assoc`）改绑/解绑 · 开城合伙人关联用户快链 `/users?assocPartnerAccountId=` · `PUT /admin/partners/:id` 改费率用 `Decimal(toFixed(4))`。 ## 5. 验收用例（必过） diff --git a/packages/shared-types/src/settlement.ts b/packages/shared-types/src/settlement.ts index 5db6d5e..38c1ae7 100644 --- a/packages/shared-types/src/settlement.ts +++ b/packages/shared-types/src/settlement.ts @@ -66,6 +66,14 @@ export interface StoreWithdrawSummaryDto { bankAccount?: StoreWithdrawBankAccountDto | null; } +/** 确认打款 / 提现通过时可附带的凭证照片上限 */ +export const PAYMENT_PROOF_IMAGE_MAX_COUNT = 9; + +export interface ConfirmFinancePayDto { + paymentRef?: string; + paymentProofUrls?: string[]; +} + export interface StoreWithdrawRequestDto { id: string; withdrawNo: string; @@ -78,6 +86,7 @@ export interface StoreWithdrawRequestDto { reviewedAt?: string | null; paidAt?: string | null; paymentRef?: string | null; + paymentProofUrls?: string[]; } export interface StorePayoutDto { @@ -171,6 +180,8 @@ export interface StoreBillDto { payoutAmount: number; status: FinancePayStatus; paidAt?: string | null; + paymentRef?: string | null; + paymentProofUrls?: string[]; } export interface WineryBillDto { diff --git a/server/dukang-api/prisma/migrate-store-bill-payment-proof.sql b/server/dukang-api/prisma/migrate-store-bill-payment-proof.sql new file mode 100644 index 0000000..ce7d149 --- /dev/null +++ b/server/dukang-api/prisma/migrate-store-bill-payment-proof.sql @@ -0,0 +1,5 @@ +-- 门店账单 / 手动提现：确认打款凭证照片 +ALTER TABLE `store_bill` + ADD COLUMN `payment_proof_urls` JSON NULL AFTER `payment_ref`; +ALTER TABLE `store_withdraw_request` + ADD COLUMN `payment_proof_urls` JSON NULL AFTER `payment_ref`; diff --git a/server/dukang-api/prisma/schema.prisma b/server/dukang-api/prisma/schema.prisma index 5d488d9..e55e4f5 100644 --- a/server/dukang-api/prisma/schema.prisma +++ b/server/dukang-api/prisma/schema.prisma @@ -1953,10 +1953,11 @@ model StoreBill { redeemAmount Decimal @map("redeem_amount") @db.Decimal(10, 2) settlementRate Decimal @map("settlement_rate") @db.Decimal(5, 4) payoutAmount Decimal @map("payout_amount") @db.Decimal(10, 2) - status FinancePayStatus @default(UNPAID) - paymentRef String? @map("payment_ref") @db.VarChar(128) - paidAt DateTime? @map("paid_at") @db.DateTime(3) - createdAt DateTime @default(now()) @map("created_at") @db.DateTime(3) + status FinancePayStatus @default(UNPAID) + paymentRef String? @map("payment_ref") @db.VarChar(128) + paymentProofUrls Json? @map("payment_proof_urls") + paidAt DateTime? @map("paid_at") @db.DateTime(3) + createdAt DateTime @default(now()) @map("created_at") @db.DateTime(3) store Store @relation(fields: [storeId], references: [id], onDelete: Restrict) payouts StorePayout[] @@ -2002,9 +2003,10 @@ model StoreWithdrawRequest { appliedAt DateTime @default(now()) @map("applied_at") @db.DateTime(3) reviewedAt DateTime? @map("reviewed_at") @db.DateTime(3) reviewedByHqId BigInt? @map("reviewed_by_hq_id") @db.UnsignedBigInt - paidAt DateTime? @map("paid_at") @db.DateTime(3) - paymentRef String? @map("payment_ref") @db.VarChar(128) - createdAt DateTime @default(now()) @map("created_at") @db.DateTime(3) + paidAt DateTime? @map("paid_at") @db.DateTime(3) + paymentRef String? @map("payment_ref") @db.VarChar(128) + paymentProofUrls Json? @map("payment_proof_urls") + createdAt DateTime @default(now()) @map("created_at") @db.DateTime(3) updatedAt DateTime @updatedAt @map("updated_at") @db.DateTime(3) store Store @relation(fields: [storeId], references: [id], onDelete: Restrict) diff --git a/server/dukang-api/src/modules/settlement/settlement.controller.ts b/server/dukang-api/src/modules/settlement/settlement.controller.ts index 1f1c2af..181cba8 100644 --- a/server/dukang-api/src/modules/settlement/settlement.controller.ts +++ b/server/dukang-api/src/modules/settlement/settlement.controller.ts @@ -133,7 +133,7 @@ export class AdminStoreWithdrawController { approve( @CurrentUser() user: AuthUser, @Param('id') id: string, - @Body() body: { paymentRef?: string }, + @Body() body: { paymentRef?: string; paymentProofUrls?: string[] }, ) { return this.settlementService.approveStoreWithdraw(BigInt(id), user.actorId, body); } @@ -287,8 +287,10 @@ export class AdminStoreBillController { batch: true, includeBody: true, }) - batchConfirm(@Body() body: { ids: string[] }) { - return this.settlementService.batchConfirmStoreBills(body.ids ?? []); + batchConfirm( + @Body() body: { ids: string[]; paymentRef?: string; paymentProofUrls?: string[] }, + ) { + return this.settlementService.batchConfirmStoreBills(body.ids ?? [], body); } @Get(':id') @@ -302,7 +304,10 @@ export class AdminStoreBillController { refType: 'STORE_BILL', refIdParam: 'id', }) - confirm(@Param('id') id: string, @Body() body: { paymentRef?: string }) { + confirm( + @Param('id') id: string, + @Body() body: { paymentRef?: string; paymentProofUrls?: string[] }, + ) { return this.settlementService.confirmStoreBill(BigInt(id), body); } } diff --git a/server/dukang-api/src/modules/settlement/settlement.service.ts b/server/dukang-api/src/modules/settlement/settlement.service.ts index 52f30ed..36518e5 100644 --- a/server/dukang-api/src/modules/settlement/settlement.service.ts +++ b/server/dukang-api/src/modules/settlement/settlement.service.ts @@ -4,6 +4,7 @@ import { DEFAULT_STORE_WITHDRAW_DAILY_LIMIT, DEFAULT_XFX_LOGISTICS_PRICING, LOGISTICS_SETTLEMENT_METHOD_LABELS, + PAYMENT_PROOF_IMAGE_MAX_COUNT, WINERY_SETTLEMENT_LAG_DAYS, WINERY_SETTLEMENT_RATE, } from '@dukang/shared-types'; @@ -50,6 +51,19 @@ function csvEscape(value: string) { return value; } +function parsePaymentProofUrls(raw: unknown): string[] { + if (!Array.isArray(raw)) return []; + return raw + .map((u) => String(u ?? '').trim()) + .filter((u) => /^https?:\/\//i.test(u)) + .slice(0, PAYMENT_PROOF_IMAGE_MAX_COUNT); +} + +function paymentProofUrlsInput(urls?: string[]): Prisma.InputJsonValue | typeof Prisma.JsonNull { + const parsed = parsePaymentProofUrls(urls); + return parsed.length ? (parsed as Prisma.InputJsonValue) : Prisma.JsonNull; +} + /** 上海时区自然日 00:00（用本地 Date 构造；服务器需设 Asia/Shanghai 或等价） */ function startOfDay(d: Date) { return new Date(d.getFullYear(), d.getMonth(), d.getDate(), 0, 0, 0, 0); @@ -715,6 +729,7 @@ export class SettlementService implements OnModuleInit { if (!row) throw new NotFoundException('提现申请不存在'); return serializeBigInt({ ...row, + paymentProofUrls: parsePaymentProofUrls(row.paymentProofUrls), overdue: row.status === 'PENDING_REVIEW' ? isWithdrawOverdue(row.appliedAt) : false, }); @@ -723,7 +738,7 @@ export class SettlementService implements OnModuleInit { async approveStoreWithdraw( id: bigint, hqAccountId: bigint, - dto?: { paymentRef?: string }, + dto?: { paymentRef?: string; paymentProofUrls?: string[] }, ) { const row = await this.prisma.storeWithdrawRequest.findUnique({ where: { id }, @@ -744,6 +759,7 @@ export class SettlementService implements OnModuleInit { reviewedByHqId: hqAccountId, paidAt, paymentRef: dto?.paymentRef?.trim() || null, + paymentProofUrls: paymentProofUrlsInput(dto?.paymentProofUrls), }, }); await tx.storePayout.updateMany({ @@ -764,6 +780,7 @@ export class SettlementService implements OnModuleInit { extraJson: { amount: Number(row.amount), paymentRef: dto?.paymentRef, + paymentProofCount: parsePaymentProofUrls(dto?.paymentProofUrls).length, }, }); @@ -1425,10 +1442,18 @@ export class SettlementService implements OnModuleInit { }); if (!bill) throw new NotFoundException('门店对账单不存在'); const storeAccount = await loadStorePrimaryBank(this.prisma, bill.storeId); - return serializeBigInt({ ...bill, billDate: shanghaiYmd(bill.billDate), storeAccount }); + return serializeBigInt({ + ...bill, + billDate: shanghaiYmd(bill.billDate), + storeAccount, + paymentProofUrls: parsePaymentProofUrls(bill.paymentProofUrls), + }); } - async confirmStoreBill(id: bigint, dto: { paymentRef?: string } = {}) { + async confirmStoreBill( + id: bigint, + dto: { paymentRef?: string; paymentProofUrls?: string[] } = {}, + ) { const bill = await this.prisma.storeBill.findUnique({ where: { id } }); if (!bill) throw new NotFoundException('门店对账单不存在'); if (bill.status !== 'UNPAID') throw new BadRequestException('仅未打款账单可确认打款'); @@ -1441,6 +1466,7 @@ export class SettlementService implements OnModuleInit { status: 'PAID', paidAt, paymentRef: dto.paymentRef?.trim() || null, + paymentProofUrls: paymentProofUrlsInput(dto.paymentProofUrls), }, }); await tx.storePayout.updateMany({ @@ -1449,14 +1475,20 @@ export class SettlementService implements OnModuleInit { }); return b; }); - return serializeBigInt(updated); + return serializeBigInt({ + ...updated, + paymentProofUrls: parsePaymentProofUrls(updated.paymentProofUrls), + }); } - async batchConfirmStoreBills(ids: string[]) { + async batchConfirmStoreBills( + ids: string[], + dto: { paymentRef?: string; paymentProofUrls?: string[] } = {}, + ) { const results: Array<{ id: string; ok: boolean; message?: string }> = []; for (const id of ids) { try { - await this.confirmStoreBill(BigInt(id)); + await this.confirmStoreBill(BigInt(id), dto); results.push({ id, ok: true }); } catch (e) { results.push({ id, ok: false, message: e instanceof Error ? e.message : '失败' }); @@ -1493,6 +1525,7 @@ export class SettlementService implements OnModuleInit { '状态', '打款时间', '打款凭证', + '打款凭证照片', '收款户名', '收款账号', '开户行', @@ -1511,6 +1544,7 @@ export class SettlementService implements OnModuleInit { b.status, b.paidAt ? b.paidAt.toISOString().slice(0, 19).replace('T', ' ') : '', csvEscape(b.paymentRef ?? ''), + csvEscape(parsePaymentProofUrls(b.paymentProofUrls).join(' ')), csvEscape(bank?.bankAccountName ?? ''), csvEscape(bank?.bankAccountNo ?? ''), csvEscape(bank?.bankBranch ?? ''),