>>('PARTNER_H5', '/partner/settlement/bills').then(setBills);
+ void loadBills();
}, [navigate]);
const billId = searchParams.get('id');
+ const actionable = useMemo(
+ () => bills.filter((b) => canApplyPayment(b.status)),
+ [bills],
+ );
const bill = billId
- ? bills.find((b) => String(b.id) === billId) ?? bills[0]
- : bills[0];
+ ? bills.find((b) => String(b.id) === billId) ?? actionable[0] ?? bills[0]
+ : actionable[0] ?? bills[0];
- function confirmBill() {
- if (!confirmed) return;
+ const status = String(bill?.status || '');
+ const showApplyForm = !!bill && canApplyPayment(status);
+ const isReviewing = status === 'CONFIRMED';
+ const isRejected = status === 'REJECTED';
+ const isPaid = status === 'PAID';
+
+ async function confirmBill() {
+ if (!bill || !confirmed || !canApplyPayment(String(bill.status))) return;
setSubmitting(true);
- setTimeout(() => {
+ try {
+ await request('PARTNER_H5', `/partner/settlement/bills/${bill.id}/confirm`, {
+ method: 'POST',
+ });
+ toastSuccess('申请已提交，请耐心等待总部打款审核');
+ setConfirmed(false);
+ await loadBills();
+ } catch (e) {
+ toastError(e instanceof Error ? e.message : '提交失败');
+ } finally {
setSubmitting(false);
- alert('申请已提交，请耐心等待打款审核。（preV1 演示）');
- }, 1500);
+ }
}
return (
-
navigate('/center/settlement')} />
+ navigate('/center/settlement')} />
@@ -45,17 +99,28 @@ export default function BillsPage() {
数据核算
-
2
+
+ {showApplyForm && !confirmed ? '2' : (
+ check
+ )}
+
账单确认
-
3
-
申请打款
+
+ {isPaid ? (
+ check
+ ) : '3'}
+
+
+ {isRejected ? '已驳回' : isPaid ? '已打款' : '申请打款'}
+
- {!bill &&
暂无账单
}
+ {loading &&
加载中…
}
+ {!loading && !bill &&
暂无账单
}
{bill && (
@@ -66,25 +131,46 @@ export default function BillsPage() {
SETTLEMENT PERIOD
{String(bill.billNo || '月度结算账单')}
- {String(bill.status || '待确认')}
+
+ {billStatusLabel(status)}
+
+
error
+
+
打款申请已驳回
+
{bill.rejectReason}
+
+
+
hourglass_top
+
+ 您已提交打款申请，总部审核中，请耐心等待。
+
+
应结总金额
¥
- {Number(bill.totalAmount || 0).toLocaleString('zh-CN', { minimumFractionDigits: 2 })}
+ {fmtMoney(Number(bill.totalAmount || 0))}
订单分佣收入
- ¥ {(Number(bill.totalAmount || 0) * 0.82).toLocaleString('zh-CN', { minimumFractionDigits: 2 })}
+ ¥ {fmtMoney(Number(bill.orderCommission || 0))}
核销权益分佣
- ¥ {(Number(bill.totalAmount || 0) * 0.18).toLocaleString('zh-CN', { minimumFractionDigits: 2 })}
+ ¥ {fmtMoney(Number(bill.redeemCommission || 0))}
@@ -93,45 +179,58 @@ export default function BillsPage() {
{bills.length > 1 && (
-
历史账单
- {bills.slice(1).map((b) => (
-
+
全部账单
+ {bills.map((b) => (
+
+
))}
-
info
-
- 账单确认后将正式进入打款流程。如有异议，请在确认前联系城市运营经理核实数据。
-
-
+
info
+
+ {isRejected
+ ? '请根据驳回理由核对后重新确认并申请打款。'
+ : '账单确认后将正式进入打款审核。如有异议，请在确认前联系城市运营经理核实数据。'}
+
+
-
待确认账单
+
+ {finance.rejectedCount > 0 ? '待处理账单' : '待确认账单'}
+
- 您有 {finance.pendingBillCount} 笔账单待确认
+ {finance.rejectedCount > 0
+ ? `您有 ${finance.pendingBillCount} 笔账单待处理（含 ${finance.rejectedCount} 笔已驳回）`
+ : `您有 ${finance.pendingBillCount} 笔账单待确认`}
+ {bill.status === 'REJECTED' && bill.rejectReason ? (
+
+ 驳回：{bill.rejectReason}
+
+ ) : null}
+
¥{fmtMoney(Number(bill.totalAmount || 0))}
diff --git a/apps/h5-partner/src/styles.css b/apps/h5-partner/src/styles.css
index b366bc0..de0138a 100644
--- a/apps/h5-partner/src/styles.css
+++ b/apps/h5-partner/src/styles.css
@@ -2985,6 +2985,11 @@ nav.app-tabbar .app-tabbar-label {
color: var(--color-success-green);
}
+.partner-settlement-status--rejected {
+ background: rgba(166, 29, 36, 0.12);
+ color: var(--color-heritage-red);
+}
+
.partner-settlement-item-meta {
display: flex;
align-items: center;
diff --git a/packages/shared-types/src/partner-log.ts b/packages/shared-types/src/partner-log.ts
index 900d660..b17fee7 100644
--- a/packages/shared-types/src/partner-log.ts
+++ b/packages/shared-types/src/partner-log.ts
@@ -25,7 +25,7 @@ export const PARTNER_LOG_EVENT_CATEGORIES: Record = {
[HqOperationAction.PARTNER_BILL_GENERATE]: '生成合伙人账单',
[HqOperationAction.PARTNER_BILL_CONFIRM]: '确认合伙人账单',
[HqOperationAction.PARTNER_BILL_MARK_PAID]: '合伙人账单结算',
+ [HqOperationAction.PARTNER_BILL_REJECT]: '驳回合伙人打款申请',
[HqOperationAction.REDEEM_DEBUG_CREATE_TOKEN]: '核销调试-生成码',
[HqOperationAction.REDEEM_DEBUG_CONFIRM]: '核销调试-确认核销',
[HqOperationAction.PROMO_CODE_CREATE]: '创建推广码',
diff --git a/server/dukang-api/src/modules/ops/admin-dashboard.service.ts b/server/dukang-api/src/modules/ops/admin-dashboard.service.ts
index 95babe4..a1eb27a 100644
--- a/server/dukang-api/src/modules/ops/admin-dashboard.service.ts
+++ b/server/dukang-api/src/modules/ops/admin-dashboard.service.ts
@@ -22,6 +22,7 @@ export class AdminDashboardService {
deliveriesTotal,
pendingPayouts,
pendingBills,
+ pendingPartnerDraftBills,
openTickets,
] = await Promise.all([
this.prisma.user.count({ where: { status: 1, mergedIntoUserId: null } }),
@@ -42,7 +43,8 @@ export class AdminDashboardService {
this.prisma.redeemRecord.count({ where: { createdAt: { gte: todayStart } } }),
this.prisma.orderDelivery.count(),
this.prisma.storePayout.count({ where: { status: 'PENDING' } }),
- this.prisma.partnerBill.count({ where: { status: { in: ['DRAFT', 'CONFIRMED'] } } }),
+ this.prisma.partnerBill.count({ where: { status: 'CONFIRMED' } }),
+ this.prisma.partnerBill.count({ where: { status: 'DRAFT' } }),
this.prisma.commonTicket.count({ where: { status: { in: ['PENDING', 'OPEN'] } } }),
]);
@@ -57,7 +59,9 @@ export class AdminDashboardService {
redeemToday,
deliveriesTotal,
pendingPayouts,
+ /** 合伙人已确认、待总部审核打款 */
pendingBills,
+ pendingPartnerDraftBills,
openTickets,
ordersByStatus: ordersByStatus.map((row) => ({
status: row.status,
diff --git a/server/dukang-api/src/modules/settlement/settlement.controller.ts b/server/dukang-api/src/modules/settlement/settlement.controller.ts
index 1256233..4117757 100644
--- a/server/dukang-api/src/modules/settlement/settlement.controller.ts
+++ b/server/dukang-api/src/modules/settlement/settlement.controller.ts
@@ -25,6 +25,11 @@ export class SettlementController {
bills(@CurrentUser() user: AuthUser) {
return this.settlementService.listPartnerBills(user.actorId);
}
+
+ @Post('bills/:id/confirm')
+ confirm(@CurrentUser() user: AuthUser, @Param('id') id: string) {
+ return this.settlementService.partnerConfirmBill(user.actorId, BigInt(id));
+ }
}
@Controller('shop/payouts')
@@ -193,6 +198,20 @@ export class AdminPartnerBillController {
markPaid(@Param('id') id: string, @Body() body: { paymentRef?: string }) {
return this.settlementService.markPartnerBillPaid(BigInt(id), body);
}
+
+ @Post(':id/reject')
+ @HqOperation({
+ action: HqOperationAction.PARTNER_BILL_REJECT,
+ refType: 'PARTNER_BILL',
+ refIdParam: 'id',
+ includeBody: true,
+ })
+ reject(@Param('id') id: string, @Body() body: { reason?: string }) {
+ if (!body?.reason?.trim()) {
+ throw new BadRequestException('请填写驳回理由');
+ }
+ return this.settlementService.rejectPartnerBill(BigInt(id), body.reason);
+ }
}
@Controller('admin/winery-bills')
diff --git a/server/dukang-api/src/modules/settlement/settlement.service.ts b/server/dukang-api/src/modules/settlement/settlement.service.ts
index ea8dae4..b32e329 100644
--- a/server/dukang-api/src/modules/settlement/settlement.service.ts
+++ b/server/dukang-api/src/modules/settlement/settlement.service.ts
@@ -529,11 +529,70 @@ export class SettlementService {
async confirmPartnerBill(id: bigint) {
const bill = await this.prisma.partnerBill.findUnique({ where: { id } });
if (!bill) throw new NotFoundException('账单不存在');
- if (bill.status !== 'DRAFT') throw new BadRequestException('仅草稿可确认');
+ if (bill.status !== 'DRAFT' && bill.status !== 'REJECTED') {
+ throw new BadRequestException('仅待确认或已驳回账单可确认');
+ }
const updated = await this.prisma.partnerBill.update({
where: { id },
- data: { status: 'CONFIRMED', confirmedAt: new Date() },
+ data: {
+ status: 'CONFIRMED',
+ confirmedAt: new Date(),
+ rejectReason: null,
+ },
+ });
+
+ return serializeBigInt(updated);
+ }
+
+ /** 合伙人端：确认账单并申请打款（DRAFT/REJECTED → CONFIRMED） */
+ async partnerConfirmBill(partnerAccountId: bigint, billId: bigint) {
+ const primary = await this.partnerCityService.resolvePrimaryAccount(partnerAccountId);
+ const bill = await this.prisma.partnerBill.findUnique({ where: { id: billId } });
+ if (!bill || bill.partnerAccountId !== primary.id) {
+ throw new NotFoundException('账单不存在');
+ }
+ if (bill.status !== 'DRAFT' && bill.status !== 'REJECTED') {
+ throw new BadRequestException('当前账单不可再次申请打款');
+ }
+
+ const updated = await this.prisma.partnerBill.update({
+ where: { id: billId },
+ data: {
+ status: 'CONFIRMED',
+ confirmedAt: new Date(),
+ rejectReason: null,
+ },
+ });
+
+ this.analyticsService.trackPartnerOneSafe(partnerAccountId, 'PARTNER_H5', {
+ partnerAccountId: primary.id,
+ eventName: 'partner_bill_confirm',
+ refType: 'PARTNER_BILL',
+ refId: billId,
+ extraJson: { billNo: bill.billNo },
+ });
+
+ return serializeBigInt(updated);
+ }
+
+ async rejectPartnerBill(id: bigint, reason: string) {
+ const rejectReason = reason.trim();
+ if (!rejectReason) throw new BadRequestException('请填写驳回理由');
+ if (rejectReason.length > 500) throw new BadRequestException('驳回理由不能超过 500 字');
+
+ const bill = await this.prisma.partnerBill.findUnique({ where: { id } });
+ if (!bill) throw new NotFoundException('账单不存在');
+ if (bill.status !== 'CONFIRMED') {
+ throw new BadRequestException('仅待打款审核的账单可驳回');
+ }
+
+ const updated = await this.prisma.partnerBill.update({
+ where: { id },
+ data: {
+ status: 'REJECTED',
+ rejectReason,
+ },
});
return serializeBigInt(updated);
@@ -542,11 +601,11 @@ export class SettlementService {
async markPartnerBillPaid(id: bigint, dto: { paymentRef?: string }) {
const bill = await this.prisma.partnerBill.findUnique({ where: { id } });
if (!bill) throw new NotFoundException('账单不存在');
- if (bill.status !== 'CONFIRMED') throw new BadRequestException('仅已确认账单可标记打款');
+ if (bill.status !== 'CONFIRMED') throw new BadRequestException('仅待打款审核的账单可标记打款');
const updated = await this.prisma.partnerBill.update({
where: { id },
- data: { status: 'PAID', paidAt: new Date() },
+ data: { status: 'PAID', paidAt: new Date(), rejectReason: null },
});
return serializeBigInt(updated);
@@ -577,6 +636,7 @@ export class SettlementService {
'状态',
'确认时间',
'打款时间',
+ '驳回理由',
].join(',');
const rows = bills.map((b) =>
[
@@ -591,6 +651,7 @@ export class SettlementService {
b.status,
b.confirmedAt ? b.confirmedAt.toISOString().slice(0, 10) : '',
b.paidAt ? b.paidAt.toISOString().slice(0, 10) : '',
+ csvEscape(b.rejectReason ?? ''),
].join(','),
);
return { csv: `\uFEFF${[header, ...rows].join('\n')}`, count: bills.length };