From 14aafcf728c0804f54762b0745395577c49f5569 Mon Sep 17 00:00:00 2001
From: yml <yml@yml.com>
Date: Sun, 24 May 2026 17:58:11 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E5=90=8E=E5=8F=B0=E7=BB=93?=
 =?UTF-8?q?=E8=B4=A6=E5=BE=85=E5=8A=9E=E6=96=87=E6=A1=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/internal/modules/admindashboard/repository.go | 2 +-
 backend/internal/modules/systemconfig/repository.go   | 4 ++--
 frontend/src/views/admin/AdminDashboardView.vue       | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/backend/internal/modules/admindashboard/repository.go b/backend/internal/modules/admindashboard/repository.go
index 4d81219..8a596b0 100644
--- a/backend/internal/modules/admindashboard/repository.go
+++ b/backend/internal/modules/admindashboard/repository.go
@@ -58,7 +58,7 @@ func (r *Repository) Summary() (*DashboardDTO, error) {
 	if err := r.db.Model(&model.RentalOrder{}).Where("status = ? AND handoff_status IN ?", "pending_handoff", []string{"pending_owner", "pending_renter_confirm"}).Count(&pending.PendingHandoffs).Error; err != nil {
 		return nil, err
 	}
-	if err := r.db.Model(&model.RentalOrder{}).Where("status = ?", "pending_return_confirm").Count(&pending.PendingReturnConfirms).Error; err != nil {
+	if err := r.db.Model(&model.RentalOrder{}).Where("status IN ?", []string{"pending_checkout_confirm", "pending_checkout_accept"}).Count(&pending.PendingReturnConfirms).Error; err != nil {
 		return nil, err
 	}
 	recentOrders, err := r.recentOrders()
diff --git a/backend/internal/modules/systemconfig/repository.go b/backend/internal/modules/systemconfig/repository.go
index 455aa6f..40bfba2 100644
--- a/backend/internal/modules/systemconfig/repository.go
+++ b/backend/internal/modules/systemconfig/repository.go
@@ -30,9 +30,9 @@ type defaultConfig struct {
 var defaultConfigs = []defaultConfig{
 	{Key: "handoff.owner_submit_timeout_minutes", Value: "30", Description: "号主待交接超时分钟数"},
 	{Key: "handoff.renter_confirm_timeout_minutes", Value: "30", Description: "租客待确认收号超时分钟数"},
-	{Key: "handoff.owner_return_confirm_timeout_minutes", Value: "120", Description: "号主待确认归还超时分钟数"},
+	{Key: "handoff.owner_return_confirm_timeout_minutes", Value: "120", Description: "号主待确认结账超时分钟数"},
 	{Key: "order.pending_payment_timeout_minutes", Value: "15", Description: "订单待支付超时取消分钟数"},
-	{Key: "order.return_overdue_grace_minutes", Value: "10", Description: "预计截止后归还宽限分钟数"},
+	{Key: "order.return_overdue_grace_minutes", Value: "10", Description: "预计截止后结账宽限分钟数"},
 	{Key: "deposit.min_amount", Value: "50", Description: "发布租号最低押金"},
 	{Key: "listing.review_required", Value: "false", Description: "发布账号是否需要后台人工审核"},
 	{Key: "risk.sms_limit_per_phone_hour", Value: "5", Description: "单手机号每小时短信验证码次数"},
diff --git a/frontend/src/views/admin/AdminDashboardView.vue b/frontend/src/views/admin/AdminDashboardView.vue
index d4fe9f3..fb90fcd 100644
--- a/frontend/src/views/admin/AdminDashboardView.vue
+++ b/frontend/src/views/admin/AdminDashboardView.vue
@@ -86,7 +86,7 @@ function money(value?: number) {
           <strong>{{ dashboard.pending.pending_handoffs }}</strong>
         </div>
         <div class="pending-row">
-          <span>待归还确认</span>
+          <span>待结账确认</span>
           <strong>{{ dashboard.pending.pending_return_confirms }}</strong>
         </div>
       </div>