feat(ops): show redeem records on benefit coupon detail
CI / verify (pull_request) Has been cancelled
CI / verify (pull_request) Has been cancelled
Reuse the same coupon redeem trace as order detail (primary/secondary, allocations). Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
@@ -33,6 +33,34 @@ type Row = {
|
|||||||
order?: { orderNo: string } | null;
|
order?: { orderNo: string } | null;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
type CouponRedeemRecord = {
|
||||||
|
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 CouponRedeemSummary = {
|
||||||
|
couponNo: string;
|
||||||
|
totalAmount: number;
|
||||||
|
usedAmount: number;
|
||||||
|
balance: number;
|
||||||
|
status: string;
|
||||||
|
redeemCount: number;
|
||||||
|
redeemRecordSum: number;
|
||||||
|
};
|
||||||
|
|
||||||
|
type CouponDetail = Row & {
|
||||||
|
redeemSummary?: CouponRedeemSummary | null;
|
||||||
|
redeemRecords?: CouponRedeemRecord[];
|
||||||
|
user?: { userNo?: string; phone?: string | null };
|
||||||
|
order?: { orderNo?: string } | null;
|
||||||
|
};
|
||||||
|
|
||||||
export default function BenefitCouponsPage() {
|
export default function BenefitCouponsPage() {
|
||||||
const [form] = Form.useForm();
|
const [form] = Form.useForm();
|
||||||
const [grantForm] = Form.useForm<AdminBenefitGrantRequest>();
|
const [grantForm] = Form.useForm<AdminBenefitGrantRequest>();
|
||||||
@@ -50,8 +78,25 @@ export default function BenefitCouponsPage() {
|
|||||||
},
|
},
|
||||||
[filters],
|
[filters],
|
||||||
);
|
);
|
||||||
const [detail, setDetail] = useState<Record<string, unknown> | null>(null);
|
const [detail, setDetail] = useState<CouponDetail | null>(null);
|
||||||
const [drawerOpen, setDrawerOpen] = useState(false);
|
const [drawerOpen, setDrawerOpen] = useState(false);
|
||||||
|
const [redeemDetail, setRedeemDetail] = useState<Record<string, unknown> | null>(null);
|
||||||
|
const [redeemDrawerOpen, setRedeemDrawerOpen] = useState(false);
|
||||||
|
const [redeemDetailLoading, setRedeemDetailLoading] = useState(false);
|
||||||
|
|
||||||
|
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 columns: ColumnsType<Row> = [
|
const columns: ColumnsType<Row> = [
|
||||||
{ title: '券号', dataIndex: 'couponNo', width: 200, ellipsis: false },
|
{ title: '券号', dataIndex: 'couponNo', width: 200, ellipsis: false },
|
||||||
@@ -197,7 +242,7 @@ export default function BenefitCouponsPage() {
|
|||||||
|
|
||||||
<Drawer
|
<Drawer
|
||||||
title="权益券详情"
|
title="权益券详情"
|
||||||
width={560}
|
width={720}
|
||||||
open={drawerOpen}
|
open={drawerOpen}
|
||||||
onClose={() => setDrawerOpen(false)}
|
onClose={() => setDrawerOpen(false)}
|
||||||
extra={
|
extra={
|
||||||
@@ -218,25 +263,202 @@ export default function BenefitCouponsPage() {
|
|||||||
}
|
}
|
||||||
>
|
>
|
||||||
{detail && (
|
{detail && (
|
||||||
|
<>
|
||||||
<Descriptions column={1} bordered size="small">
|
<Descriptions column={1} bordered size="small">
|
||||||
<Descriptions.Item label="券号">{String(detail.couponNo)}</Descriptions.Item>
|
<Descriptions.Item label="券号">{detail.couponNo}</Descriptions.Item>
|
||||||
<Descriptions.Item label="用户">
|
<Descriptions.Item label="用户">{detail.user?.userNo ?? '—'}</Descriptions.Item>
|
||||||
{String((detail.user as { userNo?: string } | undefined)?.userNo ?? '—')}
|
<Descriptions.Item label="手机号">{detail.user?.phone ?? '—'}</Descriptions.Item>
|
||||||
|
<Descriptions.Item label="关联订单">{detail.order?.orderNo ?? '—'}</Descriptions.Item>
|
||||||
|
<Descriptions.Item label="总额">¥{Number(detail.totalAmount).toFixed(2)}</Descriptions.Item>
|
||||||
|
<Descriptions.Item label="余额">¥{Number(detail.balance).toFixed(2)}</Descriptions.Item>
|
||||||
|
<Descriptions.Item label="状态">
|
||||||
|
{COUPON_STATUS_LABELS[detail.status] || detail.status}
|
||||||
</Descriptions.Item>
|
</Descriptions.Item>
|
||||||
<Descriptions.Item label="手机号">
|
<Descriptions.Item label="来源">{detail.sourceProduct}</Descriptions.Item>
|
||||||
{String((detail.user as { phone?: string } | undefined)?.phone ?? '—')}
|
</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: CouponRedeemRecord) =>
|
||||||
|
v ? `${v}${row.store?.cityName ? `(${row.store.cityName})` : ''}` : '—',
|
||||||
|
},
|
||||||
|
{
|
||||||
|
title: '本券分摊',
|
||||||
|
dataIndex: 'couponAmount',
|
||||||
|
width: 95,
|
||||||
|
render: (v: number | undefined, row: CouponRedeemRecord) =>
|
||||||
|
`¥${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: (_: unknown, row: CouponRedeemRecord) => (
|
||||||
|
<Button type="link" size="small" onClick={() => void openRedeemDetail(row.id)}>
|
||||||
|
详情
|
||||||
|
</Button>
|
||||||
|
),
|
||||||
|
},
|
||||||
|
]}
|
||||||
|
/>
|
||||||
|
</>
|
||||||
|
) : (
|
||||||
|
<Typography.Text type="secondary">暂无核销摘要</Typography.Text>
|
||||||
|
)}
|
||||||
|
</>
|
||||||
|
)}
|
||||||
|
</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>
|
||||||
<Descriptions.Item label="关联订单">
|
<Descriptions.Item label="关联订单">
|
||||||
{String((detail.order as { orderNo?: string } | null | undefined)?.orderNo ?? '—')}
|
{String(
|
||||||
</Descriptions.Item>
|
(redeemDetail.coupon as { order?: { orderNo?: string } } | undefined)?.order?.orderNo ??
|
||||||
<Descriptions.Item label="总额">¥{String(detail.totalAmount)}</Descriptions.Item>
|
'—',
|
||||||
<Descriptions.Item label="余额">¥{String(detail.balance)}</Descriptions.Item>
|
|
||||||
<Descriptions.Item label="状态">
|
|
||||||
{COUPON_STATUS_LABELS[String(detail.status)] || String(detail.status)}
|
|
||||||
</Descriptions.Item>
|
|
||||||
<Descriptions.Item label="来源">{String(detail.sourceProduct)}</Descriptions.Item>
|
|
||||||
</Descriptions>
|
|
||||||
)}
|
)}
|
||||||
|
</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>
|
</Drawer>
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ import { serializeBigInt } from '../../common/decorators/current-user.decorator'
|
|||||||
import { buildBenefitLedgerEvent, benefitLedgerWhere } from '../../common/event/event.helpers';
|
import { buildBenefitLedgerEvent, benefitLedgerWhere } from '../../common/event/event.helpers';
|
||||||
import { mapBenefitLedgerCompat } from '../../common/compat/v31-compat';
|
import { mapBenefitLedgerCompat } from '../../common/compat/v31-compat';
|
||||||
import { BenefitService } from '../benefit/benefit.service';
|
import { BenefitService } from '../benefit/benefit.service';
|
||||||
|
import { AdminRedeemService } from './admin-redeem.service';
|
||||||
import type { AdminBenefitCouponsQueryDto, AdminBenefitLedgersQueryDto } from './dto/admin-query.dto';
|
import type { AdminBenefitCouponsQueryDto, AdminBenefitLedgersQueryDto } from './dto/admin-query.dto';
|
||||||
import type { AdminBenefitGrantDto } from './dto/admin-mutate.dto';
|
import type { AdminBenefitGrantDto } from './dto/admin-mutate.dto';
|
||||||
|
|
||||||
@@ -13,6 +14,7 @@ export class AdminBenefitService {
|
|||||||
constructor(
|
constructor(
|
||||||
private readonly prisma: PrismaService,
|
private readonly prisma: PrismaService,
|
||||||
private readonly benefitService: BenefitService,
|
private readonly benefitService: BenefitService,
|
||||||
|
private readonly adminRedeemService: AdminRedeemService,
|
||||||
) {}
|
) {}
|
||||||
|
|
||||||
async listCoupons(query: AdminBenefitCouponsQueryDto) {
|
async listCoupons(query: AdminBenefitCouponsQueryDto) {
|
||||||
@@ -45,16 +47,23 @@ export class AdminBenefitService {
|
|||||||
include: {
|
include: {
|
||||||
user: { select: { id: true, userNo: true, phone: true, nickname: true } },
|
user: { select: { id: true, userNo: true, phone: true, nickname: true } },
|
||||||
order: { select: { id: true, orderNo: true, status: true, payAmount: true } },
|
order: { select: { id: true, orderNo: true, status: true, payAmount: true } },
|
||||||
redeemRecords: { orderBy: { createdAt: 'desc' }, take: 10, include: { store: { select: { id: true, name: true } } } },
|
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
if (!coupon) throw new NotFoundException('权益券不存在');
|
if (!coupon) throw new NotFoundException('权益券不存在');
|
||||||
const ledgers = await this.prisma.commonEvent.findMany({
|
const [ledgers, redeemTrace] = await Promise.all([
|
||||||
|
this.prisma.commonEvent.findMany({
|
||||||
where: benefitLedgerWhere(undefined, id),
|
where: benefitLedgerWhere(undefined, id),
|
||||||
orderBy: { createdAt: 'desc' },
|
orderBy: { createdAt: 'desc' },
|
||||||
take: 20,
|
take: 20,
|
||||||
|
}),
|
||||||
|
this.adminRedeemService.buildCouponRedeemTrace(coupon),
|
||||||
|
]);
|
||||||
|
return serializeBigInt({
|
||||||
|
...coupon,
|
||||||
|
ledgers,
|
||||||
|
redeemSummary: redeemTrace.redeemSummary,
|
||||||
|
redeemRecords: redeemTrace.redeemRecords,
|
||||||
});
|
});
|
||||||
return serializeBigInt({ ...coupon, ledgers });
|
|
||||||
}
|
}
|
||||||
|
|
||||||
async voidCoupon(id: bigint) {
|
async voidCoupon(id: bigint) {
|
||||||
|
|||||||
@@ -11,6 +11,7 @@ import type { AdminShipOrderDto, HqLogisticsShipDto } from './dto/admin-mutate.d
|
|||||||
import type { XiaofeixiaCreateShipmentDto } from './dto/admin-courier.dto';
|
import type { XiaofeixiaCreateShipmentDto } from './dto/admin-courier.dto';
|
||||||
import { FulfillmentService } from '../fulfillment/fulfillment.service';
|
import { FulfillmentService } from '../fulfillment/fulfillment.service';
|
||||||
import { FulfillmentProviderService } from '../fulfillment/fulfillment-provider.service';
|
import { FulfillmentProviderService } from '../fulfillment/fulfillment-provider.service';
|
||||||
|
import { AdminRedeemService } from './admin-redeem.service';
|
||||||
|
|
||||||
@Injectable()
|
@Injectable()
|
||||||
export class AdminOrdersService {
|
export class AdminOrdersService {
|
||||||
@@ -20,6 +21,7 @@ export class AdminOrdersService {
|
|||||||
private readonly xiaofeixiaService: AdminXiaofeixiaService,
|
private readonly xiaofeixiaService: AdminXiaofeixiaService,
|
||||||
private readonly fulfillmentService: FulfillmentService,
|
private readonly fulfillmentService: FulfillmentService,
|
||||||
private readonly fulfillmentProviderService: FulfillmentProviderService,
|
private readonly fulfillmentProviderService: FulfillmentProviderService,
|
||||||
|
private readonly adminRedeemService: AdminRedeemService,
|
||||||
) {}
|
) {}
|
||||||
|
|
||||||
async list(query: AdminOrdersQueryDto) {
|
async list(query: AdminOrdersQueryDto) {
|
||||||
@@ -106,49 +108,9 @@ export class AdminOrdersService {
|
|||||||
});
|
});
|
||||||
|
|
||||||
const coupon = order.benefitCoupon;
|
const coupon = order.benefitCoupon;
|
||||||
if (coupon) {
|
const redeemTrace = coupon
|
||||||
await this.ensureRedeemAllocationsForCoupon(coupon.id);
|
? await this.adminRedeemService.buildCouponRedeemTrace(coupon)
|
||||||
}
|
: { redeemSummary: null, redeemRecords: [] };
|
||||||
|
|
||||||
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;
|
const { benefitCoupon: _coupon, ...orderRest } = order;
|
||||||
|
|
||||||
@@ -168,18 +130,8 @@ export class AdminOrdersService {
|
|||||||
},
|
},
|
||||||
]
|
]
|
||||||
: [],
|
: [],
|
||||||
redeemSummary: coupon
|
redeemSummary: redeemTrace.redeemSummary,
|
||||||
? {
|
redeemRecords: redeemTrace.redeemRecords,
|
||||||
couponNo: coupon.couponNo,
|
|
||||||
totalAmount: Number(coupon.totalAmount),
|
|
||||||
usedAmount: Number(coupon.usedAmount),
|
|
||||||
balance: Number(coupon.balance),
|
|
||||||
status: coupon.status,
|
|
||||||
redeemCount: redeemRecords.length,
|
|
||||||
redeemRecordSum,
|
|
||||||
}
|
|
||||||
: null,
|
|
||||||
redeemRecords,
|
|
||||||
}),
|
}),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
@@ -418,148 +370,4 @@ export class AdminOrdersService {
|
|||||||
});
|
});
|
||||||
await tx.order.deleteMany({ where: { id: { in: orderIds } } });
|
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);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -6,6 +6,28 @@ import { serializeBigInt } from '../../common/decorators/current-user.decorator'
|
|||||||
import type { AdminDeliveriesQueryDto, AdminRedeemRecordsQueryDto } from './dto/admin-query.dto';
|
import type { AdminDeliveriesQueryDto, AdminRedeemRecordsQueryDto } from './dto/admin-query.dto';
|
||||||
import type { UpdateDeliveryDto } from './dto/admin-mutate.dto';
|
import type { UpdateDeliveryDto } from './dto/admin-mutate.dto';
|
||||||
|
|
||||||
|
export type CouponRedeemTrace = {
|
||||||
|
redeemSummary: {
|
||||||
|
couponNo: string;
|
||||||
|
totalAmount: number;
|
||||||
|
usedAmount: number;
|
||||||
|
balance: number;
|
||||||
|
status: string;
|
||||||
|
redeemCount: number;
|
||||||
|
redeemRecordSum: number;
|
||||||
|
};
|
||||||
|
redeemRecords: Array<{
|
||||||
|
id: bigint;
|
||||||
|
redeemNo: string;
|
||||||
|
amount: number;
|
||||||
|
settleAmount: number;
|
||||||
|
couponAmount: number;
|
||||||
|
role: 'PRIMARY' | 'SECONDARY';
|
||||||
|
createdAt: Date;
|
||||||
|
store: { id: bigint; name: string; cityName: string | null } | null;
|
||||||
|
}>;
|
||||||
|
};
|
||||||
|
|
||||||
@Injectable()
|
@Injectable()
|
||||||
export class AdminRedeemService {
|
export class AdminRedeemService {
|
||||||
constructor(private readonly prisma: PrismaService) {}
|
constructor(private readonly prisma: PrismaService) {}
|
||||||
@@ -90,6 +112,207 @@ export class AdminRedeemService {
|
|||||||
})),
|
})),
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** 按权益券聚合核销追溯(含跨券 FIFO 次券) */
|
||||||
|
async buildCouponRedeemTrace(coupon: {
|
||||||
|
id: bigint;
|
||||||
|
couponNo: string;
|
||||||
|
totalAmount: Prisma.Decimal | number;
|
||||||
|
usedAmount: Prisma.Decimal | number;
|
||||||
|
balance: Prisma.Decimal | number;
|
||||||
|
status: string;
|
||||||
|
}): Promise<CouponRedeemTrace> {
|
||||||
|
await this.ensureRedeemAllocationsForCoupon(coupon.id);
|
||||||
|
|
||||||
|
const redeemRows = 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;
|
||||||
|
return {
|
||||||
|
id: r.id,
|
||||||
|
redeemNo: r.redeemNo,
|
||||||
|
amount: Number(r.amount),
|
||||||
|
settleAmount: Number(r.settleAmount),
|
||||||
|
couponAmount,
|
||||||
|
role: (r.couponId === coupon.id ? 'PRIMARY' : 'SECONDARY') as 'PRIMARY' | 'SECONDARY',
|
||||||
|
createdAt: r.createdAt,
|
||||||
|
store: r.store,
|
||||||
|
};
|
||||||
|
});
|
||||||
|
const redeemRecordSum = redeemRecords.reduce((sum, r) => sum + r.couponAmount, 0);
|
||||||
|
|
||||||
|
return {
|
||||||
|
redeemSummary: {
|
||||||
|
couponNo: coupon.couponNo,
|
||||||
|
totalAmount: Number(coupon.totalAmount),
|
||||||
|
usedAmount: Number(coupon.usedAmount),
|
||||||
|
balance: Number(coupon.balance),
|
||||||
|
status: coupon.status,
|
||||||
|
redeemCount: redeemRecords.length,
|
||||||
|
redeemRecordSum,
|
||||||
|
},
|
||||||
|
redeemRecords,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
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;
|
||||||
|
|
||||||
|
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);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Injectable()
|
@Injectable()
|
||||||
|
|||||||
Reference in New Issue
Block a user