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

feat(wecom): 结算账单明细与成交播报用户明文

Browse Source 
支付/核销补 HQ 备注且手机号不脱敏；结算通知按城市、合伙人、笔数和累计金额分块推送。

Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
jacy
2026-08-27 11:44:49 +08:00
parent 3dbb73e428
commit 737efb89a3
11 changed files with 688 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/dukang-api/src/modules/redeem/redeem.service.ts
+3 -3
View File
@@ -8,7 +8,6 @@ import {
calcRedeemSettleAmount,
generateRedeemNo,
generateRedeemPendingNo,
maskContactPhone,
REDEEM_WEAKNET_FAIL_THRESHOLD,
resolveSettlementRate,
validateRedeemAmount,
@@ -197,7 +196,7 @@ export class RedeemService {
const [userRow, storeRow] = await Promise.all([
this.prisma.user.findUnique({
where: { id: userId },
select: { isTest: true, nickname: true, phone: true },
select: { isTest: true, nickname: true, phone: true, hqRemark: true },
}),
this.prisma.store.findUnique({
where: { id: account.storeId },
@@ -295,7 +294,8 @@ export class RedeemService {
storeName: account.store.name || String(account.storeId),
channel: channelLabel,
userName: userRow?.nickname?.trim() || '—',
userPhone: maskContactPhone(userRow?.phone),
userPhone: (userRow?.phone || '').trim() || '—',
userRemark: (userRow?.hqRemark || '').trim() || '—',
},
{
handlePath: `/redeem-records?redeemNo=${encodeURIComponent(record.redeemNo)}`,
server/dukang-api/src/modules/settlement/settlement.service.ts
+246 -85
View File
@@ -3,6 +3,7 @@ import { Prisma } from '@prisma/client';
import {
DEFAULT_STORE_WITHDRAW_DAILY_LIMIT,
DEFAULT_XFX_LOGISTICS_PRICING,
LOGISTICS_SETTLEMENT_METHOD_LABELS,
WINERY_SETTLEMENT_LAG_DAYS,
WINERY_SETTLEMENT_RATE,
} from '@dukang/shared-types';
@@ -28,6 +29,17 @@ import {
loadWineryBankConfig,
formatWecomBankAccount,
} from '../../common/store/store-bank.util';
import {
capBillBlocks,
formatLogisticsBillWecomBlock,
formatPartnerBillWecomBlock,
formatPartnerDashLabel,
formatPercent,
formatStoreBillWecomBlock,
joinLimited,
wecomBankParts,
type WecomBankLike,
} from './wecom-bill-digest';
function generateBillNo(prefix: string) {
return `${prefix}${Date.now()}${Math.floor(Math.random() * 900 + 100)}`;
@@ -63,12 +75,37 @@ function round2(n: number) {
return Math.round(n * 100) / 100;
}
const BILL_DIGEST_MAX_LINES = 15;
function sumAmounts(rows: Array<{ amount: number }>): string {
return rows.reduce((s, r) => s + Number(r.amount || 0), 0).toFixed(2);
}
function capBillSummary(lines: string[]): string {
if (!lines.length) return '无';
if (lines.length <= BILL_DIGEST_MAX_LINES) return lines.join('\n');
return `${lines.slice(0, BILL_DIGEST_MAX_LINES).join('\n')}\n…等共 ${lines.length} 笔`;
function storeWecomMeta(
store:
| {
name?: string | null;
cityName?: string | null;
cityRef?: { name: string } | null;
partnerAccount?: {
name: string | null;
companyName: string | null;
parent?: { companyName: string | null } | null;
} | null;
}
| null
| undefined,
fallbackName: string,
) {
const cityName = store?.cityRef?.name?.trim() || store?.cityName?.trim() || '—';
const acc = store?.partnerAccount;
const partnerLabel = formatPartnerDashLabel(
acc?.companyName || acc?.parent?.companyName,
acc?.name,
);
return {
storeName: store?.name?.trim() || fallbackName,
cityName,
partnerLabel,
};
}
function getStoreWithdrawDailyLimit(): number {
@@ -107,24 +144,25 @@ export class SettlementService {
private notifyPartnerBillDigest(
period: string,
rows: Array<{
label: string;
cityName: string;
partnerLabel: string;
orderCount?: number;
redeemCount?: number;
orderCommission: number;
redeemCommission: number;
amount: number;
bankAccountName?: string | null;
bankBranch?: string | null;
bankAccountNo?: string | null;
bank?: WecomBankLike | null;
}>,
) {
if (!rows.length) return;
const lines = rows.map(
(r) =>
`${r.label} ¥${Number(r.amount).toFixed(2)} ${formatWecomBankAccount(r)}`,
);
const blocks = rows.map((r) => formatPartnerBillWecomBlock(r));
void this.wecomPush.dispatchEvent(
'finance.partner_bill',
{
period,
billCount: String(rows.length),
billSummary: capBillSummary(lines),
totalAmount: sumAmounts(rows),
billSummary: capBillBlocks(blocks),
},
{ handlePath: '/finance/partner-bills' },
);
@@ -133,25 +171,25 @@ export class SettlementService {
private notifyLogisticsBillDigest(
period: string,
rows: Array<{
label: string;
cityNames: string;
partnerNames: string;
providerName: string;
settlementMethod: string;
orderCount: number;
bottleCount: number;
amount: number;
bankAccountName?: string | null;
bankName?: string | null;
bankBranch?: string | null;
bankAccountNo?: string | null;
bank?: WecomBankLike | null;
}>,
) {
if (!rows.length) return;
const lines = rows.map(
(r) =>
`${r.label} ¥${Number(r.amount).toFixed(2)} ${formatWecomBankAccount(r)}`,
);
const blocks = rows.map((r) => formatLogisticsBillWecomBlock(r));
void this.wecomPush.dispatchEvent(
'finance.logistics_bill',
{
period,
billCount: String(rows.length),
billSummary: capBillSummary(lines),
totalAmount: sumAmounts(rows),
billSummary: capBillBlocks(blocks),
},
{ handlePath: '/finance/logistics-bills' },
);
@@ -649,16 +687,34 @@ export class SettlementService {
const [store, bank] = await Promise.all([
this.prisma.store.findUnique({
where: { id: row.storeId },
select: { name: true },
select: {
name: true,
cityName: true,
cityRef: { select: { name: true } },
partnerAccount: {
select: {
name: true,
companyName: true,
parent: { select: { companyName: true } },
},
},
},
}),
loadStorePrimaryBank(this.prisma, row.storeId),
]);
const meta = storeWecomMeta(store, String(row.storeId));
const bankParts = wecomBankParts(bank);
void this.wecomPush.dispatchEvent(
'store.withdraw_approved',
{
storeName: store?.name || String(row.storeId),
cityName: meta.cityName,
storeName: meta.storeName,
partnerLabel: meta.partnerLabel,
withdrawNo: row.withdrawNo,
amount: Number(row.amount).toFixed(2),
payee: bankParts.payee,
accountNo: bankParts.accountNo,
bankBranch: bankParts.bankBranch,
bankAccount: formatWecomBankAccount(bank),
storeId: row.storeId.toString(),
},
@@ -930,7 +986,24 @@ export class SettlementService {
withdrawItem: { is: null },
status: 'PENDING',
},
include: { store: { select: { id: true, name: true, settlementRate: true } } },
include: {
store: {
select: {
id: true,
name: true,
cityName: true,
settlementRate: true,
cityRef: { select: { name: true } },
partnerAccount: {
select: {
name: true,
companyName: true,
parent: { select: { companyName: true } },
},
},
},
},
},
});
const byStore = new Map<string, typeof payouts>();
@@ -943,10 +1016,19 @@ export class SettlementService {
let created = 0;
let skipped = 0;
const createdBills: Array<{ storeId: bigint; storeName: string; amount: number }> = [];
const createdBills: Array<{
storeId: bigint;
storeName: string;
cityName: string;
partnerLabel: string;
redeemCount: number;
redeemAmount: number;
settlementRate: number;
amount: number;
}> = [];
for (const [storeIdStr, list] of byStore) {
const storeId = BigInt(storeIdStr);
const storeName = list[0]?.store?.name || storeIdStr;
const meta = storeWecomMeta(list[0]?.store, storeIdStr);
const existing = await this.prisma.storeBill.findUnique({
where: { storeId_billDate: { storeId, billDate } },
});
@@ -975,7 +1057,14 @@ export class SettlementService {
});
});
created += 1;
createdBills.push({ storeId, storeName, amount: updatedTotal });
createdBills.push({
storeId,
...meta,
redeemCount: existing.redeemCount + list.length,
redeemAmount: round2(Number(existing.redeemAmount) + redeemAmount),
settlementRate: rate,
amount: updatedTotal,
});
continue;
}
@@ -1001,7 +1090,14 @@ export class SettlementService {
});
});
created += 1;
createdBills.push({ storeId, storeName, amount: payoutAmount });
createdBills.push({
storeId,
...meta,
redeemCount: list.length,
redeemAmount,
settlementRate: rate,
amount: payoutAmount,
});
}
const period = billDate.toISOString().slice(0, 10);
@@ -1010,16 +1106,19 @@ export class SettlementService {
this.prisma,
createdBills.map((b) => b.storeId),
);
const lines = createdBills.map(
(b) =>
`${b.storeName} ¥${b.amount.toFixed(2)} ${formatWecomBankAccount(banks.get(b.storeId.toString()) ?? null)}`,
const blocks = createdBills.map((b) =>
formatStoreBillWecomBlock({
...b,
bank: banks.get(b.storeId.toString()) ?? null,
}),
);
void this.wecomPush.dispatchEvent(
'finance.store_bill',
{
period,
billCount: String(createdBills.length),
billSummary: capBillSummary(lines),
totalAmount: sumAmounts(createdBills),
billSummary: capBillBlocks(blocks),
},
{ handlePath: '/finance/store-bills?kind=T1_BILL' },
);
@@ -1476,15 +1575,19 @@ export class SettlementService {
bankAccountName: true,
bankBranch: true,
bankAccountNo: true,
city: { select: { name: true } },
},
});
const results: Array<{ partnerId: string; companyName: string; ok: boolean; message?: string }> = [];
const created: Array<{
label: string;
cityName: string;
partnerLabel: string;
orderCount?: number;
redeemCount?: number;
orderCommission: number;
redeemCommission: number;
amount: number;
bankAccountName: string | null;
bankBranch: string | null;
bankAccountNo: string | null;
bank?: WecomBankLike | null;
}> = [];
for (const p of partners) {
try {
@@ -1497,14 +1600,19 @@ export class SettlementService {
{ notify: false },
);
results.push({ partnerId: p.id.toString(), companyName: p.companyName ?? '', ok: true });
const label =
[p.companyName?.trim(), p.name?.trim()].filter(Boolean).join(' · ') || p.id.toString();
created.push({
label,
cityName: p.city?.name?.trim() || '—',
partnerLabel: formatPartnerDashLabel(p.companyName, p.name),
orderCount: Number(bill.orderCount ?? 0),
redeemCount: Number(bill.redeemCount ?? 0),
orderCommission: Number(bill.orderCommission),
redeemCommission: Number(bill.redeemCommission),
amount: Number(bill.totalAmount),
bankAccountName: p.bankAccountName,
bankBranch: p.bankBranch,
bankAccountNo: p.bankAccountNo,
bank: {
bankAccountName: p.bankAccountName,
bankBranch: p.bankBranch,
bankAccountNo: p.bankAccountNo,
},
});
} catch (e) {
results.push({
@@ -1628,24 +1736,37 @@ export class SettlementService {
});
if (opts?.notify !== false) {
const label =
[primary.companyName?.trim(), primary.name?.trim()].filter(Boolean).join(' · ') ||
primary.id.toString();
this.notifyPartnerBillDigest(
`${body.year}-${String(body.month).padStart(2, '0')}`,
[
{
label,
amount: totalAmount,
let cityName = '—';
if (primary.cityId) {
const city = await this.prisma.commonCity.findUnique({
where: { id: primary.cityId },
select: { name: true },
});
cityName = city?.name?.trim() || '—';
}
this.notifyPartnerBillDigest(`${body.year}-${String(body.month).padStart(2, '0')}`, [
{
cityName,
partnerLabel: formatPartnerDashLabel(primary.companyName, primary.name),
orderCount: orders.length,
redeemCount: redeems.length,
orderCommission: round2(orderCommission),
redeemCommission: round2(redeemCommission),
amount: totalAmount,
bank: {
bankAccountName: primary.bankAccountName,
bankBranch: primary.bankBranch,
bankAccountNo: primary.bankAccountNo,
},
],
);
},
]);
}
return serializeBigInt(bill);
return serializeBigInt({
...bill,
orderCount: orders.length,
redeemCount: redeems.length,
});
}
/** HQ：发送给合伙人（待审核 → 待合伙人确认） */
@@ -1880,6 +2001,7 @@ export class SettlementService {
deliveryType: { in: ['LOCAL', 'CROSS_CITY'] },
completedAt: { gte: start, lt: end },
},
include: { city: { select: { name: true } } },
orderBy: { completedAt: 'asc' },
});
@@ -1937,12 +2059,27 @@ export class SettlementService {
const period = billDate.toISOString().slice(0, 10);
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,
amount: wineryAmount.toFixed(2),
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' },
@@ -2171,12 +2308,14 @@ export class SettlementService {
billId?: string;
}> = [];
const created: Array<{
label: string;
cityNames: string;
partnerNames: string;
providerName: string;
settlementMethod: string;
orderCount: number;
bottleCount: number;
amount: number;
bankAccountName: string | null;
bankName: string | null;
bankBranch: string | null;
bankAccountNo: string | null;
bank?: WecomBankLike | null;
}> = [];
for (const p of providers) {
@@ -2203,15 +2342,8 @@ export class SettlementService {
: String(bill.bill.id)
: undefined,
});
if (!bill.skipped && bill.bill) {
created.push({
label: p.name,
amount: Number(bill.bill.logisticsAmount ?? 0),
bankAccountName: p.bankAccountName,
bankName: p.bankName,
bankBranch: p.bankBranch,
bankAccountNo: p.bankAccountNo,
});
if (!bill.skipped && bill.wecom) {
created.push(bill.wecom);
}
} catch (e) {
results.push({
@@ -2237,6 +2369,20 @@ export class SettlementService {
};
}
private async partnerDashLabels(ids: Array<bigint | null | undefined>, max = 5): Promise<string> {
const uniq = [...new Set(ids.filter((id): id is bigint => id != null))];
if (!uniq.length) return '—';
const partners = await this.prisma.partnerAccount.findMany({
where: { id: { in: uniq } },
select: { name: true, companyName: true },
});
return joinLimited(
partners.map((p) => formatPartnerDashLabel(p.companyName, p.name)),
'家',
max,
);
}
async generateLogisticsBill(
body: { providerId: string; year: number; month: number },
opts?: { notify?: boolean },
@@ -2291,6 +2437,8 @@ export class SettlementService {
quantity: true,
deliveryType: true,
payStatus: true,
partnerAccountIdAtPay: true,
city: { select: { name: true } },
},
},
},
@@ -2392,25 +2540,38 @@ export class SettlementService {
return header;
});
const wecom = {
cityNames: joinLimited(
eligible.map((d) => d.order.city?.name || ''),
'城',
),
partnerNames: await this.partnerDashLabels(eligible.map((d) => d.order.partnerAccountIdAtPay)),
providerName: provider.name,
settlementMethod:
LOGISTICS_SETTLEMENT_METHOD_LABELS[
provider.settlementMethod as keyof typeof LOGISTICS_SETTLEMENT_METHOD_LABELS
] ?? String(provider.settlementMethod),
orderCount,
bottleCount,
amount: Number(bill.logisticsAmount),
bank: {
bankAccountName: provider.bankAccountName,
bankName: provider.bankName,
bankBranch: provider.bankBranch,
bankAccountNo: provider.bankAccountNo,
},
};
if (opts?.notify !== false) {
this.notifyLogisticsBillDigest(
`${body.year}-${String(body.month).padStart(2, '0')}`,
[
{
label: provider.name,
amount: Number(bill.logisticsAmount),
bankAccountName: provider.bankAccountName,
bankName: provider.bankName,
bankBranch: provider.bankBranch,
bankAccountNo: provider.bankAccountNo,
},
],
);
this.notifyLogisticsBillDigest(`${body.year}-${String(body.month).padStart(2, '0')}`, [
wecom,
]);
}
return {
skipped: false,
bill: serializeBigInt(bill),
wecom,
};
}
server/dukang-api/src/modules/settlement/wecom-bill-digest.ts
+157
View File
@@ -0,0 +1,157 @@
/** 企微结算账单正文：分字段块 + 字节上限（机器人 markdown 约 4096 字节） */
export type WecomBankLike = {
bankAccountName?: string | null;
bankName?: string | null;
bankBranch?: string | null;
bankAccountNo?: string | null;
};
export function formatYuan(n: number): string {
return `¥${Number(n).toFixed(2)}`;
}
export function formatPercent(rate: number): string {
const p = Number(rate) * 100;
if (!Number.isFinite(p)) return '—';
const rounded = Math.round(p * 100) / 100;
const text = Number.isInteger(rounded) ? String(rounded) : String(rounded);
return `${text}%`;
}
export function formatPartnerDashLabel(
company?: string | null,
name?: string | null,
): string {
const person = (name || '').trim() || '—';
const org = (company || '').trim();
return org ? `${org}-${person}` : person;
}
export function wecomBankParts(bank?: WecomBankLike | null): {
payee: string;
accountNo: string;
bankBranch: string;
} {
if (!bank) return { payee: '未登记', accountNo: '—', bankBranch: '—' };
const payee = bank.bankAccountName?.trim() || '';
const accountNo = bank.bankAccountNo?.trim() || '';
const bankBranch = bank.bankName?.trim() || bank.bankBranch?.trim() || '';
if (!payee && !accountNo) {
return { payee: '未登记', accountNo: '—', bankBranch: bankBranch || '—' };
}
return {
payee: payee || '—',
accountNo: accountNo || '—',
bankBranch: bankBranch || '—',
};
}
export function formatWecomFieldBlock(rows: Array<[string, string]>): string {
return rows.map(([k, v]) => `${k}：${v}`).join('\n');
}
export function joinLimited(names: string[], unit: string, max = 8): string {
const uniq = [...new Set(names.map((n) => n.trim()).filter(Boolean))];
if (!uniq.length) return '—';
if (uniq.length <= max) return uniq.join('、');
return `${uniq.slice(0, max).join('、')} 等${uniq.length}${unit}`;
}
const BILL_DIGEST_MAX_BYTES = 3200;
export function capBillBlocks(blocks: string[]): string {
if (!blocks.length) return '无';
const out: string[] = [];
let bytes = 0;
let shown = 0;
for (const block of blocks) {
const extra = (shown ? 2 : 0) + Buffer.byteLength(block, 'utf8');
if (shown > 0 && bytes + extra > BILL_DIGEST_MAX_BYTES) {
out.push(`另有 ${blocks.length - shown} 笔未列出，请到 HQ 查看`);
break;
}
out.push(block);
bytes += extra;
shown += 1;
}
return out.join('\n\n');
}
export function formatStoreBillWecomBlock(row: {
cityName: string;
storeName: string;
partnerLabel: string;
redeemCount: number;
redeemAmount: number;
settlementRate: number;
amount: number;
bank?: WecomBankLike | null;
}): string {
const bank = wecomBankParts(row.bank);
return formatWecomFieldBlock([
['城市', row.cityName || '—'],
['门店', row.storeName || '—'],
['合伙人', row.partnerLabel || '—'],
['核销笔数', String(row.redeemCount)],
['核销金额', formatYuan(row.redeemAmount)],
['结算比例', formatPercent(row.settlementRate)],
['账单', formatYuan(row.amount)],
['收款人', bank.payee],
['收款账户', bank.accountNo],
['收款开户行', bank.bankBranch],
]);
}
export function formatPartnerBillWecomBlock(row: {
cityName: string;
partnerLabel: string;
orderCount?: number;
redeemCount?: number;
orderCommission: number;
redeemCommission: number;
amount: number;
bank?: WecomBankLike | null;
}): string {
const bank = wecomBankParts(row.bank);
const rows: Array<[string, string]> = [
['城市', row.cityName || '—'],
['合伙人', row.partnerLabel || '—'],
];
if (row.orderCount != null) rows.push(['订单笔数', String(row.orderCount)]);
if (row.redeemCount != null) rows.push(['核销笔数', String(row.redeemCount)]);
rows.push(
['订单佣金', formatYuan(row.orderCommission)],
['核销佣金', formatYuan(row.redeemCommission)],
['账单', formatYuan(row.amount)],
['收款人', bank.payee],
['收款账户', bank.accountNo],
['收款开户行', bank.bankBranch],
);
return formatWecomFieldBlock(rows);
}
export function formatLogisticsBillWecomBlock(row: {
cityNames: string;
partnerNames: string;
providerName: string;
settlementMethod: string;
orderCount: number;
bottleCount: number;
amount: number;
bank?: WecomBankLike | null;
}): string {
const bank = wecomBankParts(row.bank);
return formatWecomFieldBlock([
['城市', row.cityNames || '—'],
['合伙人', row.partnerNames || '—'],
['承运商', row.providerName || '—'],
['结算方式', row.settlementMethod || '—'],
['发货笔数', String(row.orderCount)],
['瓶数', String(row.bottleCount)],
['账单', formatYuan(row.amount)],
['收款人', bank.payee],
['收款账户', bank.accountNo],
['收款开户行', bank.bankBranch],
]);
}
server/dukang-api/src/modules/trade/trade.service.ts
+8 -4
View File
@@ -10,7 +10,6 @@ import type { FreightPayType } from '@prisma/client';
import {
calcBenefitAmount,
generateOrderNo,
maskContactPhone,
minBottleQtyForDelivery,
orderTabToStatuses,
toMinSaleQuantity,
@@ -522,7 +521,7 @@ export class TradeService {
where: { id: orderId },
include: {
city: { select: { name: true } },
user: { select: { phone: true } },
user: { select: { phone: true, nickname: true, hqRemark: true } },
},
});
if (!order) return;
@@ -543,7 +542,9 @@ export class TradeService {
order.deliveryType === 'ON_SITE_PICKUP'
? `${order.receiverName} ${order.receiverPhone}`.trim()
: `${order.receiverName} ${order.receiverPhone} ${order.receiverAddress}`.trim();
const phoneMasked = maskContactPhone(order.user?.phone || order.receiverPhone);
const userName = order.user?.nickname?.trim() || '—';
const userPhone = (order.user?.phone || '').trim() || '—';
const userRemark = (order.user?.hqRemark || '').trim() || '—';
void this.wecomPush.dispatchEvent(
'order.paid',
{
@@ -553,7 +554,10 @@ export class TradeService {
skuSummary,
deliveryLabel,
receiverInfo,
phoneMasked,
userName,
userPhone,
userRemark,
phoneMasked: userPhone,
},
{ handlePath: `/orders?orderNo=${encodeURIComponent(order.orderNo)}` },
);