城市合伙人H5端结算审核

server/dukang-api/src/modules/ops/admin-dashboard.service.ts

@@ -22,6 +22,7 @@ export class AdminDashboardService {
       deliveriesTotal,
       pendingPayouts,
       pendingBills,
+      pendingPartnerDraftBills,
       openTickets,
     ] = await Promise.all([
       this.prisma.user.count({ where: { status: 1, mergedIntoUserId: null } }),
@@ -42,7 +43,8 @@ export class AdminDashboardService {
       this.prisma.redeemRecord.count({ where: { createdAt: { gte: todayStart } } }),
       this.prisma.orderDelivery.count(),
       this.prisma.storePayout.count({ where: { status: 'PENDING' } }),
-      this.prisma.partnerBill.count({ where: { status: { in: ['DRAFT', 'CONFIRMED'] } } }),
+      this.prisma.partnerBill.count({ where: { status: 'CONFIRMED' } }),
+      this.prisma.partnerBill.count({ where: { status: 'DRAFT' } }),
       this.prisma.commonTicket.count({ where: { status: { in: ['PENDING', 'OPEN'] } } }),
     ]);
 
@@ -57,7 +59,9 @@ export class AdminDashboardService {
       redeemToday,
       deliveriesTotal,
       pendingPayouts,
+      /** 合伙人已确认、待总部审核打款 */
       pendingBills,
+      pendingPartnerDraftBills,
       openTickets,
       ordersByStatus: ordersByStatus.map((row) => ({
         status: row.status,