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

v4.0.11HQ后端优化（快链、账单日等）
CI / verify (pull_request) Waiting to run
Details

Browse Source
This commit is contained in:
jacy
2026-09-02 15:45:12 +08:00
parent 1000b489a0
commit 6880b5daf4
31 changed files with 1014 additions and 402 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/dukang-api/src/common/export/column-export.util.ts
+48
View File
@@ -0,0 +1,48 @@
export type ExportColumnDef<T> = {
key: string;
header: string;
value: (row: T) => string | number;
};
/** 按请求的列 key 过滤导出列；未传则导出全部 */
export function pickExportColumns<T>(
defs: ExportColumnDef<T>[],
requestedKeys?: string[],
): ExportColumnDef<T>[] {
if (!requestedKeys?.length) return defs;
const byKey = new Map(defs.map((d) => [d.key, d]));
return requestedKeys.map((k) => byKey.get(k)).filter((d): d is ExportColumnDef<T> => !!d);
}
export function parseExportColumnKeys(raw?: string): string[] | undefined {
if (!raw?.trim()) return undefined;
const keys = raw
.split(',')
.map((k) => k.trim())
.filter(Boolean);
return keys.length ? keys : undefined;
}
export function buildCsvFromColumns<T>(
defs: ExportColumnDef<T>[],
rows: T[],
requestedKeys?: string[],
): { csv: string; count: number } {
const active = pickExportColumns(defs, requestedKeys);
if (!active.length) {
return { csv: '\uFEFF', count: 0 };
}
const header = active.map((d) => d.header).join(',');
const body = rows.map((row) =>
active
.map((d) => {
const v = d.value(row);
const s = v == null ? '' : String(v);
return s.includes(',') || s.includes('"') || s.includes('\n')
? `"${s.replace(/"/g, '""')}"`
: s;
})
.join(','),
);
return { csv: `\uFEFF${[header, ...body].join('\n')}`, count: rows.length };
}
server/dukang-api/src/modules/dev-plan/admin-dev-plan-export.util.ts
+34 -14
View File
@@ -1,3 +1,7 @@
import {
pickExportColumns,
type ExportColumnDef,
} from '../../common/export/column-export.util';
import {
DEV_PLAN_TASK_STATUS_LABELS,
DEV_PLAN_TASK_TYPE_LABELS,
@@ -27,6 +31,7 @@ const EXPORT_HEADERS = [
'状态',
'内容',
'关联工单',
'关联版本',
'创建人',
'创建时间',
'完成时间',
@@ -39,6 +44,7 @@ export type DevPlanTaskExportRow = {
status: string;
content: string;
supportTicketNo: string;
versionNos: string;
creatorName: string;
createdAt: string;
completedAt: string;
@@ -53,6 +59,7 @@ export function mapTaskToExportRow(task: {
status: DevPlanTaskStatusDto;
content: string;
supportTicketNo?: string | null;
versionNos?: string | null;
creatorName?: string | null;
createdAt: string;
completedAt?: string | null;
@@ -64,6 +71,7 @@ export function mapTaskToExportRow(task: {
status: DEV_PLAN_TASK_STATUS_LABELS[task.status] ?? task.status,
content: task.content,
supportTicketNo: task.supportTicketNo ?? '',
versionNos: task.versionNos ?? '',
creatorName: task.creatorName ?? '',
createdAt: task.createdAt.slice(0, 19).replace('T', ' '),
completedAt: task.completedAt ? task.completedAt.slice(0, 19).replace('T', ' ') : '',
@@ -71,20 +79,30 @@ export function mapTaskToExportRow(task: {
};
}
function rowToCells(row: DevPlanTaskExportRow): string[] {
function devPlanExportColumnDefs(): ExportColumnDef<DevPlanTaskExportRow>[] {
return [
row.taskNo,
row.type,
row.status,
row.content,
row.supportTicketNo,
row.creatorName,
row.createdAt,
row.completedAt,
row.attachmentUrls.join(' '),
{ key: 'taskNo', header: '任务编号', value: (r) => r.taskNo },
{ key: 'type', header: '类型', value: (r) => r.type },
{ key: 'status', header: '状态', value: (r) => r.status },
{ key: 'content', header: '内容', value: (r) => r.content },
{ key: 'supportTicketNo', header: '关联工单', value: (r) => r.supportTicketNo },
{ key: 'versions', header: '关联版本', value: (r) => r.versionNos },
{ key: 'creatorName', header: '创建人', value: (r) => r.creatorName },
{ key: 'createdAt', header: '创建时间', value: (r) => r.createdAt },
{ key: 'completedAt', header: '完成时间', value: (r) => r.completedAt },
{
key: 'attachmentUrls',
header: '附件',
value: (r) => r.attachmentUrls.join(' '),
},
];
}
function rowToCells(row: DevPlanTaskExportRow, columnKeys?: string[]): string[] {
const cols = pickExportColumns(devPlanExportColumnDefs(), columnKeys);
return cols.map((c) => String(c.value(row)));
}
function resolvePdfFontPath(): string {
const candidates = [
process.env.EXPORT_PDF_FONT_PATH,
@@ -187,15 +205,17 @@ export async function buildDevPlanDocx(rows: DevPlanTaskExportRow[]): Promise<Bu
return Packer.toBuffer(doc);
}
export async function buildDevPlanXlsx(rows: DevPlanTaskExportRow[]): Promise<Buffer> {
export async function buildDevPlanXlsx(rows: DevPlanTaskExportRow[], columnKeys?: string[]): Promise<Buffer> {
const cols = pickExportColumns(devPlanExportColumnDefs(), columnKeys);
const workbook = new ExcelJS.Workbook();
const sheet = workbook.addWorksheet('开发任务');
sheet.addRow([...EXPORT_HEADERS]);
sheet.addRow(cols.map((c) => c.header));
for (const row of rows) {
sheet.addRow(rowToCells(row));
sheet.addRow(cols.map((c) => c.value(row)));
}
sheet.columns.forEach((col, i) => {
col.width = i === 3 || i === 8 ? 40 : 16;
const header = cols[i]?.header ?? '';
col.width = header === '内容' || header === '附件' ? 40 : 16;
});
const buffer = await workbook.xlsx.writeBuffer();
return Buffer.from(buffer);
server/dukang-api/src/modules/dev-plan/admin-dev-plan.controller.ts
+2
View File
@@ -107,11 +107,13 @@ export class AdminDevPlanController {
@Get('versions')
listVersions(
@Query('status') status?: string,
@Query('keyword') keyword?: string,
@Query('page') page?: string,
@Query('pageSize') pageSize?: string,
) {
return this.service.listVersions({
status,
keyword,
page: page ? Number(page) : undefined,
pageSize: pageSize ? Number(pageSize) : undefined,
});
server/dukang-api/src/modules/dev-plan/dev-plan.service.ts
+18 -7
View File
@@ -590,7 +590,7 @@ export class DevPlanService {
async listVersions(query: { status?: string; page?: number; pageSize?: number }) {
async listVersions(query: { status?: string; keyword?: string; page?: number; pageSize?: number }) {
const page = query.page ?? 1;
@@ -600,7 +600,13 @@ export class DevPlanService {
if (query.status) where.status = query.status as DevPlanVersionStatus;
if (query.keyword?.trim()) {
const kw = query.keyword.trim();
where.OR = [
{ versionNo: { contains: kw } },
{ content: { contains: kw } },
];
}
const [rows, total] = await Promise.all([
@@ -1329,6 +1335,7 @@ export class DevPlanService {
status?: string;
type?: string;
keyword?: string;
columns?: string[];
}) {
let rows: Array<{
id: bigint;
@@ -1372,20 +1379,24 @@ export class DevPlanService {
: Promise.resolve([]),
]);
const ticketMap = new Map(tickets.map((t) => [String(t.id), t.ticketNo] as [string, string]));
const taskIds = rows.map((r) => r.id);
const versionMap = await this.loadTaskVersionMap(taskIds);
const exportRows = rows.map((r) =>
mapTaskToExportRow({
const exportRows = rows.map((r) => {
const versions = versionMap.get(String(r.id)) ?? [];
return mapTaskToExportRow({
taskNo: r.taskNo,
type: r.type,
status: r.status,
content: r.content,
supportTicketNo: r.supportTicketId != null ? ticketMap.get(String(r.supportTicketId)) ?? null : null,
versionNos: versions.map((v) => v.versionNo).join('、') || null,
creatorName: names.get(String(r.creatorHqAccountId)) ?? null,
createdAt: r.createdAt.toISOString(),
completedAt: r.completedAt?.toISOString() ?? null,
attachmentUrls: parseAttachmentUrls(r.attachmentUrls),
}),
);
});
});
let buffer: Buffer;
switch (dto.format) {
@@ -1396,7 +1407,7 @@ export class DevPlanService {
buffer = await buildDevPlanDocx(exportRows);
break;
case 'xlsx':
buffer = await buildDevPlanXlsx(exportRows);
buffer = await buildDevPlanXlsx(exportRows, dto.columns);
break;
case 'pdf':
buffer = await buildDevPlanPdf(exportRows);
server/dukang-api/src/modules/dev-plan/dto/dev-plan.dto.ts
+5
View File
@@ -221,6 +221,11 @@ export class DevPlanTaskExportDto {
@IsOptional()
@IsString()
keyword?: string;
@IsOptional()
@IsArray()
@IsString({ each: true })
columns?: string[];
}
export class BatchReviewPreviewDto {
server/dukang-api/src/modules/iam/admin-me.controller.ts
+6 -1
View File
@@ -1,6 +1,6 @@
import { Body, Controller, Param, Put, UseGuards } from '@nestjs/common';
import { AuthService } from './auth.service';
import { SaveHqListColumnPrefsDto } from './dto/auth.dto';
import { SaveHqListColumnPrefsDto, UpdateMyHqCredentialsDto } from './dto/auth.dto';
import { JwtAuthGuard } from '../../common/guards/jwt-auth.guard';
import { CurrentUser } from '../../common/decorators/current-user.decorator';
import { AuthUser } from '../../common/guards/jwt-auth.guard';
@@ -18,4 +18,9 @@ export class AdminMeController {
) {
return this.authService.updateMyListColumnPrefs(user.actorType, user.actorId, listKey, dto);
}
@Put('credentials')
updateCredentials(@CurrentUser() user: AuthUser, @Body() dto: UpdateMyHqCredentialsDto) {
return this.authService.updateMyHqCredentials(user.actorType, user.actorId, dto);
}
}
server/dukang-api/src/modules/iam/auth.service.ts
+45 -1
View File
@@ -20,7 +20,7 @@ import type { SmsActorRef } from '../../integrations/sms/sms.interface';
import { SmsCodeStore } from '../../integrations/sms/sms-code.store';
import type { IWechatProvider } from '../../integrations/wechat/wechat.interface';
import { serializeBigInt } from '../../common/decorators/current-user.decorator';
import { verifyPassword } from '../../common/crypto/password.util';
import { verifyPassword, hashPassword } from '../../common/crypto/password.util';
import { AnalyticsService } from '../analytics/analytics.service';
import { UserAddressService } from './user-address.service';
import { ResourceService } from '../common/resource.service';
@@ -1287,6 +1287,50 @@ export class AuthService {
return { listColumnPrefs: parseListColumnPrefs(updated.listColumnPrefs) };
}
async updateMyHqCredentials(
actorType: string,
actorId: bigint,
dto: { loginName?: string; oldPassword?: string; newPassword?: string },
) {
if (actorType !== 'HQ') throw new ForbiddenException('仅总部账号可修改');
const account = await this.prisma.hqAccount.findUnique({ where: { id: actorId } });
if (!account) throw new NotFoundException('账号不存在');
const data: { loginName?: string; passwordHash?: string } = {};
const nextLogin = dto.loginName?.trim();
if (nextLogin !== undefined) {
if (!nextLogin) throw new BadRequestException('用户名不能为空');
if (nextLogin !== account.loginName) {
const dup = await this.prisma.hqAccount.findUnique({ where: { loginName: nextLogin } });
if (dup && dup.id !== account.id) throw new BadRequestException('用户名已被占用');
data.loginName = nextLogin;
}
}
if (dto.newPassword !== undefined) {
const pwd = dto.newPassword.trim();
if (pwd.length < 6) throw new BadRequestException('新密码至少 6 位');
if (account.passwordHash) {
if (!dto.oldPassword?.trim()) throw new BadRequestException('请输入当前密码');
if (!verifyPassword(dto.oldPassword.trim(), account.passwordHash)) {
throw new BadRequestException('当前密码不正确');
}
}
data.passwordHash = hashPassword(pwd);
}
if (!Object.keys(data).length) {
throw new BadRequestException('请填写要修改的内容');
}
const updated = await this.prisma.hqAccount.update({
where: { id: actorId },
data,
});
const { passwordHash: _ph, ...safe } = updated;
return serializeBigInt(safe);
}
wechatDisabled() {
throw new NotImplementedException('FEATURE_DISABLED');
}
server/dukang-api/src/modules/iam/dto/auth.dto.ts
+16
View File
@@ -130,6 +130,22 @@ export class CheckPartnerPhoneDto {
phone: string;
}
export class UpdateMyHqCredentialsDto {
@IsOptional()
@IsString()
@IsNotEmpty()
loginName?: string;
@IsOptional()
@IsString()
oldPassword?: string;
@IsOptional()
@IsString()
@IsNotEmpty()
newPassword?: string;
}
export class SaveHqListColumnPrefsDto {
@IsOptional()
@IsBoolean()
server/dukang-api/src/modules/ops/admin-order-export.util.ts
+66 -76
View File
@@ -3,20 +3,16 @@ import ExcelJS from 'exceljs';
import * as fs from 'fs';
import * as path from 'path';
import PDFDocument from 'pdfkit';
import {
pickExportColumns,
type ExportColumnDef,
} from '../../common/export/column-export.util';
const EXPORT_HEADERS = [
'订单号',
'下单时间',
'状态',
'商品',
'规格',
'数量',
'实付',
'好客权益',
'收货人',
'手机',
'收货地址',
] as const;
const DELIVERY_TYPE_LABELS: Record<string, string> = {
LOCAL: '同城',
CROSS_CITY: '跨城',
ON_SITE_PICKUP: '现场提货',
};
export type OrderExportRow = {
orderNo: string;
@@ -25,7 +21,9 @@ export type OrderExportRow = {
productName: string;
productSpec: string;
quantity: number;
deliveryType: string;
payAmount: number;
logisticsFee: string;
benefitBrief: string;
receiverName: string;
receiverPhone: string;
@@ -95,7 +93,9 @@ export function mapOrderToExportRow(order: {
productName: order.productName,
productSpec: order.productSpec,
quantity: order.quantity,
deliveryType: DELIVERY_TYPE_LABELS[order.deliveryType ?? ''] || order.deliveryType || '',
payAmount: Number(order.payAmount),
logisticsFee: '',
benefitBrief: formatBenefitBrief(order),
receiverName: order.receiverName,
receiverPhone: order.receiverPhone,
@@ -103,22 +103,49 @@ export function mapOrderToExportRow(order: {
};
}
export function rowToCells(row: OrderExportRow): string[] {
function orderExportColumnDefs(): ExportColumnDef<OrderExportRow>[] {
return [
row.orderNo,
row.createdAt,
row.status,
row.productName,
row.productSpec,
String(row.quantity),
row.payAmount.toFixed(2),
row.benefitBrief,
row.receiverName,
row.receiverPhone,
row.address,
{ key: '订单号', header: '订单号', value: (r) => r.orderNo },
{ key: '下单时间', header: '下单时间', value: (r) => r.createdAt },
{ key: '状态', header: '状态', value: (r) => r.status },
{ key: '商品', header: '商品', value: (r) => r.productName },
{ key: '规格', header: '规格', value: (r) => r.productSpec },
{ key: '数量', header: '数量', value: (r) => r.quantity },
{ key: '配送方式', header: '配送方式', value: (r) => r.deliveryType },
{ key: '实付', header: '实付', value: (r) => r.payAmount.toFixed(2) },
{ key: '运费', header: '运费', value: (r) => r.logisticsFee },
{ key: '好客权益', header: '好客权益', value: (r) => r.benefitBrief },
{ key: '收货人', header: '收货人', value: (r) => r.receiverName },
{ key: '电话', header: '电话', value: (r) => r.receiverPhone },
{ key: '地址', header: '地址', value: (r) => r.address },
];
}
const ORDER_COLUMN_ALIASES: Record<string, string> = {
orderNo: '订单号',
createdAt: '下单时间',
status: '状态',
productName: '商品',
productSpec: '规格',
quantity: '数量',
deliveryType: '配送方式',
payAmount: '实付',
logisticsFee: '运费',
benefitBrief: '好客权益',
receiverName: '收货人',
receiverPhone: '电话',
phone: '电话',
receiverAddress: '地址',
address: '地址',
手机: '电话',
收货地址: '地址',
};
function normalizeOrderColumns(columnKeys?: string[]): string[] | undefined {
if (!columnKeys?.length) return undefined;
return columnKeys.map((k) => ORDER_COLUMN_ALIASES[k] ?? k);
}
function resolvePdfFontPath(): string {
const candidates = [
process.env.EXPORT_PDF_FONT_PATH,
@@ -138,79 +165,42 @@ function resolvePdfFontPath(): string {
throw new Error('未找到可用于 PDF 的中文字体，请将字体文件放到 server/dukang-api/assets/fonts/');
}
export async function buildOrdersXlsx(rows: OrderExportRow[]): Promise<Buffer> {
export async function buildOrdersXlsx(rows: OrderExportRow[], columnKeys?: string[]): Promise<Buffer> {
const cols = pickExportColumns(orderExportColumnDefs(), normalizeOrderColumns(columnKeys));
const workbook = new ExcelJS.Workbook();
const sheet = workbook.addWorksheet('订单');
sheet.addRow([...EXPORT_HEADERS]);
sheet.addRow(cols.map((c) => c.header));
for (const row of rows) {
sheet.addRow(rowToCells(row));
sheet.addRow(cols.map((c) => c.value(row)));
}
sheet.columns.forEach((col) => {
col.width = 16;
});
sheet.getColumn(4).width = 22;
sheet.getColumn(8).width = 36;
sheet.getColumn(11).width = 36;
const buffer = await workbook.xlsx.writeBuffer();
return Buffer.from(buffer);
}
export async function buildOrdersPdf(rows: OrderExportRow[]): Promise<Buffer> {
export async function buildOrdersPdf(rows: OrderExportRow[], columnKeys?: string[]): Promise<Buffer> {
const cols = pickExportColumns(orderExportColumnDefs(), normalizeOrderColumns(columnKeys));
const fontPath = resolvePdfFontPath();
const chunks: Buffer[] = [];
return new Promise((resolve, reject) => {
const doc = new PDFDocument({
size: 'A4',
layout: 'landscape',
margin: 24,
bufferPages: true,
});
doc.on('data', (chunk) => chunks.push(chunk as Buffer));
const doc = new PDFDocument({ size: 'A4', layout: 'landscape', margin: 24, bufferPages: true });
doc.on('data', (c) => chunks.push(c as Buffer));
doc.on('end', () => resolve(Buffer.concat(chunks)));
doc.on('error', reject);
doc.registerFont('zh', fontPath);
doc.font('zh');
const pageWidth = doc.page.width - doc.page.margins.left - doc.page.margins.right;
const colWidths = [72, 78, 48, 88, 64, 32, 48, 110, 48, 72, 120];
const scale = pageWidth / colWidths.reduce((sum, w) => sum + w, 0);
const widths = colWidths.map((w) => w * scale);
const rowHeight = 28;
const fontSize = 7;
let y = doc.page.margins.top;
const drawRow = (cells: string[], isHeader = false) => {
let x = doc.page.margins.left;
const height = isHeader ? 24 : rowHeight;
if (y + height > doc.page.height - doc.page.margins.bottom) {
doc.addPage({ size: 'A4', layout: 'landscape', margin: 24 });
y = doc.page.margins.top;
}
doc.fontSize(isHeader ? 8 : fontSize);
cells.forEach((cell, index) => {
doc.rect(x, y, widths[index], height).stroke('#dddddd');
doc.text(cell || '', x + 2, y + 4, {
width: widths[index] - 4,
height: height - 6,
lineBreak: true,
});
x += widths[index];
});
y += height;
};
drawRow([...EXPORT_HEADERS], true);
doc.font(fontPath);
doc.fontSize(10).text(cols.map((c) => c.header).join(' | '));
doc.moveDown(0.5);
for (const row of rows) {
drawRow(rowToCells(row));
doc.text(cols.map((c) => String(c.value(row))).join(' | '));
}
doc.end();
});
}
export function buildExportFilename(format: 'xlsx' | 'pdf', count: number): string {
const stamp = formatShanghaiDateTime(new Date()).slice(0, 10);
return `订单导出_${stamp}_${count}条.${format}`;
const stamp = new Date().toISOString().slice(0, 10);
return `订单导出_${stamp}_${count}.${format}`;
}
server/dukang-api/src/modules/ops/admin-orders.service.ts
+3 -1
View File
@@ -156,7 +156,9 @@ export class AdminOrdersService {
const rows = orders.map((order) => mapOrderToExportRow(order));
const buffer =
dto.format === 'pdf' ? await buildOrdersPdf(rows) : await buildOrdersXlsx(rows);
dto.format === 'pdf'
? await buildOrdersPdf(rows, dto.columns)
: await buildOrdersXlsx(rows, dto.columns);
const filename = buildExportFilename(dto.format, rows.length);
const mimeType =
dto.format === 'pdf'
server/dukang-api/src/modules/ops/dto/admin-mutate.dto.ts
+2 -2
View File
@@ -1164,7 +1164,7 @@ export class CreateHqAccountDto {
name: string;
@IsOptional()
@IsIn(['SUPER_ADMIN', 'OPS', 'FINANCE', 'CUSTOMER_SERVICE', 'CITY_STORE_SERVICE'])
@IsIn(['SUPER_ADMIN', 'OPS', 'FINANCE', 'CUSTOMER_SERVICE', 'CITY_STORE_SERVICE', 'DEVELOPER'])
adminRole?: string;
@IsOptional()
@@ -1191,7 +1191,7 @@ export class UpdateHqAccountDto {
name?: string;
@IsOptional()
@IsIn(['SUPER_ADMIN', 'OPS', 'FINANCE', 'CUSTOMER_SERVICE', 'CITY_STORE_SERVICE'])
@IsIn(['SUPER_ADMIN', 'OPS', 'FINANCE', 'CUSTOMER_SERVICE', 'CITY_STORE_SERVICE', 'DEVELOPER'])
adminRole?: string;
@IsOptional()
server/dukang-api/src/modules/ops/dto/admin-query.dto.ts
+6
View File
@@ -225,6 +225,12 @@ export class AdminOrdersExportDto {
@IsOptional()
@IsString()
assocPartnerAccountId?: string;
/** 按列表可见列导出（中文列名或英文 key） */
@IsOptional()
@IsArray()
@IsString({ each: true })
columns?: string[];
}
/** 概览页用户/订单 ECharts 聚合筛选 */
server/dukang-api/src/modules/settlement/settlement.controller.ts
+4
View File
@@ -300,6 +300,7 @@ export class AdminStoreBillController {
storeId: query.storeId,
dateFrom: query.dateFrom,
dateTo: query.dateTo,
columns: query.columns,
});
}
@@ -391,6 +392,7 @@ export class AdminPartnerBillController {
year: query.year ? Number(query.year) : undefined,
month: query.month ? Number(query.month) : undefined,
weekStartYmd: query.weekStartYmd,
columns: query.columns,
});
}
@@ -493,6 +495,7 @@ export class AdminWineryBillController {
dateTo: query.dateTo,
year: query.year ? Number(query.year) : undefined,
month: query.month ? Number(query.month) : undefined,
columns: query.columns,
});
}
@@ -575,6 +578,7 @@ export class AdminLogisticsBillController {
providerId: query.providerId,
year: query.year ? Number(query.year) : undefined,
month: query.month ? Number(query.month) : undefined,
columns: query.columns,
});
}
server/dukang-api/src/modules/settlement/settlement.service.ts
+340 -247
View File
@@ -21,6 +21,7 @@ import {
previousShanghaiWeek,
resolveSettlementRate,
shanghaiBillPeriodYmds,
shanghaiCalendarDaysBetween,
shanghaiMonthLastInstant,
shanghaiMonthRange,
shanghaiPeriodYmds,
@@ -40,6 +41,7 @@ import {
import { PrismaService } from '../../common/prisma/prisma.module';
import { serializeBigInt } from '../../common/decorators/current-user.decorator';
import { AlertService } from '../../common/alert/alert.service';
import { buildCsvFromColumns, parseExportColumnKeys, type ExportColumnDef } from '../../common/export/column-export.util';
import { WecomMessagePushService } from '../../integrations/wecom/wecom-message-push.service';
import { AnalyticsService } from '../analytics/analytics.service';
import { PartnerCityService } from '../city-scope/partner-city.service';
@@ -88,6 +90,34 @@ function withShanghaiPeriod<T extends { periodStart: Date; periodEnd: Date }>(ro
return { ...row, ...shanghaiBillPeriodYmds(row.periodStart, row.periodEnd) };
}
/** 门店 T+1：账期 = 出账日前一日 */
function mapStoreBillDates(billDate: Date) {
const billDateYmd = shanghaiYmd(billDate);
const periodDay = shanghaiYmd(addShanghaiDays(parseShanghaiYmd(billDateYmd), -1));
return { billDate: billDateYmd, periodStart: periodDay, periodEnd: periodDay };
}
/**
* 合伙人出账日：周账 = 账期周一 + 7 天（下周一）；
* 历史月账 = 账期所在月次月 1 日。
*/
function partnerBillIssueYmd(periodStart: Date, periodEnd: Date): string {
const days = shanghaiCalendarDaysBetween(periodStart, periodEnd);
if (days >= 0 && days <= 8) {
return shanghaiYmd(addShanghaiDays(startOfShanghaiDay(periodStart), 7));
}
const [y, m] = shanghaiYmd(periodStart).split('-').map(Number);
return shanghaiYmd(shanghaiMonthRange(y, m).endExclusive);
}
function withPartnerBillDates<T extends { periodStart: Date; periodEnd: Date }>(row: T) {
return {
...row,
...shanghaiBillPeriodYmds(row.periodStart, row.periodEnd),
billDate: partnerBillIssueYmd(row.periodStart, row.periodEnd),
};
}
function resolvePartnerWeekPeriod(weekStartYmd: string): {
periodStart: Date;
periodEnd: Date;
@@ -1429,14 +1459,20 @@ export class SettlementService implements OnModuleInit {
const payoutAmount = rows.reduce((s, r) => s + r.amount, 0);
return serializeBigInt({
items: slice.map((r) => ({
...r,
date: r.kind === 'T1_BILL' ? shanghaiYmd(r.date) : r.date,
bankAccount:
r.kind === 'T1_BILL'
? bankMap.get(String(r.storeId)) ?? null
: null,
})),
items: slice.map((r) => {
const storeDates =
r.kind === 'T1_BILL' ? mapStoreBillDates(r.date) : null;
return {
...r,
date: r.kind === 'T1_BILL' ? storeDates!.billDate : r.date,
periodStart: storeDates?.periodStart ?? null,
periodEnd: storeDates?.periodEnd ?? null,
bankAccount:
r.kind === 'T1_BILL'
? bankMap.get(String(r.storeId)) ?? null
: null,
};
}),
total,
page,
pageSize,
@@ -1487,7 +1523,7 @@ export class SettlementService implements OnModuleInit {
};
return serializeBigInt({
items: items.map((b) => ({ ...b, billDate: shanghaiYmd(b.billDate) })),
items: items.map((b) => ({ ...b, ...mapStoreBillDates(b.billDate) })),
total,
page,
pageSize,
@@ -1510,7 +1546,7 @@ export class SettlementService implements OnModuleInit {
const storeAccount = await loadStorePrimaryBank(this.prisma, bill.storeId);
return serializeBigInt({
...bill,
billDate: shanghaiYmd(bill.billDate),
...mapStoreBillDates(bill.billDate),
storeAccount,
paymentProofUrls: parsePaymentProofUrls(bill.paymentProofUrls),
});
@@ -1568,6 +1604,7 @@ export class SettlementService implements OnModuleInit {
storeId?: string;
dateFrom?: string;
dateTo?: string;
columns?: string;
}) {
const where = this.buildStoreBillWhere(query);
const bills = await this.prisma.storeBill.findMany({
@@ -1579,44 +1616,70 @@ export class SettlementService implements OnModuleInit {
this.prisma,
bills.map((b) => b.storeId),
);
const header = [
'账单号',
'出账日',
'门店',
'城市',
'核销笔数',
'核销金额',
'结算比例',
'应付金额',
'状态',
'打款时间',
'打款凭证',
'打款凭证照片',
'收款户名',
'收款账号',
'开户行',
].join(',');
const rows = bills.map((b) => {
const bank = bankMap.get(String(b.storeId));
return [
csvEscape(b.billNo),
shanghaiYmd(b.billDate),
csvEscape(b.store.name),
csvEscape(b.store.cityName ?? ''),
b.redeemCount,
Number(b.redeemAmount),
Number(b.settlementRate),
Number(b.payoutAmount),
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 ?? ''),
].join(',');
});
return { csv: `\uFEFF${[header, ...rows].join('\n')}`, count: bills.length };
const columnKeys = parseExportColumnKeys(query.columns);
type Row = (typeof bills)[number] & { bank?: ReturnType<typeof bankMap.get> extends infer T ? T : never };
const rows = bills.map((b) => ({ ...b, bank: bankMap.get(String(b.storeId)) }));
const defs: ExportColumnDef<Row>[] = [
{ key: '账单号', header: '账单号', value: (r) => r.billNo },
{ key: '出账日', header: '出账日', value: (r) => shanghaiYmd(r.billDate) },
{
key: '账期',
header: '账期',
value: (r) => {
const d = mapStoreBillDates(r.billDate);
return `${d.periodStart} ~ ${d.periodEnd}`;
},
},
{ key: '门店', header: '门店', value: (r) => r.store.name },
{ key: '登录手机', header: '登录手机', value: (r) => r.store.phone ?? '' },
{ key: '城市', header: '城市', value: (r) => r.store.cityName ?? '' },
{ key: '收款户名', header: '收款户名', value: (r) => r.bank?.bankAccountName ?? '' },
{ key: '收款账号', header: '收款账号', value: (r) => r.bank?.bankAccountNo ?? '' },
{ key: '笔数', header: '笔数', value: (r) => r.redeemCount },
{ key: '应付金额', header: '应付金额', value: (r) => Number(r.payoutAmount) },
{ key: '核销金额', header: '核销金额', value: (r) => Number(r.redeemAmount) },
{ key: '结算比例', header: '结算比例', value: (r) => Number(r.settlementRate) },
{ key: '状态', header: '状态', value: (r) => r.status },
{
key: '打款时间',
header: '打款时间',
value: (r) => (r.paidAt ? r.paidAt.toISOString().slice(0, 19).replace('T', ' ') : ''),
},
{ key: '打款凭证', header: '打款凭证', value: (r) => r.paymentRef ?? '' },
{
key: '打款凭证照片',
header: '打款凭证照片',
value: (r) => parsePaymentProofUrls(r.paymentProofUrls).join(' '),
},
{ key: '开户行', header: '开户行', value: (r) => r.bank?.bankBranch ?? '' },
];
// 兼容旧英文 key
const aliases: Record<string, string> = {
billNo: '账单号',
date: '出账日',
billDate: '出账日',
period: '账期',
'store.name': '门店',
'store.phone': '登录手机',
'store.cityName': '城市',
bankAccountName: '收款户名',
bankAccountNo: '收款账号',
redeemCount: '笔数',
amount: '应付金额',
redeemAmount: '核销金额',
settlementRate: '结算比例',
status: '状态',
paidAt: '打款时间',
paymentRef: '打款凭证',
paymentProofUrls: '打款凭证照片',
bankBranch: '开户行',
};
const normalized = columnKeys?.map((k) => aliases[k] ?? k);
return buildCsvFromColumns(defs, rows, normalized);
}
private buildStoreBillWhere(query: {
@@ -1665,7 +1728,7 @@ export class SettlementService implements OnModuleInit {
eventName: 'partner_bill_view',
extraJson: { count: bills.length },
});
return serializeBigInt(bills.map(withShanghaiPeriod));
return serializeBigInt(bills.map(withPartnerBillDates));
}
getPartnerSettlementCycle(anchor = new Date()) {
@@ -1737,7 +1800,7 @@ export class SettlementService implements OnModuleInit {
});
const { items, ...header } = bill;
return serializeBigInt({
...withShanghaiPeriod(header),
...withPartnerBillDates(header),
partnerId: header.partnerAccountId.toString(),
...splitPartnerBillItems(items),
});
@@ -1785,7 +1848,7 @@ export class SettlementService implements OnModuleInit {
]);
const items = rawItems.map((b) => ({
...withShanghaiPeriod(b),
...withPartnerBillDates(b),
partner: b.partnerAccount,
}));
@@ -1904,7 +1967,7 @@ export class SettlementService implements OnModuleInit {
if (!bill) throw new NotFoundException('账单不存在');
const { items, ...header } = bill;
return serializeBigInt({
...withShanghaiPeriod(header),
...withPartnerBillDates(header),
partnerId: header.partnerAccountId.toString(),
...splitPartnerBillItems(items),
});
@@ -2229,6 +2292,7 @@ export class SettlementService implements OnModuleInit {
year?: number;
month?: number;
weekStartYmd?: string;
columns?: string;
}) {
const where = this.buildPartnerBillWhere(query);
const bills = await this.prisma.partnerBill.findMany({
@@ -2237,76 +2301,82 @@ export class SettlementService implements OnModuleInit {
partnerAccount: {
select: {
companyName: true,
name: true,
phone: true,
bankAccountName: true,
bankAccountNo: true,
bankBranch: true,
},
},
items: { orderBy: { occurredAt: 'asc' } },
},
orderBy: { periodStart: 'desc' },
});
const columnKeys = parseExportColumnKeys(query.columns);
const header = [
'账单号',
'合伙人',
'登录手机',
'账期起',
'账期止',
'酒单佣金',
'核销佣金',
'合计应付',
'状态',
'发送时间',
'确认时间',
'打款时间',
'打款凭证',
'收款户名',
'收款账号',
'开户行',
'驳回理由',
].join(',');
const rows = bills.map((b) =>
[
csvEscape(b.billNo),
csvEscape(b.partnerAccount.companyName ?? ''),
csvEscape(b.partnerAccount.phone ?? ''),
shanghaiBillPeriodYmds(b.periodStart, b.periodEnd).periodStart,
shanghaiBillPeriodYmds(b.periodStart, b.periodEnd).periodEnd,
Number(b.orderCommission),
Number(b.redeemCommission),
Number(b.totalAmount),
b.status,
b.sentAt ? shanghaiYmd(b.sentAt) : '',
b.confirmedAt ? shanghaiYmd(b.confirmedAt) : '',
b.paidAt ? shanghaiYmd(b.paidAt) : '',
csvEscape(b.paymentRef ?? ''),
csvEscape(b.partnerAccount.bankAccountName ?? ''),
csvEscape(b.partnerAccount.bankAccountNo ?? ''),
csvEscape(b.partnerAccount.bankBranch ?? ''),
csvEscape(b.rejectReason ?? ''),
].join(','),
);
type Row = (typeof bills)[number];
const defs: ExportColumnDef<Row>[] = [
{ key: '账单号', header: '账单号', value: (r) => r.billNo },
{
key: '合伙人',
header: '合伙人',
value: (r) => {
const c = (r.partnerAccount.companyName || '').trim();
const n = (r.partnerAccount.name || '').trim();
if (c && n) return `${c}-${n}`;
return c || n || r.partnerAccount.phone || '';
},
},
{
key: '出账日',
header: '出账日',
value: (r) => partnerBillIssueYmd(r.periodStart, r.periodEnd),
},
{
key: '账期',
header: '账期',
value: (r) => {
const p = shanghaiBillPeriodYmds(r.periodStart, r.periodEnd);
return `${p.periodStart} ~ ${p.periodEnd}`;
},
},
{ key: '酒单佣金', header: '酒单佣金', value: (r) => Number(r.orderCommission) },
{ key: '核销佣金', header: '核销佣金', value: (r) => Number(r.redeemCommission) },
{ key: '合计应付', header: '合计应付', value: (r) => Number(r.totalAmount) },
{ key: '收款户名', header: '收款户名', value: (r) => r.partnerAccount.bankAccountName ?? '' },
{ key: '收款账号', header: '收款账号', value: (r) => r.partnerAccount.bankAccountNo ?? '' },
{ key: '状态', header: '状态', value: (r) => r.status },
{ key: '登录手机', header: '登录手机', value: (r) => r.partnerAccount.phone ?? '' },
{ key: '开户行', header: '开户行', value: (r) => r.partnerAccount.bankBranch ?? '' },
{
key: '发送时间',
header: '发送时间',
value: (r) => (r.sentAt ? shanghaiYmd(r.sentAt) : ''),
},
{
key: '确认时间',
header: '确认时间',
value: (r) => (r.confirmedAt ? shanghaiYmd(r.confirmedAt) : ''),
},
{
key: '打款时间',
header: '打款时间',
value: (r) => (r.paidAt ? shanghaiYmd(r.paidAt) : ''),
},
{ key: '打款凭证', header: '打款凭证', value: (r) => r.paymentRef ?? '' },
{ key: '驳回理由', header: '驳回理由', value: (r) => r.rejectReason ?? '' },
];
const itemHeader = ['账单号', '类型', '单号', '标题', '备注', '基数', '费率', '佣金', '发生时间'].join(',');
const itemRows = bills.flatMap((b) =>
b.items.map((it) =>
[
csvEscape(b.billNo),
it.kind === 'ORDER' ? '酒订单' : '核销',
csvEscape(it.refNo),
csvEscape(it.title ?? ''),
csvEscape(it.extra ?? ''),
Number(it.baseAmount),
Number(it.rate),
Number(it.commission),
it.occurredAt.toISOString().slice(0, 19).replace('T', ' '),
].join(','),
),
);
const csv = ['账单汇总', header, ...rows, '', '酒订单/核销明细', itemHeader, ...itemRows].join('\n');
return { csv: `\uFEFF${csv}`, count: bills.length };
const aliases: Record<string, string> = {
billNo: '账单号',
billDate: '出账日',
period: '账期',
orderCommission: '酒单佣金',
redeemCommission: '核销佣金',
totalAmount: '合计应付',
status: '状态',
};
const normalized = columnKeys?.map((k) => aliases[k] ?? k);
return buildCsvFromColumns(defs, bills, normalized);
}
// ─── Winery bills ────────────────────────────────────
@@ -2673,7 +2743,7 @@ export class SettlementService implements OnModuleInit {
};
return serializeBigInt({
items: items.map((b) => ({ ...b, billDate: shanghaiYmd(b.billDate) })),
items: items.map((b) => this.mapWineryBillForAdmin(b)),
total,
page,
pageSize,
@@ -2681,6 +2751,33 @@ export class SettlementService implements OnModuleInit {
});
}
private mapWineryBillForAdmin(b: {
id: bigint;
billNo: string;
billDate: Date;
orderCount: number;
orderAmount: Prisma.Decimal | number;
wineryRate: Prisma.Decimal | number;
wineryAmount: Prisma.Decimal | number;
status: string;
paidAt?: Date | null;
paymentRef?: string | null;
}) {
const billDateYmd = shanghaiYmd(b.billDate);
const { start, end } = shanghaiWineryPeriodWindow(
parseShanghaiYmd(billDateYmd),
WINERY_SETTLEMENT_PERIOD_DAYS,
);
const periodStart = shanghaiYmd(start);
const periodEnd = shanghaiYmd(addShanghaiDays(end, -1));
return {
...b,
billDate: billDateYmd,
periodStart,
periodEnd,
};
}
async getAdminWineryBill(id: bigint) {
const bill = await this.prisma.wineryBill.findUnique({
where: { id },
@@ -2688,7 +2785,7 @@ export class SettlementService implements OnModuleInit {
});
if (!bill) throw new NotFoundException('酒厂对账单不存在');
const wineryBank = await loadWineryBankConfig(this.prisma);
return serializeBigInt({ ...bill, billDate: shanghaiYmd(bill.billDate), wineryBank });
return serializeBigInt({ ...this.mapWineryBillForAdmin(bill), items: bill.items, wineryBank });
}
async confirmWineryBill(id: bigint, dto: { paymentRef?: string } = {}) {
@@ -2728,87 +2825,87 @@ export class SettlementService implements OnModuleInit {
dateTo?: string;
year?: number;
month?: number;
columns?: string;
}) {
const where = this.buildWineryBillWhere(query);
const bills = await this.prisma.wineryBill.findMany({
where,
include: { items: true },
orderBy: { billDate: 'desc' },
});
const wineryBank = await loadWineryBankConfig(this.prisma);
const columnKeys = parseExportColumnKeys(query.columns);
const header = [
'账单号',
'账单日',
'订单号',
'配送类型',
'实付金额',
'酒厂比例',
'应付',
'支付时间',
'账单状态',
'打款凭证',
'收款户名',
'开户银行',
'开户支行',
'收款账号',
].join(',');
const rows: string[] = [];
const statusLabel = (b: { status: string; wineryAmount: Prisma.Decimal | number }) => {
if (Number(b.wineryAmount) === 0) return '无需打款';
if (b.status === 'PAID') return '已打款';
if (b.status === 'UNPAID') return '未打款';
return b.status;
};
const bankCols = (b: { paymentRef?: string | null }) => [
csvEscape(b.paymentRef ?? ''),
csvEscape(wineryBank.bankAccountName ?? ''),
csvEscape(wineryBank.bankName ?? ''),
csvEscape(wineryBank.bankBranch ?? ''),
csvEscape(wineryBank.bankAccountNo ?? ''),
type ExportRow = {
billNo: string;
billDate: string;
periodStart: string;
periodEnd: string;
orderCount: number;
orderAmount: Prisma.Decimal | number;
wineryRate: Prisma.Decimal | number;
wineryAmount: Prisma.Decimal | number;
status: string;
paymentRef?: string | null;
paidAt?: Date | null;
};
const rows: ExportRow[] = bills.map((b) => ({
...this.mapWineryBillForAdmin(b),
paymentRef: b.paymentRef,
paidAt: b.paidAt,
}));
const defs: ExportColumnDef<ExportRow>[] = [
{ key: '账单号', header: '账单号', value: (r) => r.billNo },
{ key: '出账日', header: '出账日', value: (r) => r.billDate },
{
key: '账期',
header: '账期',
value: (r) => `${r.periodStart} ~ ${r.periodEnd}`,
},
{ key: '订单数', header: '订单数', value: (r) => r.orderCount },
{ key: '订单总额', header: '订单总额', value: (r) => Number(r.orderAmount) },
{ key: '酒厂比例', header: '酒厂比例', value: (r) => Number(r.wineryRate) },
{ key: '应付', header: '应付', value: (r) => Number(r.wineryAmount) },
{ key: '状态', header: '状态', value: (r) => statusLabel(r) },
{
key: '打款时间',
header: '打款时间',
value: (r) => (r.paidAt ? r.paidAt.toISOString().slice(0, 19).replace('T', ' ') : ''),
},
{ key: '打款凭证', header: '打款凭证', value: (r) => r.paymentRef ?? '' },
{ key: '收款户名', header: '收款户名', value: () => wineryBank.bankAccountName ?? '' },
{ key: '开户银行', header: '开户银行', value: () => wineryBank.bankName ?? '' },
{ key: '开户支行', header: '开户支行', value: () => wineryBank.bankBranch ?? '' },
{ key: '收款账号', header: '收款账号', value: () => wineryBank.bankAccountNo ?? '' },
];
for (const b of bills) {
if (b.items.length === 0) {
rows.push(
[
csvEscape(b.billNo),
shanghaiYmd(b.billDate),
'',
'',
Number(b.orderAmount),
Number(b.wineryRate),
Number(b.wineryAmount),
'',
statusLabel(b),
...bankCols(b),
].join(','),
);
continue;
}
for (const item of b.items) {
rows.push(
[
csvEscape(b.billNo),
shanghaiYmd(b.billDate),
csvEscape(item.orderNo),
item.deliveryType === 'LOCAL'
? '同城'
: item.deliveryType === 'CROSS_CITY'
? '跨城'
: item.deliveryType === 'ON_SITE_PICKUP'
? '现场提货'
: item.deliveryType,
Number(item.payAmount),
Number(b.wineryRate),
Number(item.wineryAmount),
item.paidAt.toISOString().slice(0, 19).replace('T', ' '),
statusLabel(b),
...bankCols(b),
].join(','),
);
}
}
return { csv: `\uFEFF${[header, ...rows].join('\n')}`, count: rows.length };
const aliases: Record<string, string> = {
billNo: '账单号',
billDate: '出账日',
period: '账期',
orderCount: '订单数',
orderAmount: '订单总额',
wineryRate: '酒厂比例',
wineryAmount: '应付',
status: '状态',
paidAt: '打款时间',
paymentRef: '打款凭证',
bankAccountName: '收款户名',
bankName: '开户银行',
bankBranch: '开户支行',
bankAccountNo: '收款账号',
};
const normalized = columnKeys?.map((k) => aliases[k] ?? k);
return buildCsvFromColumns(defs, rows, normalized);
}
private buildWineryBillWhere(query: {
@@ -3362,6 +3459,7 @@ export class SettlementService implements OnModuleInit {
providerId?: string;
year?: number;
month?: number;
columns?: string;
}) {
const where = this.buildLogisticsBillWhere(query);
const bills = await this.prisma.logisticsBill.findMany({
@@ -3377,78 +3475,73 @@ export class SettlementService implements OnModuleInit {
bankAccountNo: true,
},
},
items: true,
},
orderBy: { periodStart: 'desc' },
});
const columnKeys = parseExportColumnKeys(query.columns);
const header = [
'账单号',
'承运商编码',
'承运商名称',
'账期起',
'账期止',
'结算方式',
'订单号',
'瓶数',
'物流费',
'发货时间',
'账单状态',
'打款凭证',
'收款户名',
'开户银行',
'开户支行',
'收款账号',
].join(',');
const rows: string[] = [];
for (const b of bills) {
const p = b.fulfillmentProvider;
const bankCols = [
csvEscape(b.paymentRef ?? ''),
csvEscape(p.bankAccountName ?? ''),
csvEscape(p.bankName ?? ''),
csvEscape(p.bankBranch ?? ''),
csvEscape(p.bankAccountNo ?? ''),
];
if (b.items.length === 0) {
rows.push(
[
csvEscape(b.billNo),
csvEscape(p.code),
csvEscape(p.name),
shanghaiPeriodYmds(b.periodStart).periodStart,
shanghaiPeriodYmds(b.periodStart).periodEnd,
b.settlementMethod,
'',
b.bottleCount,
Number(b.logisticsAmount),
'',
b.status,
...bankCols,
].join(','),
);
continue;
}
for (const item of b.items) {
rows.push(
[
csvEscape(b.billNo),
csvEscape(p.code),
csvEscape(p.name),
shanghaiPeriodYmds(b.periodStart).periodStart,
shanghaiPeriodYmds(b.periodStart).periodEnd,
b.settlementMethod,
csvEscape(item.orderNo),
item.quantity,
Number(item.logisticsAmount),
item.shippedAt.toISOString().slice(0, 19).replace('T', ' '),
b.status,
...bankCols,
].join(','),
);
}
}
return { csv: `\uFEFF${[header, ...rows].join('\n')}`, count: rows.length };
type Row = (typeof bills)[number];
const defs: ExportColumnDef<Row>[] = [
{ key: '账单号', header: '账单号', value: (r) => r.billNo },
{
key: '承运商',
header: '承运商',
value: (r) => `${r.fulfillmentProvider.name} (${r.fulfillmentProvider.code})`,
},
{
key: '账期',
header: '账期',
value: (r) => {
const p = shanghaiPeriodYmds(r.periodStart);
return `${p.periodStart} ~ ${p.periodEnd}`;
},
},
{
key: '结算方式',
header: '结算方式',
value: (r) =>
LOGISTICS_SETTLEMENT_METHOD_LABELS[
r.settlementMethod as keyof typeof LOGISTICS_SETTLEMENT_METHOD_LABELS
] || r.settlementMethod,
},
{ key: '订单数', header: '订单数', value: (r) => r.orderCount },
{ key: '瓶数', header: '瓶数', value: (r) => r.bottleCount },
{ key: '物流费', header: '物流费', value: (r) => Number(r.logisticsAmount) },
{
key: '收款户名',
header: '收款户名',
value: (r) => r.fulfillmentProvider.bankAccountName ?? '',
},
{
key: '收款账号',
header: '收款账号',
value: (r) => r.fulfillmentProvider.bankAccountNo ?? '',
},
{ key: '状态', header: '状态', value: (r) => r.status },
{
key: '开户银行',
header: '开户银行',
value: (r) => r.fulfillmentProvider.bankName ?? '',
},
{
key: '开户支行',
header: '开户支行',
value: (r) => r.fulfillmentProvider.bankBranch ?? '',
},
{ key: '打款凭证', header: '打款凭证', value: (r) => r.paymentRef ?? '' },
];
const aliases: Record<string, string> = {
billNo: '账单号',
period: '账期',
settlementMethod: '结算方式',
orderCount: '订单数',
bottleCount: '瓶数',
logisticsAmount: '物流费',
status: '状态',
};
const normalized = columnKeys?.map((k) => aliases[k] ?? k);
return buildCsvFromColumns(defs, bills, normalized);
}
private buildLogisticsBillWhere(query: {