feat(ops): show order redeem records including FIFO secondary coupons
CI / verify (pull_request) Has been cancelled

Persist redeem allocations and surface them on HQ order detail with backfill for history.

Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
2026-07-22 23:38:51 +08:00
parent f2303f7fb8
commit e0d3c840a2
5 changed files with 542 additions and 21 deletions
+223 -1
View File
@@ -55,6 +55,28 @@ type WarehouseOption = {
lat?: number | null;
};
type OrderRedeemRecord = {
id: string;
redeemNo: string;
amount: number;
settleAmount: number;
/** 本单权益券在该核销单中的分摊额 */
couponAmount?: number;
role?: 'PRIMARY' | 'SECONDARY';
createdAt: string;
store?: { id: string; name: string; cityName?: string | null } | null;
};
type OrderRedeemSummary = {
couponNo: string;
totalAmount: number;
usedAmount: number;
balance: number;
status: string;
redeemCount: number;
redeemRecordSum: number;
};
type OrderDetail = AdminOrderRow & {
receiverAddress?: string;
receiverProvince?: string;
@@ -81,6 +103,8 @@ type OrderDetail = AdminOrderRow & {
payment?: Record<string, unknown> | null;
statusLogs?: Array<{ fromStatus: string | null; toStatus: string; createdAt: string }>;
benefitCoupons?: Array<Record<string, unknown>>;
redeemSummary?: OrderRedeemSummary | null;
redeemRecords?: OrderRedeemRecord[];
fulfillmentWarehouse?: {
id: string;
name: string;
@@ -135,6 +159,9 @@ export default function OrdersPage() {
const [pageSize, setPageSize] = useState(20);
const [detail, setDetail] = useState<OrderDetail | null>(null);
const [drawerOpen, setDrawerOpen] = useState(false);
const [redeemDetail, setRedeemDetail] = useState<Record<string, unknown> | null>(null);
const [redeemDrawerOpen, setRedeemDrawerOpen] = useState(false);
const [redeemDetailLoading, setRedeemDetailLoading] = useState(false);
const [selectedRowKeys, setSelectedRowKeys] = useState<string[]>([]);
const [batchDeleteOpen, setBatchDeleteOpen] = useState(false);
const [batchDeleting, setBatchDeleting] = useState(false);
@@ -152,6 +179,20 @@ export default function OrdersPage() {
[data?.items, selectedRowKeys],
);
async function openRedeemDetail(redeemId: string) {
setRedeemDetailLoading(true);
setRedeemDrawerOpen(true);
try {
const res = await request<Record<string, unknown>>(`/admin/redeem-records/${redeemId}`);
setRedeemDetail(res);
} catch (e) {
message.error(e instanceof Error ? e.message : '加载核销详情失败');
setRedeemDrawerOpen(false);
} finally {
setRedeemDetailLoading(false);
}
}
const load = useCallback(async () => {
setLoading(true);
try {
@@ -468,7 +509,7 @@ export default function OrdersPage() {
<Drawer
title="订单详情"
width={640}
width={720}
open={drawerOpen}
onClose={() => setDrawerOpen(false)}
extra={detail && (
@@ -570,6 +611,98 @@ export default function OrdersPage() {
<Descriptions.Item label="地址">{detail.receiverAddress}</Descriptions.Item>
</Descriptions>
<Typography.Title level={5} style={{ marginTop: 16, marginBottom: 8 }}>
</Typography.Title>
{detail.redeemSummary ? (
<>
<Descriptions column={2} bordered size="small" style={{ marginBottom: 12 }}>
<Descriptions.Item label="权益券号">{detail.redeemSummary.couponNo}</Descriptions.Item>
<Descriptions.Item label="券状态">{detail.redeemSummary.status}</Descriptions.Item>
<Descriptions.Item label="权益总额">
¥{Number(detail.redeemSummary.totalAmount).toFixed(2)}
</Descriptions.Item>
<Descriptions.Item label="已核销">
<Typography.Text type="danger" strong>
¥{Number(detail.redeemSummary.usedAmount).toFixed(2)}
</Typography.Text>
<Typography.Text type="secondary" style={{ marginLeft: 8 }}>
{detail.redeemSummary.redeemCount}
</Typography.Text>
</Descriptions.Item>
<Descriptions.Item label="剩余余额">
¥{Number(detail.redeemSummary.balance).toFixed(2)}
</Descriptions.Item>
<Descriptions.Item label="核销单合计额">
¥{Number(detail.redeemSummary.redeemRecordSum).toFixed(2)}
<Typography.Text type="secondary" style={{ marginLeft: 8 }}>
</Typography.Text>
</Descriptions.Item>
</Descriptions>
<Table
size="small"
rowKey="id"
pagination={false}
locale={{ emptyText: '暂无关联核销单' }}
dataSource={detail.redeemRecords ?? []}
columns={[
{ title: '核销号', dataIndex: 'redeemNo', width: 160, ellipsis: true },
{
title: '角色',
dataIndex: 'role',
width: 70,
render: (v: string | undefined) =>
v === 'SECONDARY' ? <Tag color="orange"></Tag> : <Tag color="blue"></Tag>,
},
{
title: '门店',
dataIndex: ['store', 'name'],
ellipsis: true,
render: (v: string | undefined, row) =>
v ? `${v}${row.store?.cityName ? `${row.store.cityName}` : ''}` : '—',
},
{
title: '本券分摊',
dataIndex: 'couponAmount',
width: 95,
render: (v: number | undefined, row) =>
`¥${Number(v ?? row.amount).toFixed(2)}`,
},
{
title: '核销总额',
dataIndex: 'amount',
width: 90,
render: (v: number) => `¥${Number(v).toFixed(2)}`,
},
{
title: '结算额',
dataIndex: 'settleAmount',
width: 90,
render: (v: number) => `¥${Number(v).toFixed(2)}`,
},
{
title: '时间',
dataIndex: 'createdAt',
width: 150,
render: (v: string) => fmtTime(v),
},
{
title: '操作',
width: 70,
render: (_, row) => (
<Button type="link" size="small" onClick={() => void openRedeemDetail(row.id)}>
</Button>
),
},
]}
/>
</>
) : (
<Typography.Text type="secondary"></Typography.Text>
)}
<Descriptions column={1} bordered size="small" title="位置快照(方案C" style={{ marginTop: 16 }}>
<Descriptions.Item label="clientIp">{detail.clientIp || '—'}</Descriptions.Item>
<Descriptions.Item label="IP解析">{[detail.ipProvince, detail.ipCity, detail.ipDistrict].filter(Boolean).join(' / ') || '—'}</Descriptions.Item>
@@ -618,6 +751,95 @@ export default function OrdersPage() {
)}
</Drawer>
<Drawer
title="核销单详情"
width={520}
open={redeemDrawerOpen}
onClose={() => {
setRedeemDrawerOpen(false);
setRedeemDetail(null);
}}
destroyOnClose
>
{redeemDetailLoading ? (
<Typography.Text type="secondary"></Typography.Text>
) : redeemDetail ? (
<Descriptions column={1} bordered size="small">
<Descriptions.Item label="核销号">{String(redeemDetail.redeemNo ?? '—')}</Descriptions.Item>
<Descriptions.Item label="核销额">
¥{Number(redeemDetail.amount ?? 0).toFixed(2)}
</Descriptions.Item>
<Descriptions.Item label="结算额">
¥{Number(redeemDetail.settleAmount ?? 0).toFixed(2)}
</Descriptions.Item>
<Descriptions.Item label="时间">{fmtTime(String(redeemDetail.createdAt ?? ''))}</Descriptions.Item>
<Descriptions.Item label="用户">
{String((redeemDetail.user as { userNo?: string } | undefined)?.userNo ?? '—')}
{(redeemDetail.user as { phone?: string | null } | undefined)?.phone
? ` / ${(redeemDetail.user as { phone?: string | null }).phone}`
: ''}
</Descriptions.Item>
<Descriptions.Item label="门店">
{String((redeemDetail.store as { name?: string } | undefined)?.name ?? '—')}
{(redeemDetail.store as { cityName?: string } | undefined)?.cityName
? `${(redeemDetail.store as { cityName?: string }).cityName}`
: ''}
</Descriptions.Item>
<Descriptions.Item label="门店地址">
{String((redeemDetail.store as { address?: string } | undefined)?.address ?? '—')}
</Descriptions.Item>
<Descriptions.Item label="合伙人">
{String(
(redeemDetail.store as { partnerAccount?: { companyName?: string } } | undefined)
?.partnerAccount?.companyName ?? '—',
)}
</Descriptions.Item>
<Descriptions.Item label="权益券号">
{String((redeemDetail.coupon as { couponNo?: string } | undefined)?.couponNo ?? '—')}
</Descriptions.Item>
<Descriptions.Item label="关联订单">
{String(
(redeemDetail.coupon as { order?: { orderNo?: string } } | undefined)?.order?.orderNo ??
'—',
)}
</Descriptions.Item>
{Array.isArray(redeemDetail.allocations) &&
(redeemDetail.allocations as unknown[]).length > 0 ? (
<Descriptions.Item label="券分摊">
{(
redeemDetail.allocations as Array<{
couponNo?: string;
orderNo?: string | null;
amount?: number;
sortOrder?: number;
}>
)
.map((a, idx) => {
const role = idx === 0 ? '主' : '次';
return `${role} ${a.couponNo ?? '—'}¥${Number(a.amount ?? 0).toFixed(2)}${
a.orderNo ? `(订单 ${a.orderNo}` : ''
}`;
})
.join('')}
</Descriptions.Item>
) : null}
{redeemDetail.payout ? (
<Descriptions.Item label="门店结算单">
¥{Number((redeemDetail.payout as { settleAmount?: number }).settleAmount ?? 0).toFixed(2)}
{' / '}
{String((redeemDetail.payout as { status?: string }).status ?? '—')}
</Descriptions.Item>
) : null}
{redeemDetail.rating ? (
<Descriptions.Item label="评价">
{(redeemDetail.rating as { serviceScore?: number }).serviceScore ?? '—'} / {' '}
{(redeemDetail.rating as { envScore?: number }).envScore ?? '—'}
</Descriptions.Item>
) : null}
</Descriptions>
) : null}
</Drawer>
<Modal
title={shipTarget ? `配送发货 · ${shipTarget.orderNo}` : '配送发货'}
open={shipModalOpen}
+20
View File
@@ -1041,6 +1041,7 @@ model BenefitCoupon {
user User @relation(fields: [userId], references: [id], onDelete: Restrict)
order Order? @relation(fields: [orderId], references: [id], onDelete: Restrict)
redeemRecords RedeemRecord[]
redeemAllocations RedeemRecordAllocation[]
@@index([userId, status])
@@map("user_benefit_coupon")
@@ -1062,11 +1063,30 @@ model RedeemRecord {
rating StoreRating?
payout StorePayout?
pending RedeemPendingRecord?
allocations RedeemRecordAllocation[]
@@index([storeId, createdAt])
@@map("user_redeem_record")
}
// 核销单跨券 FIFO 分摊明细(含次券可追溯)
model RedeemRecordAllocation {
id BigInt @id @default(autoincrement()) @db.UnsignedBigInt
redeemRecordId BigInt @map("redeem_record_id") @db.UnsignedBigInt
couponId BigInt @map("coupon_id") @db.UnsignedBigInt
amount Decimal @db.Decimal(10, 2)
sortOrder Int @default(0) @map("sort_order")
createdAt DateTime @default(now()) @map("created_at") @db.DateTime(3)
redeemRecord RedeemRecord @relation(fields: [redeemRecordId], references: [id], onDelete: Cascade)
coupon BenefitCoupon @relation(fields: [couponId], references: [id], onDelete: Restrict)
@@unique([redeemRecordId, couponId])
@@index([couponId])
@@index([redeemRecordId])
@@map("user_redeem_record_allocation")
}
model RedeemPendingRecord {
id BigInt @id @default(autoincrement()) @db.UnsignedBigInt
pendingNo String @unique @map("pending_no") @db.VarChar(32)
@@ -73,11 +73,18 @@ export class AdminOrdersService {
},
delivery: true,
benefitCoupon: {
select: { id: true, couponNo: true, balance: true, status: true },
select: {
id: true,
couponNo: true,
totalAmount: true,
usedAmount: true,
balance: true,
status: true,
},
},
city: { select: { id: true, name: true, code: true } },
product: { select: { id: true, name: true, skuCode: true, barcode69: true } },
imageResource: { select: { id: true, url: true } },
imageResource: { select: { url: true } },
fulfillmentWarehouse: {
select: {
id: true,
@@ -97,11 +104,84 @@ export class AdminOrdersService {
where: orderStatusLogWhere(id),
orderBy: { createdAt: 'asc' },
});
return serializeBigInt(mapOrderCompat({
...order,
const coupon = order.benefitCoupon;
if (coupon) {
await this.ensureRedeemAllocationsForCoupon(coupon.id);
}
const redeemRows = coupon
? await this.prisma.redeemRecord.findMany({
where: {
OR: [
{ couponId: coupon.id },
{ allocations: { some: { couponId: coupon.id } } },
],
},
orderBy: { createdAt: 'desc' },
include: {
store: { select: { id: true, name: true, cityName: true } },
allocations: {
where: { couponId: coupon.id },
select: { amount: true, sortOrder: true },
},
},
})
: [];
const redeemRecords = redeemRows.map((r) => {
const couponAmount =
r.allocations[0] != null
? Number(r.allocations[0].amount)
: r.couponId === coupon!.id
? Number(r.amount)
: 0;
const isPrimary = r.couponId === coupon!.id;
return {
id: r.id,
redeemNo: r.redeemNo,
amount: Number(r.amount),
settleAmount: Number(r.settleAmount),
couponAmount,
role: isPrimary ? 'PRIMARY' : 'SECONDARY',
createdAt: r.createdAt,
store: r.store,
};
});
const redeemRecordSum = redeemRecords.reduce((sum, r) => sum + r.couponAmount, 0);
const { benefitCoupon: _coupon, ...orderRest } = order;
return serializeBigInt(
mapOrderCompat({
...orderRest,
statusLogs: mapStatusLogCompat(statusLogs),
benefitCoupons: order.benefitCoupon ? [order.benefitCoupon] : [],
}));
benefitCoupons: coupon
? [
{
id: coupon.id,
couponNo: coupon.couponNo,
totalAmount: Number(coupon.totalAmount),
usedAmount: Number(coupon.usedAmount),
balance: Number(coupon.balance),
status: coupon.status,
},
]
: [],
redeemSummary: coupon
? {
couponNo: coupon.couponNo,
totalAmount: Number(coupon.totalAmount),
usedAmount: Number(coupon.usedAmount),
balance: Number(coupon.balance),
status: coupon.status,
redeemCount: redeemRecords.length,
redeemRecordSum,
}
: null,
redeemRecords,
}),
);
}
async updateStatusDebug(id: bigint, status: string) {
@@ -309,7 +389,12 @@ export class AdminOrdersService {
if (couponIds.length) {
const redeemIds = (
await tx.redeemRecord.findMany({
where: { couponId: { in: couponIds } },
where: {
OR: [
{ couponId: { in: couponIds } },
{ allocations: { some: { couponId: { in: couponIds } } } },
],
},
select: { id: true },
})
).map((r) => r.id);
@@ -317,6 +402,7 @@ export class AdminOrdersService {
if (redeemIds.length) {
await tx.storePayout.deleteMany({ where: { redeemRecordId: { in: redeemIds } } });
await tx.storeRating.deleteMany({ where: { redeemRecordId: { in: redeemIds } } });
await tx.redeemRecordAllocation.deleteMany({ where: { redeemRecordId: { in: redeemIds } } });
await tx.redeemRecord.deleteMany({ where: { id: { in: redeemIds } } });
}
@@ -332,4 +418,148 @@ export class AdminOrdersService {
});
await tx.order.deleteMany({ where: { id: { in: orderIds } } });
}
/**
* 补齐历史核销分摊:
* 1) 待审核销 pending.allocationsJson → allocation 表
* 2) 权益流水 REDEEM(次券)→ 按用户/门店/时间窗匹配核销单
* 3) 仅主券、尚无分摊行的核销单 → 写入单行分摊(全额)
*/
private async ensureRedeemAllocationsForCoupon(couponId: bigint) {
const coupon = await this.prisma.benefitCoupon.findUnique({
where: { id: couponId },
select: { id: true, userId: true },
});
if (!coupon) return;
const pendings = await this.prisma.redeemPendingRecord.findMany({
where: { userId: coupon.userId, redeemRecordId: { not: null } },
select: { redeemRecordId: true, allocationsJson: true },
});
for (const pending of pendings) {
if (!pending.redeemRecordId) continue;
const allocs = this.parseAllocationsJson(pending.allocationsJson);
if (!allocs.some((a) => a.couponId === couponId.toString())) continue;
const existing = await this.prisma.redeemRecordAllocation.count({
where: { redeemRecordId: pending.redeemRecordId },
});
if (existing > 0) continue;
await this.prisma.redeemRecordAllocation.createMany({
data: allocs.map((a, index) => ({
redeemRecordId: pending.redeemRecordId!,
couponId: BigInt(a.couponId),
amount: a.amount,
sortOrder: index,
})),
skipDuplicates: true,
});
}
const ledgers = await this.prisma.commonEvent.findMany({
where: {
eventType: 'BENEFIT_LEDGER',
param1: 'REDEEM',
param2: couponId.toString(),
actorType: 'USER',
actorId: coupon.userId,
refType: 'STORE',
},
select: { id: true, refId: true, amount1: true, createdAt: true },
orderBy: { createdAt: 'asc' },
});
for (const ledger of ledgers) {
if (ledger.refId == null || ledger.amount1 == null) continue;
const allocAmount = Math.abs(Number(ledger.amount1));
if (!(allocAmount > 0)) continue;
const already = await this.prisma.redeemRecordAllocation.findFirst({
where: {
couponId,
amount: allocAmount,
redeemRecord: {
userId: coupon.userId,
storeId: ledger.refId,
createdAt: {
gte: new Date(ledger.createdAt.getTime() - 8000),
lte: new Date(ledger.createdAt.getTime() + 8000),
},
},
},
select: { id: true },
});
if (already) continue;
const candidates = await this.prisma.redeemRecord.findMany({
where: {
userId: coupon.userId,
storeId: ledger.refId,
createdAt: {
gte: new Date(ledger.createdAt.getTime() - 8000),
lte: new Date(ledger.createdAt.getTime() + 8000),
},
amount: { gte: allocAmount },
allocations: { none: { couponId } },
},
orderBy: { createdAt: 'asc' },
take: 5,
});
if (!candidates.length) continue;
// 优先挂到主券不是本券的核销单(跨券 FIFO 次券场景)
const target =
candidates.find((r) => r.couponId !== couponId) ??
(candidates.length === 1 ? candidates[0] : null);
if (!target) continue;
await this.prisma.redeemRecordAllocation.create({
data: {
redeemRecordId: target.id,
couponId,
amount: allocAmount,
sortOrder: target.couponId === couponId ? 0 : 1,
},
}).catch(() => {
/* unique 冲突忽略 */
});
}
const primaryWithoutAlloc = await this.prisma.redeemRecord.findMany({
where: {
couponId,
allocations: { none: {} },
},
select: { id: true, amount: true },
});
if (primaryWithoutAlloc.length) {
await this.prisma.redeemRecordAllocation.createMany({
data: primaryWithoutAlloc.map((r) => ({
redeemRecordId: r.id,
couponId,
amount: r.amount,
sortOrder: 0,
})),
skipDuplicates: true,
});
}
}
private parseAllocationsJson(
value: Prisma.JsonValue,
): Array<{ couponId: string; amount: number }> {
if (!Array.isArray(value)) return [];
return value
.map((item) => {
if (!item || typeof item !== 'object') return null;
const row = item as { couponId?: unknown; amount?: unknown };
const id = row.couponId != null ? String(row.couponId) : '';
const amount = Number(row.amount);
if (!id || !Number.isFinite(amount) || amount <= 0) return null;
return { couponId: id, amount };
})
.filter((item): item is { couponId: string; amount: number } => !!item);
}
}
@@ -39,14 +39,56 @@ export class AdminRedeemService {
const record = await this.prisma.redeemRecord.findUnique({
where: { id },
include: {
user: true,
store: { include: { partnerAccount: { select: { id: true, companyName: true } } } },
coupon: true,
user: { select: { id: true, userNo: true, phone: true, nickname: true } },
store: {
select: {
id: true,
name: true,
cityName: true,
address: true,
partnerAccount: { select: { id: true, companyName: true } },
},
},
coupon: {
select: {
id: true,
couponNo: true,
totalAmount: true,
usedAmount: true,
balance: true,
status: true,
orderId: true,
order: { select: { id: true, orderNo: true } },
},
},
allocations: {
orderBy: { sortOrder: 'asc' },
include: {
coupon: {
select: {
id: true,
couponNo: true,
order: { select: { id: true, orderNo: true } },
},
},
},
},
payout: true,
rating: true,
},
});
if (!record) throw new NotFoundException('核销记录不存在');
return serializeBigInt(record);
return serializeBigInt({
...record,
allocations: record.allocations.map((a) => ({
couponId: a.couponId,
amount: Number(a.amount),
sortOrder: a.sortOrder,
couponNo: a.coupon.couponNo,
orderId: a.coupon.order?.id ?? null,
orderNo: a.coupon.order?.orderNo ?? null,
})),
});
}
}
@@ -181,6 +181,13 @@ export class RedeemService {
storeId: account.storeId,
amount,
settleAmount,
allocations: {
create: normalizedAllocations.map((item, index) => ({
couponId: BigInt(item.couponId),
amount: item.amount,
sortOrder: index,
})),
},
},
});