From 1676e82cc6d8c0d81b12d9c24f3e04bd092571e0 Mon Sep 17 00:00:00 2001 From: hailin Date: Thu, 8 Jan 2026 09:37:28 -0800 Subject: [PATCH] =?UTF-8?q?fix(admin-service):=20=E8=AE=A4=E7=A7=8D?= =?UTF-8?q?=E6=B1=87=E6=80=BB=E5=92=8C=E5=88=86=E7=B1=BB=E8=B4=A6=E5=8F=AA?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=B7=B2=E6=94=AF=E4=BB=98=E8=AE=A2=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 过滤掉 CREATED、PROVINCE_CITY_CONFIRMED、CANCELLED 状态的订单， 只统计已支付及之后的订单（PAID, FUND_ALLOCATED, POOL_SCHEDULED, POOL_INJECTED, MINING_ENABLED） 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Opus 4.5 --- .../user-detail-query.repository.impl.ts | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/backend/services/admin-service/src/infrastructure/persistence/repositories/user-detail-query.repository.impl.ts b/backend/services/admin-service/src/infrastructure/persistence/repositories/user-detail-query.repository.impl.ts index e1476b97..16a3f90f 100644 --- a/backend/services/admin-service/src/infrastructure/persistence/repositories/user-detail-query.repository.impl.ts +++ b/backend/services/admin-service/src/infrastructure/persistence/repositories/user-detail-query.repository.impl.ts @@ -244,10 +244,13 @@ export class UserDetailQueryRepositoryImpl implements IUserDetailQueryRepository this.logger.log(`[getPlantingSummary] 持仓查询结果: ${position ? `effectiveTreeCount=${position.effectiveTreeCount}` : 'null'}`); - // 获取订单统计 - 使用 accountSequence + // 已支付及之后的状态（不包括 CREATED, PROVINCE_CITY_CONFIRMED, CANCELLED） + const paidStatuses = ['PAID', 'FUND_ALLOCATED', 'POOL_SCHEDULED', 'POOL_INJECTED', 'MINING_ENABLED']; + + // 获取订单统计 - 只统计已支付的订单 const [orderStats, firstOrder, lastOrder] = await Promise.all([ this.prisma.plantingOrderQueryView.aggregate({ - where: { accountSequence }, + where: { accountSequence, status: { in: paidStatuses } }, _count: true, _sum: { treeCount: true, @@ -286,7 +289,10 @@ export class UserDetailQueryRepositoryImpl implements IUserDetailQueryRepository startDate?: Date, endDate?: Date, ): Promise { - const where: any = { accountSequence }; + // 已支付及之后的状态（不包括 CREATED, PROVINCE_CITY_CONFIRMED, CANCELLED） + const paidStatuses = ['PAID', 'FUND_ALLOCATED', 'POOL_SCHEDULED', 'POOL_INJECTED', 'MINING_ENABLED']; + + const where: any = { accountSequence, status: { in: paidStatuses } }; if (startDate || endDate) { where.createdAt = {};