后台系统配置列表现在只返回当前真实使用的配置项

2026-05-27 08:40:03 +08:00
parent 80c7bb18bb
commit 8cbd06dca4
8 changed files with 144 additions and 18 deletions
@@ -20,7 +20,7 @@ import (
 )

 type Repository struct {
-	db      *gorm.DB
+	db       *gorm.DB
 	chatRepo *chat.Repository
 }

@@ -195,7 +195,7 @@ func (r *Repository) Pay(userID uint64, orderID uint64) error {
 			return ErrOrderCannotPay
 		}
 		timeoutMinutes := pendingPaymentTimeoutMinutes(tx)
-		if order.CreatedAt.Before(time.Now().Add(-time.Duration(timeoutMinutes) * time.Minute)) {
+		if timeoutMinutes > 0 && order.CreatedAt.Before(time.Now().Add(-time.Duration(timeoutMinutes)*time.Minute)) {
 			return ErrOrderCannotPay
 		}

@@ -1029,7 +1029,7 @@ func pendingPaymentTimeoutMinutes(tx *gorm.DB) int {
 		return defaultPendingPaymentTimeoutMinutes
 	}
 	value, err := strconv.Atoi(row.Value)
-	if err != nil || value <= 0 {
+	if err != nil || value < 0 {
 		return defaultPendingPaymentTimeoutMinutes
 	}
 	return value