兼容接入订单租期字段

backend/internal/jobs/ordertimeout/job.go

@@ -296,8 +296,12 @@ func (j *Job) handleRenterConfirmTimeout(ctx context.Context, now time.Time, cfg
 
 func (j *Job) handleReturnOverdue(ctx context.Context, now time.Time, cfg thresholds) (int, error) {
 	var rows []model.RentalOrder
+	overdueBefore := now.Add(-time.Duration(cfg.ReturnOverdueGraceMinutes) * time.Minute)
 	err := j.db.WithContext(ctx).
-		Where("status = ? AND rent_end_at IS NOT NULL AND rent_end_at <= ?", "renting", now.Add(-time.Duration(cfg.ReturnOverdueGraceMinutes)*time.Minute)).
+		Where(`status = ? AND (
+			(rented_at IS NOT NULL AND TIMESTAMPADD(HOUR, COALESCE(NULLIF(estimated_duration_hours, 0), 24), rented_at) <= ?)
+			OR (rented_at IS NULL AND rent_end_at IS NOT NULL AND rent_end_at <= ?)
+		)`, "renting", overdueBefore, overdueBefore).
 		Order("id ASC").
 		Limit(100).
 		Find(&rows).Error

backend/internal/model/order.go

@@ -13,6 +13,8 @@ type RentalOrder struct {
 	AccountID              uint64         `gorm:"not null;index" json:"account_id"`
 	OwnerID                uint64         `gorm:"not null;index" json:"owner_id"`
 	RenterID               uint64         `gorm:"not null;index" json:"renter_id"`
+	RentedAt               *time.Time     `json:"rented_at"`
+	EstimatedDurationHours int            `gorm:"not null;default:24" json:"estimated_duration_hours"`
 	RentStartAt            *time.Time     `json:"rent_start_at"`
 	RentEndAt              *time.Time     `json:"rent_end_at"`
 	RentHours              int            `gorm:"not null" json:"rent_hours"`

backend/internal/modules/order/dto.go

@@ -18,6 +18,8 @@ type OrderDTO struct {
 	Title                  string         `json:"title"`
 	ServerRegion           string         `json:"server_region"`
 	LoginPlatform          string         `json:"login_platform"`
+	RentedAt               *time.Time     `json:"rented_at"`
+	EstimatedDurationHours int            `json:"estimated_duration_hours"`
 	RentStartAt            *time.Time     `json:"rent_start_at"`
 	RentEndAt              *time.Time     `json:"rent_end_at"`
 	RentAmount             float64        `json:"rent_amount"`

backend/internal/modules/order/repository.go

@@ -43,6 +43,16 @@ func listingOrderPrice(listing model.RentalListing) float64 {
 	}
 }
 
+func orderDurationHours(order model.RentalOrder) int {
+	if order.EstimatedDurationHours > 0 {
+		return order.EstimatedDurationHours
+	}
+	if order.RentHours > 0 {
+		return order.RentHours
+	}
+	return internalOrderHours
+}
+
 func (r *Repository) Create(renterID uint64, req CreateRequest) (*OrderDTO, error) {
 	var createdID uint64
 	err := r.db.Transaction(func(tx *gorm.DB) error {
@@ -76,6 +86,7 @@ func (r *Repository) Create(renterID uint64, req CreateRequest) (*OrderDTO, erro
 			AccountID:              listing.AccountID,
 			OwnerID:                listing.OwnerID,
 			RenterID:               renterID,
+			EstimatedDurationHours: rentHours,
 			RentHours:              rentHours,
 			RentAmount:             listingOrderPrice(listing),
 			DepositAmount:          listing.DepositAmount,
@@ -357,8 +368,11 @@ func (r *Repository) ConfirmReceive(userID uint64, orderID uint64) error {
 		}
 		order.Status = "renting"
 		order.HandoffStatus = "received"
+		durationHours := orderDurationHours(order)
+		order.EstimatedDurationHours = durationHours
 		order.RentStartAt = &now
-		rentEnd := now.Add(time.Duration(order.RentHours) * time.Hour)
+		order.RentedAt = &now
+		rentEnd := now.Add(time.Duration(durationHours) * time.Hour)
 		order.RentEndAt = &rentEnd
 		orderID := order.ID
 		if err := notification.Append(tx, notification.Entry{
@@ -1053,6 +1067,16 @@ type orderRow struct {
 }
 
 func (row orderRow) toDTO() OrderDTO {
+	rentedAt := row.RentedAt
+	if rentedAt == nil {
+		rentedAt = row.RentStartAt
+	}
+	durationHours := orderDurationHours(row.RentalOrder)
+	rentEndAt := row.RentEndAt
+	if rentEndAt == nil && rentedAt != nil && durationHours > 0 {
+		calculatedEnd := rentedAt.Add(time.Duration(durationHours) * time.Hour)
+		rentEndAt = &calculatedEnd
+	}
 	return OrderDTO{
 		ID:                     row.ID,
 		OrderNo:                row.OrderNo,
@@ -1065,8 +1089,10 @@ func (row orderRow) toDTO() OrderDTO {
 		Title:                  row.Title,
 		ServerRegion:           row.ServerRegion,
 		LoginPlatform:          row.LoginPlatform,
+		RentedAt:               rentedAt,
+		EstimatedDurationHours: durationHours,
 		RentStartAt:            row.RentStartAt,
-		RentEndAt:        row.RentEndAt,
+		RentEndAt:              rentEndAt,
 		RentAmount:             row.RentAmount,
 		DepositAmount:          row.DepositAmount,
 		PlatformFee:            row.PlatformFee,

backend/migrations/000001_init.sql

@@ -78,6 +78,8 @@ CREATE TABLE rental_orders (
   account_id BIGINT UNSIGNED NOT NULL,
   owner_id BIGINT UNSIGNED NOT NULL,
   renter_id BIGINT UNSIGNED NOT NULL,
+  rented_at DATETIME NULL,
+  estimated_duration_hours INT NOT NULL DEFAULT 24,
   rent_start_at DATETIME NULL,
   rent_end_at DATETIME NULL,
   rent_hours INT NOT NULL,
@@ -95,7 +97,8 @@ CREATE TABLE rental_orders (
   UNIQUE KEY uk_rental_orders_order_no (order_no),
   KEY idx_rental_orders_renter_status (renter_id, status),
   KEY idx_rental_orders_owner_status (owner_id, status),
-  KEY idx_rental_orders_listing_id (listing_id)
+  KEY idx_rental_orders_listing_id (listing_id),
+  KEY idx_rental_orders_rented_at (status, rented_at)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
 
 CREATE TABLE handoff_records (

backend/migrations/000002_order_payment_stepwise.sql

@@ -41,6 +41,67 @@ SET price = CASE
 END
 WHERE price <= 0;
 
+SET @order_rented_at_exists := (
+  SELECT COUNT(*)
+  FROM information_schema.columns
+  WHERE table_schema = DATABASE()
+    AND table_name = 'rental_orders'
+    AND column_name = 'rented_at'
+);
+
+SET @add_order_rented_at_sql := IF(
+  @order_rented_at_exists = 0,
+  'ALTER TABLE rental_orders ADD COLUMN rented_at DATETIME NULL AFTER renter_id',
+  'SELECT 1'
+);
+PREPARE add_order_rented_at_stmt FROM @add_order_rented_at_sql;
+EXECUTE add_order_rented_at_stmt;
+DEALLOCATE PREPARE add_order_rented_at_stmt;
+
+SET @order_estimated_duration_exists := (
+  SELECT COUNT(*)
+  FROM information_schema.columns
+  WHERE table_schema = DATABASE()
+    AND table_name = 'rental_orders'
+    AND column_name = 'estimated_duration_hours'
+);
+
+SET @add_order_estimated_duration_sql := IF(
+  @order_estimated_duration_exists = 0,
+  'ALTER TABLE rental_orders ADD COLUMN estimated_duration_hours INT NOT NULL DEFAULT 24 AFTER rented_at',
+  'SELECT 1'
+);
+PREPARE add_order_estimated_duration_stmt FROM @add_order_estimated_duration_sql;
+EXECUTE add_order_estimated_duration_stmt;
+DEALLOCATE PREPARE add_order_estimated_duration_stmt;
+
+UPDATE rental_orders
+SET
+  rented_at = COALESCE(rented_at, rent_start_at),
+  estimated_duration_hours = CASE
+    WHEN estimated_duration_hours > 0 THEN estimated_duration_hours
+    WHEN rent_hours > 0 THEN rent_hours
+    ELSE 24
+  END
+WHERE rented_at IS NULL OR estimated_duration_hours <= 0;
+
+SET @order_rented_at_index_exists := (
+  SELECT COUNT(*)
+  FROM information_schema.statistics
+  WHERE table_schema = DATABASE()
+    AND table_name = 'rental_orders'
+    AND index_name = 'idx_rental_orders_rented_at'
+);
+
+SET @add_order_rented_at_index_sql := IF(
+  @order_rented_at_index_exists = 0,
+  'ALTER TABLE rental_orders ADD KEY idx_rental_orders_rented_at (status, rented_at)',
+  'SELECT 1'
+);
+PREPARE add_order_rented_at_index_stmt FROM @add_order_rented_at_index_sql;
+EXECUTE add_order_rented_at_index_stmt;
+DEALLOCATE PREPARE add_order_rented_at_index_stmt;
+
 INSERT INTO system_configs (`key`, `value`, description)
 VALUES ('order.pending_payment_timeout_minutes', '15', '订单待支付超时取消分钟数')
 ON DUPLICATE KEY UPDATE `key` = VALUES(`key`);

frontend/src/api/orders.ts

@@ -12,6 +12,8 @@ export interface Order {
   title: string
   server_region: string
   login_platform: string
+  rented_at?: string
+  estimated_duration_hours: number
   rent_start_at?: string
   rent_end_at?: string
   rent_amount: number

frontend/src/views/account/OrderDetailView.vue

@@ -282,6 +282,19 @@ function readError(error: unknown, fallback: string) {
   return fallback
 }
 
+function orderRentedAt() {
+  return order.value?.rented_at || order.value?.rent_start_at
+}
+
+function orderEstimatedEndAt() {
+  if (!order.value) return undefined
+  if (order.value.rent_end_at) return order.value.rent_end_at
+  const rentedAt = orderRentedAt()
+  const durationHours = Number(order.value.estimated_duration_hours || 0)
+  if (!rentedAt || durationHours <= 0) return undefined
+  return new Date(new Date(rentedAt).getTime() + durationHours * 60 * 60 * 1000).toISOString()
+}
+
 function hydrateCounterForm() {
   if (!order.value?.checkout) return
   const checkout = order.value.checkout
@@ -327,8 +340,8 @@ function linesToList(value: string) {
     </div>
 
     <div v-if="order" class="order-panel">
-      <p>开始：{{ formatDateTime(order.rent_start_at, '未开始') }}</p>
+      <p>开始：{{ formatDateTime(orderRentedAt(), '未开始') }}</p>
-      <p>预计截止：{{ formatDateTime(order.rent_end_at, '未设置') }}</p>
+      <p>预计截止：{{ formatDateTime(orderEstimatedEndAt(), '未设置') }}</p>
       <p v-if="order.status === 'pending_payment'">订单待支付，支付后账号进入交接流程。</p>
       <el-button v-if="order.status === 'pending_payment' && isRenter" type="primary" :loading="paying" @click="handlePay">
         支付订单

frontend/src/views/admin/AdminOrderDetailView.vue

@@ -63,6 +63,19 @@ function readError(error: unknown, fallback: string) {
   }
   return fallback
 }
+
+function orderRentedAt() {
+  return order.value?.rented_at || order.value?.rent_start_at
+}
+
+function orderEstimatedEndAt() {
+  if (!order.value) return undefined
+  if (order.value.rent_end_at) return order.value.rent_end_at
+  const rentedAt = orderRentedAt()
+  const durationHours = Number(order.value.estimated_duration_hours || 0)
+  if (!rentedAt || durationHours <= 0) return undefined
+  return new Date(new Date(rentedAt).getTime() + durationHours * 60 * 60 * 1000).toISOString()
+}
 </script>
 
 <template>
@@ -106,8 +119,8 @@ function readError(error: unknown, fallback: string) {
         <h2>用户信息</h2>
         <p>租客：{{ order.renter_phone || order.renter_id }}</p>
         <p>号主：{{ order.owner_phone || order.owner_id }}</p>
-        <p>开始：{{ formatDateTime(order.rent_start_at, '未开始') }}</p>
+        <p>开始：{{ formatDateTime(orderRentedAt(), '未开始') }}</p>
-        <p>预计截止：{{ formatDateTime(order.rent_end_at, '未设置') }}</p>
+        <p>预计截止：{{ formatDateTime(orderEstimatedEndAt(), '未设置') }}</p>
       </div>
 
       <div class="order-panel dashboard-panel">