feat(finance): count created pickups as paid

backend/internal/modules/adminfinance/dashboard.go

@@ -372,15 +372,22 @@ func (r *Repository) dailyItems(ctx context.Context, query DashboardQuery) ([]Fi
 	return items, nil
 }
 
-// dailyPaidOrders 仅统计普通租赁订单的成功支付，按实际支付完成时间归集。
+// dailyPaidOrders 按实际付款日统计普通租赁订单，并将创建的线下提号视为已付款成交。
 func (r *Repository) dailyPaidOrders(ctx context.Context, query DashboardQuery) ([]dailyPaidOrderRow, error) {
 	items := make([]dailyPaidOrderRow, 0)
-	err := r.db.WithContext(ctx).Table("payment_orders AS po").
-		Select(`DATE(po.paid_at) AS date,
-			COUNT(DISTINCT po.order_id) AS paid_order_count`).
-		Where("po.biz_type = ? AND po.status = ?", "order_pay", "paid").
-		Where("po.paid_at >= ? AND po.paid_at <= ?", query.StartDate, query.EndDate).
-		Group("DATE(po.paid_at)").
+	err := r.db.WithContext(ctx).Table(`(
+		SELECT DATE(paid_at) AS date, COUNT(DISTINCT order_id) AS paid_order_count
+		FROM payment_orders
+		WHERE biz_type = 'order_pay' AND status = 'paid' AND paid_at >= ? AND paid_at <= ?
+		GROUP BY DATE(paid_at)
+		UNION ALL
+		SELECT DATE(created_at) AS date, COUNT(id) AS paid_order_count
+		FROM admin_pickups
+		WHERE created_at >= ? AND created_at <= ?
+		GROUP BY DATE(created_at)
+	) AS daily_paid_orders`, query.StartDate, query.EndDate, query.StartDate, query.EndDate).
+		Select("date, SUM(paid_order_count) AS paid_order_count").
+		Group("date").
 		Scan(&items).Error
 	return items, err
 }