新增「抢到后自动付款」开关,默认关

checkout 一直是 autoPayWithPreferredPaymentMethod:false —— 下单成功后要用户
自己在订单过期前付款,半夜抢到的机器可能因为没人醒着付款而作废。现在把
auto-pay 做成显式开关(schema 描述:"order will be automatically paid with
preferred payment method",需要 OVH 账户已设置默认支付方式)。

默认不自动付款。自动扣钱必须是用户显式打开的,不能是隐含行为:
字段默认 false、数据库列 DEFAULT 0、三个界面的勾选框默认不勾、
Telegram 文本下单和批量订阅不提供此开关(没有界面确认的路径不给扣钱能力)。

开关在三个下单入口各自独立:
- 服务器下单对话框(逐任务)
- 服务器监控订阅(触发自动下单时生效,可 PUT 编辑)
- VPS 监控订阅(同上)
自动付款依附于自动下单:关掉自动下单时强制清掉自动付款。

通知按真实状态措辞:开了开关的说「已请求自动付款,请核对扣款是否成功」——
只承诺我们真正知道的(请求了≠扣成了,默认支付方式失效时 OVH 不会扣);
没开的仍提醒「订单尚未付款,逾期作废」。队列任务和订阅卡片都显示
「自动付款」标记,让人一眼看出哪些任务会动钱。

链路:界面开关 → 队列任务/订阅字段(落库,重启保留) → 监控触发时经
quick-order 透传 → checkout。端到端验证过建/改/重启的完整往返 ——
顺带修掉一个快照深拷贝漏字段的 bug(Snapshot 少拷 AutoPay,
GET 永远读到 false,靠实测抓出来的)。

Author: gokele

VERSION

@@ -1 +1 @@
-0.1.9
+0.1.10

server/internal/db/db.go

@@ -71,6 +71,13 @@ func (db *DB) migrate() error {
 	// retraction_time:撤销权截止日。老库没有这一列,而 ListHistory 用 SELECT * + sqlx 严格映射,
 	// 只加结构体字段不加列会让整个历史列表报 missing destination name,两者必须同一次上线。
 	// failure_count:只记真正提交并失败的次数(无货轮次不计),MaxRetries 靠它封顶
+	// auto_pay:下单后用默认支付方式自动付款的显式开关
+	if err := db.addColumnIfMissing("queue", "auto_pay", "INTEGER NOT NULL DEFAULT 0"); err != nil {
+		return err
+	}
+	if err := db.addColumnIfMissing("monitor_subscriptions", "auto_pay", "INTEGER NOT NULL DEFAULT 0"); err != nil {
+		return err
+	}
 	if err := db.addColumnIfMissing("queue", "failure_count", "INTEGER NOT NULL DEFAULT 0"); err != nil {
 		return err
 	}

server/internal/db/monitor.go

@@ -19,6 +19,7 @@ type monitorSubRow struct {
 	AutoOrder          int    `db:"auto_order"`
 	Quantity           int    `db:"quantity"`
 	AutoOrderAccountID string `db:"auto_order_account_id"`
+	AutoPay            int    `db:"auto_pay"`
 }
 
 func rowToMonitorSub(r monitorSubRow) types.Subscription {
@@ -43,6 +44,7 @@ func rowToMonitorSub(r monitorSubRow) types.Subscription {
 		AutoOrder:          r.AutoOrder == 1,
 		Quantity:           r.Quantity,
 		AutoOrderAccountID: r.AutoOrderAccountID,
+		AutoPay:            r.AutoPay == 1,
 	}
 }
 
@@ -86,6 +88,7 @@ func monitorSubToRow(s types.Subscription) (monitorSubRow, error) {
 		AutoOrder:          bi(s.AutoOrder),
 		Quantity:           s.Quantity,
 		AutoOrderAccountID: s.AutoOrderAccountID,
+		AutoPay:            bi(s.AutoPay),
 	}, nil
 }
 
@@ -114,10 +117,10 @@ func (db *DB) UpsertMonitorSubscription(s types.Subscription) error {
 	_, err = db.NamedExec(`
 		INSERT INTO monitor_subscriptions
 		(plan_code, datacenters, notify_available, notify_unavailable, last_status,
-		 created_at, history, server_name, auto_order, quantity, auto_order_account_id)
+		 created_at, history, server_name, auto_order, quantity, auto_order_account_id, auto_pay)
 		VALUES
 		(:plan_code, :datacenters, :notify_available, :notify_unavailable, :last_status,
-		 :created_at, :history, :server_name, :auto_order, :quantity, :auto_order_account_id)
+		 :created_at, :history, :server_name, :auto_order, :quantity, :auto_order_account_id, :auto_pay)
 		ON CONFLICT(plan_code) DO UPDATE SET
 		  datacenters        = excluded.datacenters,
 		  notify_available   = excluded.notify_available,
@@ -127,7 +130,8 @@ func (db *DB) UpsertMonitorSubscription(s types.Subscription) error {
 		  server_name        = excluded.server_name,
 		  auto_order             = excluded.auto_order,
 		  quantity               = excluded.quantity,
-		  auto_order_account_id  = excluded.auto_order_account_id
+		  auto_order_account_id  = excluded.auto_order_account_id,
+		  auto_pay               = excluded.auto_pay
 	`, r)
 	if err != nil {
 		return fmt.Errorf("upsert monitor sub %s: %w", s.PlanCode, err)
@@ -153,10 +157,10 @@ func (db *DB) ReplaceMonitorSubscriptions(subs []types.Subscription) error {
 		_, err = tx.NamedExec(`
 			INSERT INTO monitor_subscriptions
 			(plan_code, datacenters, notify_available, notify_unavailable, last_status,
-			 created_at, history, server_name, auto_order, quantity, auto_order_account_id)
+			 created_at, history, server_name, auto_order, quantity, auto_order_account_id, auto_pay)
 			VALUES
 			(:plan_code, :datacenters, :notify_available, :notify_unavailable, :last_status,
-			 :created_at, :history, :server_name, :auto_order, :quantity, :auto_order_account_id)
+			 :created_at, :history, :server_name, :auto_order, :quantity, :auto_order_account_id, :auto_pay)
 		`, r)
 		if err != nil {
 			return fmt.Errorf("insert monitor sub %s: %w", s.PlanCode, err)

server/internal/db/queue.go

@@ -26,6 +26,7 @@ type queueRow struct {
 	Priority           int     `db:"priority"`
 	FromTelegram       int     `db:"from_telegram"`
 	ConfigSniperTaskID string  `db:"config_sniper_task_id"`
+	AutoPay            int     `db:"auto_pay"`
 }
 
 func rowToQueueItem(r queueRow) types.QueueItem {
@@ -54,6 +55,7 @@ func rowToQueueItem(r queueRow) types.QueueItem {
 		Priority:           r.Priority,
 		FromTelegram:       r.FromTelegram == 1,
 		ConfigSniperTaskID: r.ConfigSniperTaskID,
+		AutoPay:            r.AutoPay == 1,
 	}
 }
 
@@ -89,6 +91,7 @@ func queueItemToRow(q types.QueueItem) (queueRow, error) {
 		Priority:           q.Priority,
 		FromTelegram:       bi(q.FromTelegram),
 		ConfigSniperTaskID: q.ConfigSniperTaskID,
+		AutoPay:            bi(q.AutoPay),
 	}, nil
 }
 
@@ -125,11 +128,11 @@ func (db *DB) ReplaceQueue(items []types.QueueItem) error {
 			INSERT INTO queue
 			(id, account_id, plan_code, datacenter, options, status, created_at, updated_at,
 			 retry_interval, retry_count, failure_count, max_retries, last_check_time,
-			 quick_order, priority, from_telegram, config_sniper_task_id)
+			 quick_order, priority, from_telegram, config_sniper_task_id, auto_pay)
 			VALUES
 			(:id, :account_id, :plan_code, :datacenter, :options, :status, :created_at, :updated_at,
 			 :retry_interval, :retry_count, :failure_count, :max_retries, :last_check_time,
-			 :quick_order, :priority, :from_telegram, :config_sniper_task_id)
+			 :quick_order, :priority, :from_telegram, :config_sniper_task_id, :auto_pay)
 		`, r)
 		if err != nil {
 			return fmt.Errorf("insert queue %s: %w", q.ID, err)

server/internal/handlers/monitor.go

@@ -39,6 +39,9 @@ func AddSubscription(state *app.State, mon *monitor.Monitor) gin.HandlerFunc {
 			AutoOrder          bool     `json:"autoOrder"`
 			Quantity           int      `json:"quantity"`
 			AutoOrderAccountID string   `json:"autoOrderAccountId"` // 空 = 触发时只通知不下单
+			// AutoPay 下单成功后用默认支付方式自动付款。默认 false ——
+			// 自动扣钱必须是显式打开的开关
+			AutoPay bool `json:"autoPay"`
 		}
 		_ = c.ShouldBindJSON(&body)
 		if body.PlanCode == "" {
@@ -84,7 +87,7 @@ func AddSubscription(state *app.State, mon *monitor.Monitor) gin.HandlerFunc {
 		region, subsidiary, regionWarning := mon.PreflightRegion(body.PlanCode, body.AutoOrderAccountID)
 
 		mon.AddSubscription(body.PlanCode, body.Datacenters, notifyAvailable, notifyUnavailable,
-			serverName, nil, nil, body.AutoOrder, body.Quantity, body.AutoOrderAccountID)
+			serverName, nil, nil, body.AutoOrder, body.Quantity, body.AutoOrderAccountID, body.AutoPay)
 		mon.SaveToDB()
 
 		if !mon.Running() {
@@ -172,7 +175,7 @@ func BatchAddAll(state *app.State, mon *monitor.Monitor) gin.HandlerFunc {
 				continue
 			}
 			mon.AddSubscription(pc, []string{}, notifyAvailable, notifyUnavailable,
-				server.Name, nil, nil, body.AutoOrder, 1, body.AutoOrderAccountID)
+				server.Name, nil, nil, body.AutoOrder, 1, body.AutoOrderAccountID, false)
 			added++
 			state.Logger.Debug("批量添加订阅: "+pc+" ("+server.Name+")", "monitor")
 		}

server/internal/handlers/queue.go

@@ -24,6 +24,8 @@ func AddQueueItem(state *app.State) gin.HandlerFunc {
 			Datacenter    string   `json:"datacenter"`
 			Options       []string `json:"options"`
 			RetryInterval int      `json:"retryInterval"`
+			// AutoPay 下单成功后用默认支付方式自动付款(显式开关,默认关)
+			AutoPay bool `json:"autoPay"`
 		}
 		_ = c.ShouldBindJSON(&body)
 		if body.AccountID == "" {
@@ -67,6 +69,7 @@ func AddQueueItem(state *app.State) gin.HandlerFunc {
 			RetryInterval: body.RetryInterval,
 			RetryCount:    0,
 			LastCheckTime: 0,
+			AutoPay:       body.AutoPay,
 		}
 		state.QueueMu.Lock()
 		state.Queue = append(state.Queue, item)

server/internal/handlers/quick_order.go

@@ -32,6 +32,7 @@ func QuickOrder(state *app.State) gin.HandlerFunc {
 			Options            []string `json:"options"`
 			FromMonitor        bool     `json:"fromMonitor"`
 			SkipDuplicateCheck bool     `json:"skipDuplicateCheck"`
+			AutoPay            bool     `json:"autoPay"`
 		}
 		_ = c.ShouldBindJSON(&body)
 		if body.PlanCode == "" || body.Datacenter == "" {
@@ -196,6 +197,7 @@ func QuickOrder(state *app.State) gin.HandlerFunc {
 			Options:    options,
 			Status:     "running",
 			RetryCount: 0,
+			AutoPay:    body.AutoPay,
 			// MaxRetries 封顶的是**真正提交并失败的次数**(FailureCount),无货轮次不计。
 			// 早先按"检查轮次"封顶是错的:监控只在 无货→有货 的跳变上重新触发 quick-order,
 			// 一旦库存持续可见而下单侧连续吃 429/5xx,任务用尽轮次置 failed 后

server/internal/handlers/subscription_edit.go

@@ -42,6 +42,7 @@ func UpdateSubscription(state *app.State, mon *monitor.Monitor) gin.HandlerFunc
 			AutoOrder          *bool     `json:"autoOrder"`
 			Quantity           *int      `json:"quantity"`
 			AutoOrderAccountID *string   `json:"autoOrderAccountId"`
+			AutoPay            *bool     `json:"autoPay"`
 		}
 		if err := c.ShouldBindJSON(&body); err != nil {
 			c.JSON(http.StatusBadRequest, gin.H{"status": "error", "message": "请求体格式错误: " + err.Error()})
@@ -56,6 +57,7 @@ func UpdateSubscription(state *app.State, mon *monitor.Monitor) gin.HandlerFunc
 		autoOrder := cur.AutoOrder
 		quantity := cur.Quantity
 		accountID := cur.AutoOrderAccountID
+		autoPay := cur.AutoPay
 
 		if body.Datacenters != nil {
 			datacenters = *body.Datacenters
@@ -72,6 +74,9 @@ func UpdateSubscription(state *app.State, mon *monitor.Monitor) gin.HandlerFunc
 		if body.Quantity != nil {
 			quantity = *body.Quantity
 		}
+		if body.AutoPay != nil {
+			autoPay = *body.AutoPay
+		}
 		if body.AutoOrderAccountID != nil {
 			accountID = *body.AutoOrderAccountID
 			// 空串是合法值:表示「触发时只通知、不下单」
@@ -94,7 +99,7 @@ func UpdateSubscription(state *app.State, mon *monitor.Monitor) gin.HandlerFunc
 
 		// AddSubscription 对已存在的 planCode 是就地改配置,不会重置 LastStatus / History
 		mon.AddSubscription(planCode, datacenters, notifyAvailable, notifyUnavailable,
-			cur.ServerName, nil, nil, autoOrder, quantity, accountID)
+			cur.ServerName, nil, nil, autoOrder, quantity, accountID, autoPay)
 		mon.SaveToDB()
 		state.Logger.Info("更新服务器订阅配置: "+planCode, "monitor")
 
@@ -131,6 +136,7 @@ func UpdateVPSSubscription(state *app.State) gin.HandlerFunc {
 			AutoOrder          *bool     `json:"autoOrder"`
 			Quantity           *int      `json:"quantity"`
 			OS                 *string   `json:"os"`
+			AutoPay            *bool     `json:"autoPay"`
 		}
 		if err := c.ShouldBindJSON(&body); err != nil {
 			c.JSON(http.StatusBadRequest, gin.H{"status": "error", "message": "请求体格式错误: " + err.Error()})
@@ -182,11 +188,18 @@ func UpdateVPSSubscription(state *app.State) gin.HandlerFunc {
 		if body.OS != nil {
 			next.OS = strings.TrimSpace(*body.OS)
 		}
+		if body.AutoPay != nil {
+			next.AutoPay = *body.AutoPay
+		}
 		// 没有下单账户就不可能自动下单 —— 让这两个字段自洽,
 		// 否则界面上会出现"开着自动下单但买不了"的状态
 		if next.AutoOrderAccountID == "" {
 			next.AutoOrder = false
 		}
+		// 自动付款依附于自动下单
+		if !next.AutoOrder {
+			next.AutoPay = false
+		}
 		if next.AutoOrder && next.Quantity < 1 {
 			next.Quantity = 1
 		}
@@ -261,6 +274,7 @@ func UpdateVPSSubscription(state *app.State) gin.HandlerFunc {
 		live.AutoOrder = next.AutoOrder
 		live.Quantity = next.Quantity
 		live.OS = next.OS
+		live.AutoPay = next.AutoPay
 		if resetStatus {
 			live.LastStatus = map[string]string{}
 		}

server/internal/handlers/vps_monitor.go

@@ -88,6 +88,7 @@ func AddVPSSubscription(state *app.State) gin.HandlerFunc {
 			AutoOrder          bool     `json:"autoOrder"`
 			Quantity           int      `json:"quantity"`
 			OS                 string   `json:"os"`
+			AutoPay            bool     `json:"autoPay"`
 		}
 		_ = c.ShouldBindJSON(&body)
 		if body.PlanCode == "" {
@@ -192,6 +193,7 @@ func AddVPSSubscription(state *app.State) gin.HandlerFunc {
 			AutoOrder:          body.AutoOrder && body.AutoOrderAccountID != "",
 			Quantity:           body.Quantity,
 			OS:                 strings.TrimSpace(body.OS),
+			AutoPay:            body.AutoPay && body.AutoOrder && body.AutoOrderAccountID != "",
 		}
 		if sub.AutoOrder && sub.Quantity < 1 {
 			sub.Quantity = 1

server/internal/monitor/check.go

@@ -672,7 +672,7 @@ func (m *Monitor) CheckAvailabilityChange(sub *Subscription, traceID string) {
 					"[monitor] %s 跳过自动下单:验价用的是账户 %q,而订阅指定的下单账户是 %q,两者不一致(下单账户可能已被删除)",
 					planCode, choice.accountID, cfg.AutoOrderAccountID), "monitor")
 			default:
-				m.batchOrder(planCode, configInfo, orderTargets, cfg.Quantity, cfg.AutoOrderAccountID)
+				m.batchOrder(planCode, configInfo, orderTargets, cfg.Quantity, cfg.AutoOrderAccountID, cfg.AutoPay)
 			}
 		}