jacy/dukang
1
0
Fork 0
Code Issues Pull Requests Actions 23 Packages Projects Releases Wiki Activity

feat(settlement): v4.0.6 酒厂 T+3 每 3 天出一期并与订单完全比对

Browse Source 
含现场提货入账、零应付仍出账、核对补生成，以及线上历史账单修复 SQL。
This commit is contained in:
jacy
2026-08-31 17:27:38 +08:00
parent ac94f5f5de
commit f35e1a3ba5
15 changed files with 782 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/dukang-api/src/modules/settlement/settlement.controller.ts
+18 -2
View File
@@ -1,5 +1,6 @@
import { BadRequestException, Body, Controller, Get, Param, Post, Put, Query, UseGuards } from '@nestjs/common';
import { IsOptional, IsString } from 'class-validator';
import { parseShanghaiYmd } from '@dukang/domain';
import { DEFAULT_PARTNER_STORE_STAFF_PERMISSIONS } from '@dukang/shared-types';
import { SettlementService } from './settlement.service';
import { JwtAuthGuard, AuthUser } from '../../common/guards/jwt-auth.guard';
@@ -464,8 +465,23 @@ export class AdminWineryBillController {
}
@Post('generate')
generate() {
return this.settlementService.generateWineryBillForDay();
generate(@Body() body?: { date?: string }) {
const anchor = body?.date?.trim() ? parseShanghaiYmd(body.date.trim()) : new Date();
if (body?.date?.trim() && Number.isNaN(anchor.getTime())) {
throw new BadRequestException('日期格式无效，请使用 YYYY-MM-DD');
}
return this.settlementService.generateWineryBillForDay(anchor);
}
@Post('reconcile')
@HqOperation({
action: HqOperationAction.WINERY_BILL_RECONCILE,
refType: 'WINERY_BILL',
batch: true,
includeBody: true,
})
reconcile(@Body() body?: { dateFrom?: string; dateTo?: string }) {
return this.settlementService.reconcileWineryBills(body);
}
@Post('batch-confirm')
server/dukang-api/src/modules/settlement/settlement.service.ts
+273 -45
View File
@@ -5,27 +5,31 @@ import {
DEFAULT_XFX_LOGISTICS_PRICING,
LOGISTICS_SETTLEMENT_METHOD_LABELS,
PAYMENT_PROOF_IMAGE_MAX_COUNT,
WINERY_SETTLEMENT_LAG_DAYS,
WINERY_BILL_EPOCH_YMD,
WINERY_SETTLEMENT_PERIOD_DAYS,
WINERY_SETTLEMENT_RATE,
} from '@dukang/shared-types';
import {
addShanghaiDays,
calcLogisticsFeeByBottles,
calcRedeemSettleAmount,
isWineryIssueDay,
listWineryIssueDays,
parseShanghaiYmd,
pickPayoutsForWithdrawAmount,
previousShanghaiMonth,
resolveSettlementRate,
shanghaiLaggedIssueWindow,
shanghaiMonthLastInstant,
shanghaiMonthRange,
shanghaiPeriodYmds,
shanghaiT1DayWindow,
shanghaiWineryPeriodWindow,
shanghaiYearMonth,
shanghaiYmd,
startOfShanghaiDay,
sumUnbilledPayoutAmount,
validateStoreWithdraw,
wineryIssueDateFromCompletedAt,
type LogisticsPricingRule,
} from '@dukang/domain';
import { PrismaService } from '../../common/prisma/prisma.module';
@@ -236,19 +240,25 @@ export class SettlementService implements OnModuleInit {
}
}
/** 酒厂账单日改为出账当天（不再存 T+3 完成日） */
/**
* 一次性：旧「billDate = 完成日」改为出账当天。
* 已是 T+3 周期出账日的账单禁止再按 createdAt 挪日，否则补生成的历史期账单会被改成今天。
*/
private async realignWineryBillIssueDates(): Promise<number> {
const locked = await this.prisma.$queryRaw<Array<{ acquired: number | bigint | null }>>`
SELECT GET_LOCK('winery_bill_issue_date_align', 5) AS acquired
`;
if (!Number(locked[0]?.acquired)) return 0;
try {
const periodDays = WINERY_SETTLEMENT_PERIOD_DAYS;
const epochYmd = WINERY_BILL_EPOCH_YMD;
const bills = await this.prisma.wineryBill.findMany({
select: { id: true, billDate: true, createdAt: true },
orderBy: { createdAt: 'desc' },
});
let shifted = 0;
for (const b of bills) {
if (isWineryIssueDay(b.billDate, periodDays, epochYmd)) continue;
const issue = startOfShanghaiDay(b.createdAt);
if (shanghaiYmd(b.billDate) === shanghaiYmd(issue)) continue;
const clash = await this.prisma.wineryBill.findUnique({ where: { billDate: issue } });
@@ -2201,10 +2211,58 @@ export class SettlementService implements OnModuleInit {
// ─── Winery bills ────────────────────────────────────
async generateWineryBillForDay(anchor = new Date()) {
const { start, end, billDate } = shanghaiLaggedIssueWindow(anchor, WINERY_SETTLEMENT_LAG_DAYS);
const rate = WINERY_SETTLEMENT_RATE;
/** 酒厂账单纳入的配送类型：同城 / 跨城 / 现场提货 */
private static readonly WINERY_DELIVERY_TYPES = ['LOCAL', 'CROSS_CITY', 'ON_SITE_PICKUP'] as const;
/**
* 历史现场提货单支付即 COMPLETED 但未写 completedAt，补齐为 paidAt，否则核对补生成捞不到。
*/
private async backfillMissingCompletedAt() {
await this.prisma.$executeRaw`
UPDATE user_order
SET completed_at = paid_at
WHERE status = 'COMPLETED'
AND pay_status = 'PAID'
AND completed_at IS NULL
AND paid_at IS NOT NULL
`;
}
/** 期窗口内已付已完成订单（含同城/跨城/现场提货；completedAt 优先，缺省用 paidAt） */
private wineryEligibleOrderWhere(start: Date, end: Date): Prisma.OrderWhereInput {
return {
status: 'COMPLETED',
payStatus: 'PAID',
deliveryType: { in: [...SettlementService.WINERY_DELIVERY_TYPES] },
OR: [
{ completedAt: { gte: start, lt: end } },
{ completedAt: null, paidAt: { gte: start, lt: end } },
],
};
}
/**
* 生成/重算某一出账日的酒厂对账单（T+3 = 每 3 天出一期）。
* - 仅在周期出账日生成：相对 epoch 每 3 天一张
* - 纳入上一期 3 个自然日内完成的同城/跨城/现场提货已付订单（含实付/应付为 0）
* - 出账日无订单也出账（无需打款），保证每隔三天有账单
* - 已打款账单不回刷；未打款账单可重算；冲突明细从其他未打款账单迁入
*/
async generateWineryBillForDay(anchor = new Date(), opts?: { notify?: boolean }) {
const periodDays = WINERY_SETTLEMENT_PERIOD_DAYS;
const epochYmd = WINERY_BILL_EPOCH_YMD;
const billDate = startOfShanghaiDay(anchor);
const issueYmd = shanghaiYmd(billDate);
const today = startOfShanghaiDay(new Date());
if (billDate.getTime() > today.getTime()) {
return { billDate: issueYmd, skipped: true, reason: '出账日未到' };
}
if (!isWineryIssueDay(billDate, periodDays, epochYmd)) {
return { billDate: issueYmd, skipped: true, reason: '非出账周期日（T+3 每 3 天出账）' };
}
const { start, end } = shanghaiWineryPeriodWindow(billDate, periodDays);
const rate = WINERY_SETTLEMENT_RATE;
const existing =
(await this.prisma.wineryBill.findUnique({ where: { billDate } })) ??
@@ -2215,21 +2273,31 @@ export class SettlementService implements OnModuleInit {
return { billDate: issueYmd, skipped: true, reason: '已打款' };
}
// T+3：纳入「今天 − lagDays」当天完成的同城/跨城订单；billDate = 出账日（今天）
const orders = await this.prisma.order.findMany({
where: {
status: 'COMPLETED',
payStatus: 'PAID',
deliveryType: { in: ['LOCAL', 'CROSS_CITY'] },
completedAt: { gte: start, lt: end },
},
// 手工单日出账时也补齐缺 completedAt 的现场单
await this.backfillMissingCompletedAt();
// 期窗口 [出账日−3, 出账日) 内：同城 / 跨城 / 现场提货
const candidates = await this.prisma.order.findMany({
where: this.wineryEligibleOrderWhere(start, end),
include: { city: { select: { name: true } } },
orderBy: { completedAt: 'asc' },
orderBy: [{ completedAt: 'asc' }, { paidAt: 'asc' }],
});
if (orders.length === 0 && !existing) {
return { billDate: issueYmd, skipped: true, reason: '无订单' };
// 已打款账单上的明细不可再迁；其余订单一律纳入本账
const candidateIds = candidates.map((o) => o.id);
const paidLockedIds = new Set<string>();
if (candidateIds.length) {
const locked = await this.prisma.wineryBillItem.findMany({
where: {
orderId: { in: candidateIds },
wineryBill: { status: 'PAID' },
...(existing ? { wineryBillId: { not: existing.id } } : {}),
},
select: { orderId: true },
});
for (const row of locked) paidLockedIds.add(row.orderId.toString());
}
const orders = candidates.filter((o) => !paidLockedIds.has(o.id.toString()));
const orderAmount = round2(orders.reduce((s, o) => s + Number(o.payAmount), 0));
const wineryAmount = round2(orderAmount * rate);
@@ -2262,7 +2330,22 @@ export class SettlementService implements OnModuleInit {
await tx.wineryBillItem.deleteMany({ where: { wineryBillId: header.id } });
}
// 从未打款的其他账单迁出冲突明细，避免 orderId 唯一约束失败导致整日对不上
const affectedBillIds = new Set<bigint>();
if (orders.length > 0) {
const conflicts = await tx.wineryBillItem.findMany({
where: {
orderId: { in: orders.map((o) => o.id) },
wineryBillId: { not: header.id },
wineryBill: { status: 'UNPAID' },
},
select: { id: true, wineryBillId: true },
});
for (const c of conflicts) affectedBillIds.add(c.wineryBillId);
if (conflicts.length) {
await tx.wineryBillItem.deleteMany({ where: { id: { in: conflicts.map((c) => c.id) } } });
}
await tx.wineryBillItem.createMany({
data: orders.map((o) => ({
wineryBillId: header.id,
@@ -2271,50 +2354,189 @@ export class SettlementService implements OnModuleInit {
deliveryType: o.deliveryType,
payAmount: o.payAmount,
wineryAmount: round2(Number(o.payAmount) * rate),
// 明细仍保留支付时间；账期窗口按 completedAt 归属
// 明细时间：支付时间优先；账期归属用 completedAt（现场提货已与支付同时写入）
paidAt: o.paidAt ?? o.completedAt!,
})),
});
}
for (const otherId of affectedBillIds) {
await this.recalcWineryBillHeader(tx, otherId, rate);
}
return header;
});
const period = issueYmd;
const wineryBank = await loadWineryBankConfig(this.prisma);
const bankParts = wecomBankParts(wineryBank);
const cityNames = joinLimited(
orders.map((o) => o.city?.name || ''),
'城',
);
const partnerNames = await this.partnerDashLabels(orders.map((o) => o.partnerAccountIdAtPay));
void this.wecomPush.dispatchEvent(
'finance.winery_bill',
{
period,
billCount: '1',
totalAmount: wineryAmount.toFixed(2),
cityNames,
partnerNames,
orderCount: String(orders.length),
orderAmount: orderAmount.toFixed(2),
rate: formatPercent(rate),
amount: wineryAmount.toFixed(2),
payee: bankParts.payee,
accountNo: bankParts.accountNo,
bankBranch: bankParts.bankBranch,
bankAccount: formatWecomBankAccount(wineryBank),
},
{ handlePath: '/finance/winery-bills' },
);
if (opts?.notify !== false && wineryAmount > 0) {
const wineryBank = await loadWineryBankConfig(this.prisma);
const bankParts = wecomBankParts(wineryBank);
const cityNames = joinLimited(
orders.map((o) => o.city?.name || ''),
'城',
);
const partnerNames = await this.partnerDashLabels(orders.map((o) => o.partnerAccountIdAtPay));
void this.wecomPush.dispatchEvent(
'finance.winery_bill',
{
period,
billCount: '1',
totalAmount: wineryAmount.toFixed(2),
cityNames,
partnerNames,
orderCount: String(orders.length),
orderAmount: orderAmount.toFixed(2),
rate: formatPercent(rate),
amount: wineryAmount.toFixed(2),
payee: bankParts.payee,
accountNo: bankParts.accountNo,
bankBranch: bankParts.bankBranch,
bankAccount: formatWecomBankAccount(wineryBank),
},
{ handlePath: '/finance/winery-bills' },
);
}
return serializeBigInt({
billDate: period,
skipped: false,
bill,
orderCount: orders.length,
orderAmount,
wineryAmount,
lockedOnPaid: paidLockedIds.size,
});
}
/** 按明细重算酒厂账单表头（应付为 0 保留账单，展示为无需打款） */
private async recalcWineryBillHeader(
tx: Prisma.TransactionClient,
wineryBillId: bigint,
rate = WINERY_SETTLEMENT_RATE,
) {
const items = await tx.wineryBillItem.findMany({ where: { wineryBillId } });
const orderAmount = round2(items.reduce((s, i) => s + Number(i.payAmount), 0));
const wineryAmount = round2(orderAmount * rate);
await tx.wineryBill.update({
where: { id: wineryBillId },
data: {
orderCount: items.length,
orderAmount,
wineryRate: rate,
wineryAmount,
},
});
}
/**
* 按出账日区间核对补生成酒厂账单：只处理 T+3 周期出账日，捞回未入账的同城/跨城/现场提货订单，并清理误生成的非周期日空账单。
*/
async reconcileWineryBills(body?: { dateFrom?: string; dateTo?: string }) {
const periodDays = WINERY_SETTLEMENT_PERIOD_DAYS;
const epochYmd = WINERY_BILL_EPOCH_YMD;
const today = startOfShanghaiDay(new Date());
const to = body?.dateTo ? parseShanghaiYmd(body.dateTo) : today;
const from = body?.dateFrom
? parseShanghaiYmd(body.dateFrom)
: addShanghaiDays(today, -60);
if (Number.isNaN(from.getTime()) || Number.isNaN(to.getTime())) {
throw new BadRequestException('日期格式无效，请使用 YYYY-MM-DD');
}
if (from.getTime() > to.getTime()) {
throw new BadRequestException('开始日期不能晚于结束日期');
}
// 先补历史现场提货等缺 completedAt 的已完成单，再按期入账
await this.backfillMissingCompletedAt();
const endIssue = to.getTime() > today.getTime() ? today : to;
const startIssue = from.getTime() > endIssue.getTime() ? endIssue : from;
const issueYmids = new Set(
listWineryIssueDays(startIssue, endIssue, periodDays, epochYmd).map(shanghaiYmd),
);
// 捞仍未入账的孤儿订单（同城/跨城/现场提货），按其完成日归属到对应出账日
const orphanLookbackStart = addShanghaiDays(startIssue, -periodDays - 90);
const orphanLookbackEnd = addShanghaiDays(today, 1);
const windowOrders = await this.prisma.order.findMany({
where: this.wineryEligibleOrderWhere(orphanLookbackStart, orphanLookbackEnd),
select: { id: true, completedAt: true, paidAt: true },
});
const billedSet = new Set(
windowOrders.length === 0
? []
: (
await this.prisma.wineryBillItem.findMany({
where: { orderId: { in: windowOrders.map((o) => o.id) } },
select: { orderId: true },
})
).map((r) => r.orderId.toString()),
);
let orphanCount = 0;
for (const o of windowOrders) {
const attributedAt = o.completedAt ?? o.paidAt;
if (!attributedAt || billedSet.has(o.id.toString())) continue;
const issue = wineryIssueDateFromCompletedAt(attributedAt, periodDays, epochYmd);
if (issue.getTime() > today.getTime()) continue;
issueYmids.add(shanghaiYmd(issue));
orphanCount += 1;
}
const sorted = [...issueYmids].sort();
const results: Array<{
billDate: string;
skipped: boolean;
reason?: string;
orderCount?: number;
wineryAmount?: number;
}> = [];
for (const ymd of sorted) {
const r = await this.generateWineryBillForDay(parseShanghaiYmd(ymd), { notify: false });
results.push({
billDate: String(r.billDate),
skipped: Boolean(r.skipped),
reason: 'reason' in r ? String(r.reason ?? '') : undefined,
orderCount: 'orderCount' in r ? Number(r.orderCount ?? 0) : undefined,
wineryAmount: 'wineryAmount' in r ? Number(r.wineryAmount ?? 0) : undefined,
});
}
// 清理旧「每日出账」留下的非周期日出账单（明细已迁走后为空）
let cleaned = 0;
const strayBills = await this.prisma.wineryBill.findMany({
where: {
status: 'UNPAID',
billDate: { gte: startIssue, lte: endIssue },
},
include: { _count: { select: { items: true } } },
});
for (const b of strayBills) {
if (isWineryIssueDay(b.billDate, periodDays, epochYmd)) continue;
if (b._count.items > 0) {
await this.prisma.$transaction(async (tx) => {
await this.recalcWineryBillHeader(tx, b.id);
});
continue;
}
await this.prisma.wineryBill.delete({ where: { id: b.id } });
cleaned += 1;
}
return {
dateFrom: shanghaiYmd(startIssue),
dateTo: shanghaiYmd(endIssue),
days: results.length,
generated: results.filter((r) => !r.skipped).length,
skipped: results.filter((r) => r.skipped).length,
orphanOrders: orphanCount,
cleanedNonIssueBills: cleaned,
results,
};
}
async listAdminWineryBills(query: {
page?: number;
pageSize?: number;
@@ -2469,7 +2691,13 @@ export class SettlementService implements OnModuleInit {
csvEscape(b.billNo),
shanghaiYmd(b.billDate),
csvEscape(item.orderNo),
item.deliveryType === 'LOCAL' ? '同城' : item.deliveryType === 'CROSS_CITY' ? '跨城' : item.deliveryType,
item.deliveryType === 'LOCAL'
? '同城'
: item.deliveryType === 'CROSS_CITY'
? '跨城'
: item.deliveryType === 'ON_SITE_PICKUP'
? '现场提货'
: item.deliveryType,
Number(item.payAmount),
Number(b.wineryRate),
Number(item.wineryAmount),
server/dukang-api/src/modules/trade/trade.service.ts
+3
View File
@@ -448,6 +448,7 @@ export class TradeService {
status: toStatus,
payStatus: 'PAID',
paidAt: now,
...(toStatus === 'COMPLETED' ? { completedAt: now } : {}),
payExternalNo: externalNo,
partnerAccountIdAtPay: paySnapshot.partnerAccountId,
orderCommissionRateAtPay: paySnapshot.orderCommissionRate,
@@ -636,6 +637,7 @@ export class TradeService {
status: toStatus,
payStatus: 'PAID',
paidAt: now,
...(toStatus === 'COMPLETED' ? { completedAt: now } : {}),
payExternalNo: params.transactionId,
partnerAccountIdAtPay: paySnapshot.partnerAccountId,
orderCommissionRateAtPay: paySnapshot.orderCommissionRate,
@@ -2651,6 +2653,7 @@ export class TradeService {
status: toStatus,
payStatus: 'PAID',
paidAt: now,
...(toStatus === 'COMPLETED' ? { completedAt: now } : {}),
payExternalNo: externalNo,
partnerAccountIdAtPay: order.partnerAccountIdAtPay,
orderCommissionRateAtPay: order.orderCommissionRateAtPay,