文档(#99): 补充上传链路自检 runbook

Co-authored-by: multica-agent <github@multica.ai>

apis/admin/user.api

@@ -76,6 +76,29 @@ type (
 		GiftAmount         int64  `json:"gift_amount"`
 		IsAdmin            bool   `json:"is_admin"`
 	}
+	UserSubscribeDetail {
+		Id             int64     `json:"id"`
+		UserId         int64     `json:"user_id"`
+		User           User      `json:"user"`
+		OrderId        int64     `json:"order_id"`
+		SubscribeId    int64     `json:"subscribe_id"`
+		Subscribe      Subscribe `json:"subscribe"`
+		NodeGroupId    int64     `json:"node_group_id"`
+		GroupLocked    bool      `json:"group_locked"`
+		StartTime      int64     `json:"start_time"`
+		ExpireTime     int64     `json:"expire_time"`
+		ResetTime      int64     `json:"reset_time"`
+		Traffic        int64     `json:"traffic"`
+		Download       int64     `json:"download"`
+		Upload         int64     `json:"upload"`
+		Token          string    `json:"token"`
+		Status         uint8     `json:"status"`
+		EffectiveSpeed int64     `json:"effective_speed"`
+		IsThrottled    bool      `json:"is_throttled"`
+		ThrottleRule   string    `json:"throttle_rule,omitempty"`
+		CreatedAt      int64     `json:"created_at"`
+		UpdatedAt      int64     `json:"updated_at"`
+	}
 	BatchDeleteUserRequest {
 		Ids []int64 `json:"ids" validate:"required"`
 	}
@@ -135,22 +158,18 @@ type (
 		Total int64        `json:"total"`
 	}
 	CreateUserSubscribeRequest {
-		UserId       int64  `json:"user_id"`
-		ExpiredAt    int64  `json:"expired_at"`
-		Traffic      int64  `json:"traffic"`
-		SubscribeId  int64  `json:"subscribe_id"`
-		SpeedLimit   int64  `json:"speed_limit,optional"`
-		TrafficLimit string `json:"traffic_limit,optional"`
+		UserId      int64 `json:"user_id"`
+		ExpiredAt   int64 `json:"expired_at"`
+		Traffic     int64 `json:"traffic"`
+		SubscribeId int64 `json:"subscribe_id"`
 	}
 	UpdateUserSubscribeRequest {
-		UserSubscribeId int64   `json:"user_subscribe_id"`
-		SubscribeId     int64   `json:"subscribe_id"`
-		Traffic         int64   `json:"traffic"`
-		ExpiredAt       int64   `json:"expired_at"`
-		Upload          int64   `json:"upload"`
-		Download        int64   `json:"download"`
-		SpeedLimit      *int64  `json:"speed_limit,omitempty"`
-		TrafficLimit    *string `json:"traffic_limit,omitempty"`
+		UserSubscribeId int64 `json:"user_subscribe_id"`
+		SubscribeId     int64 `json:"subscribe_id"`
+		Traffic         int64 `json:"traffic"`
+		ExpiredAt       int64 `json:"expired_at"`
+		Upload          int64 `json:"upload"`
+		Download        int64 `json:"download"`
 	}
 	GetUserLoginLogsRequest {
 		Page   int   `form:"page"`

apis/types.api

@@ -171,13 +171,13 @@ type (
 		DeviceLimit             int64  `json:"device_limit"`
 	}
 	VerifyConfig {
-		CaptchaType                    string `json:"captcha_type"` // local or turnstile
-		TurnstileSiteKey               string `json:"turnstile_site_key"`
-		TurnstileSecret                string `json:"turnstile_secret"`
-		EnableUserLoginCaptcha         bool   `json:"enable_user_login_captcha"` // User login captcha
-		EnableUserRegisterCaptcha      bool   `json:"enable_user_register_captcha"` // User register captcha
-		EnableAdminLoginCaptcha        bool   `json:"enable_admin_login_captcha"` // Admin login captcha
-		EnableUserResetPasswordCaptcha bool   `json:"enable_user_reset_password_captcha"` // User reset password captcha
+		CaptchaType                   string `json:"captcha_type"`                      // local or turnstile
+		TurnstileSiteKey              string `json:"turnstile_site_key"`
+		TurnstileSecret               string `json:"turnstile_secret"`
+		EnableUserLoginCaptcha        bool   `json:"enable_user_login_captcha"`         // User login captcha
+		EnableUserRegisterCaptcha     bool   `json:"enable_user_register_captcha"`      // User register captcha
+		EnableAdminLoginCaptcha       bool   `json:"enable_admin_login_captcha"`        // Admin login captcha
+		EnableUserResetPasswordCaptcha bool  `json:"enable_user_reset_password_captcha"` // User reset password captcha
 	}
 	NodeConfig {
 		NodeSecret             string         `json:"node_secret"`
@@ -230,12 +230,6 @@ type (
 		Discount float64 `json:"discount"`
 		MapApple string  `json:"map_apple"`
 	}
-	SubscribePromo {
-		RuleName   string `json:"rule_name"`
-		RuleType   string `json:"rule_type"`
-		PromoPrice int64  `json:"promo_price"`
-		ExpiresAt  int64  `json:"expires_at"`
-	}
 	TrafficLimit {
 		StatType     string `json:"stat_type"`
 		StatValue    int64  `json:"stat_value"`
@@ -250,7 +244,6 @@ type (
 		UnitPrice         int64               `json:"unit_price"`
 		UnitTime          string              `json:"unit_time"`
 		Discount          []SubscribeDiscount `json:"discount"`
-		Promo             *SubscribePromo     `json:"promo"`
 		NodeCount         int64               `json:"node_count"`
 		Replacement       int64               `json:"replacement"`
 		Inventory         int64               `json:"inventory"`
@@ -543,35 +536,6 @@ type (
 		CreatedAt              int64     `json:"created_at"`
 		UpdatedAt              int64     `json:"updated_at"`
 	}
-	UserSubscribeDetail {
-		Id             int64          `json:"id"`
-		UserId         int64          `json:"user_id"`
-		User           User           `json:"user"`
-		OrderId        int64          `json:"order_id"`
-		SubscribeId    int64          `json:"subscribe_id"`
-		Subscribe      Subscribe      `json:"subscribe"`
-		NodeGroupId    int64          `json:"node_group_id"`
-		NodeGroupName  string         `json:"node_group_name"`
-		GroupLocked    bool           `json:"group_locked"`
-		StartTime      int64          `json:"start_time"`
-		ExpireTime     int64          `json:"expire_time"`
-		ResetTime      int64          `json:"reset_time"`
-		Traffic        int64          `json:"traffic"`
-		Download       int64          `json:"download"`
-		Upload         int64          `json:"upload"`
-		SpeedLimit     int64          `json:"speed_limit"`
-		TrafficLimit   []TrafficLimit `json:"user_traffic_limit"`
-		PlanSpeedLimit int64          `json:"plan_speed_limit"`
-		Token          string         `json:"token"`
-		Status         uint8          `json:"status"`
-		EffectiveSpeed int64          `json:"effective_speed"`
-		IsThrottled    bool           `json:"is_throttled"`
-		ThrottleRule   string         `json:"throttle_rule,omitempty"`
-		ThrottleStart  int64          `json:"throttle_start,omitempty"`
-		ThrottleEnd    int64          `json:"throttle_end,omitempty"`
-		CreatedAt      int64          `json:"created_at"`
-		UpdatedAt      int64          `json:"updated_at"`
-	}
 	UserAffiliate {
 		Avatar       string `json:"avatar"`
 		Identifier   string `json:"identifier"`
@@ -715,7 +679,6 @@ type (
 		Price          int64  `json:"price"`
 		Amount         int64  `json:"amount"`
 		Discount       int64  `json:"discount"`
-		PromoDiscount  int64  `json:"promo_discount"`
 		GiftAmount     int64  `json:"gift_amount"`
 		Coupon         string `json:"coupon"`
 		CouponDiscount int64  `json:"coupon_discount"`

initialize/migrate/database/02153_user_subscribe_speed_limit.down.sql

@@ -1,5 +0,0 @@
--- Purpose: Rollback user-level speed limit overrides from user_subscribe
-
-ALTER TABLE `user_subscribe`
-  DROP COLUMN IF EXISTS `traffic_limit`,
-  DROP COLUMN IF EXISTS `speed_limit`;

initialize/migrate/database/02153_user_subscribe_speed_limit.up.sql

@@ -1,37 +0,0 @@
--- Purpose: Add user-level speed limit overrides to user_subscribe
-
-SET @column_exists = (
-  SELECT COUNT(*)
-  FROM INFORMATION_SCHEMA.COLUMNS
-  WHERE TABLE_SCHEMA = DATABASE()
-    AND TABLE_NAME = 'user_subscribe'
-    AND COLUMN_NAME = 'speed_limit'
-);
-
-SET @sql = IF(
-  @column_exists = 0,
-  'ALTER TABLE `user_subscribe` ADD COLUMN `speed_limit` int NOT NULL DEFAULT 0 COMMENT ''User-level speed limit override (Mbps, 0=use plan default)'' AFTER `upload`',
-  'SELECT ''Column speed_limit already exists in user_subscribe table'''
-);
-
-PREPARE stmt FROM @sql;
-EXECUTE stmt;
-DEALLOCATE PREPARE stmt;
-
-SET @column_exists = (
-  SELECT COUNT(*)
-  FROM INFORMATION_SCHEMA.COLUMNS
-  WHERE TABLE_SCHEMA = DATABASE()
-    AND TABLE_NAME = 'user_subscribe'
-    AND COLUMN_NAME = 'traffic_limit'
-);
-
-SET @sql = IF(
-  @column_exists = 0,
-  'ALTER TABLE `user_subscribe` ADD COLUMN `traffic_limit` text DEFAULT NULL COMMENT ''User-level traffic limit rules override (JSON, NULL=use plan default)'' AFTER `speed_limit`',
-  'SELECT ''Column traffic_limit already exists in user_subscribe table'''
-);
-
-PREPARE stmt FROM @sql;
-EXECUTE stmt;
-DEALLOCATE PREPARE stmt;

initialize/migrate/database/02154_promo_system.down.sql

@@ -1,39 +0,0 @@
-SET @column_exists = (
-  SELECT COUNT(*)
-  FROM INFORMATION_SCHEMA.COLUMNS
-  WHERE TABLE_SCHEMA = DATABASE()
-    AND TABLE_NAME = 'order'
-    AND COLUMN_NAME = 'promo_discount'
-);
-
-SET @sql = IF(
-  @column_exists = 1,
-  'ALTER TABLE `order` DROP COLUMN `promo_discount`',
-  'SELECT ''Column promo_discount does not exist in order table'''
-);
-
-PREPARE stmt FROM @sql;
-EXECUTE stmt;
-DEALLOCATE PREPARE stmt;
-
-SET @column_exists = (
-  SELECT COUNT(*)
-  FROM INFORMATION_SCHEMA.COLUMNS
-  WHERE TABLE_SCHEMA = DATABASE()
-    AND TABLE_NAME = 'order'
-    AND COLUMN_NAME = 'promo_rule_id'
-);
-
-SET @sql = IF(
-  @column_exists = 1,
-  'ALTER TABLE `order` DROP COLUMN `promo_rule_id`',
-  'SELECT ''Column promo_rule_id does not exist in order table'''
-);
-
-PREPARE stmt FROM @sql;
-EXECUTE stmt;
-DEALLOCATE PREPARE stmt;
-
-DROP TABLE IF EXISTS `promo_usage`;
-DROP TABLE IF EXISTS `subscribe_promo`;
-DROP TABLE IF EXISTS `promo_rule`;

initialize/migrate/database/02154_promo_system.up.sql

@@ -1,77 +0,0 @@
-CREATE TABLE IF NOT EXISTS `promo_rule` (
-  `id` BIGINT UNSIGNED NOT NULL AUTO_INCREMENT,
-  `name` VARCHAR(100) NOT NULL DEFAULT '' COMMENT '规则名称',
-  `type` VARCHAR(32) NOT NULL DEFAULT '' COMMENT '规则类型：new_user / inactive_user / campaign',
-  `params` JSON NOT NULL COMMENT '类型专属参数',
-  `priority` INT NOT NULL DEFAULT 0 COMMENT '优先级，数值越大越优先匹配',
-  `enabled` TINYINT(1) NOT NULL DEFAULT 1 COMMENT '是否启用',
-  `start_time` DATETIME DEFAULT NULL COMMENT '生效开始时间',
-  `end_time` DATETIME DEFAULT NULL COMMENT '生效结束时间',
-  `created_at` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  `updated_at` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-  `deleted_at` DATETIME DEFAULT NULL COMMENT '软删除时间',
-  PRIMARY KEY (`id`),
-  KEY `idx_enabled_priority_deleted` (`enabled`, `deleted_at`, `priority` DESC)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='促销规则表';
-
-CREATE TABLE IF NOT EXISTS `subscribe_promo` (
-  `id` BIGINT UNSIGNED NOT NULL AUTO_INCREMENT,
-  `subscribe_id` BIGINT UNSIGNED NOT NULL COMMENT '套餐规格 ID',
-  `quantity` INT NOT NULL DEFAULT 0 COMMENT '购买数量',
-  `promo_rule_id` BIGINT UNSIGNED NOT NULL COMMENT '促销规则 ID',
-  `promo_price` BIGINT NOT NULL DEFAULT 0 COMMENT '该规格在此规则下的优惠价（分）',
-  `created_at` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  `updated_at` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-  PRIMARY KEY (`id`),
-  UNIQUE KEY `uk_subscribe_qty_rule` (`subscribe_id`, `quantity`, `promo_rule_id`),
-  KEY `idx_promo_rule_id` (`promo_rule_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='规格促销价表';
-
-CREATE TABLE IF NOT EXISTS `promo_usage` (
-  `id` BIGINT UNSIGNED NOT NULL AUTO_INCREMENT,
-  `user_id` BIGINT UNSIGNED NOT NULL COMMENT '用户 ID',
-  `promo_rule_id` BIGINT UNSIGNED NOT NULL COMMENT '使用的规则 ID',
-  `subscribe_id` BIGINT UNSIGNED NOT NULL COMMENT '购买的规格 ID',
-  `order_no` VARCHAR(255) NOT NULL DEFAULT '' COMMENT '关联订单号',
-  `promo_price` BIGINT NOT NULL DEFAULT 0 COMMENT '使用时的促销单价（分）',
-  `created_at` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  PRIMARY KEY (`id`),
-  KEY `idx_user_rule` (`user_id`, `promo_rule_id`),
-  KEY `idx_order_no` (`order_no`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='促销使用记录表';
-
-SET @column_exists = (
-  SELECT COUNT(*)
-  FROM INFORMATION_SCHEMA.COLUMNS
-  WHERE TABLE_SCHEMA = DATABASE()
-    AND TABLE_NAME = 'order'
-    AND COLUMN_NAME = 'promo_rule_id'
-);
-
-SET @sql = IF(
-  @column_exists = 0,
-  'ALTER TABLE `order` ADD COLUMN `promo_rule_id` BIGINT UNSIGNED NOT NULL DEFAULT 0 COMMENT ''促销规则ID, 0=未使用促销'' AFTER `discount`',
-  'SELECT ''Column promo_rule_id already exists in order table'''
-);
-
-PREPARE stmt FROM @sql;
-EXECUTE stmt;
-DEALLOCATE PREPARE stmt;
-
-SET @column_exists = (
-  SELECT COUNT(*)
-  FROM INFORMATION_SCHEMA.COLUMNS
-  WHERE TABLE_SCHEMA = DATABASE()
-    AND TABLE_NAME = 'order'
-    AND COLUMN_NAME = 'promo_discount'
-);
-
-SET @sql = IF(
-  @column_exists = 0,
-  'ALTER TABLE `order` ADD COLUMN `promo_discount` BIGINT NOT NULL DEFAULT 0 COMMENT ''促销优惠金额(分)'' AFTER `promo_rule_id`',
-  'SELECT ''Column promo_discount already exists in order table'''
-);
-
-PREPARE stmt FROM @sql;
-EXECUTE stmt;
-DEALLOCATE PREPARE stmt;

internal/handler/routes.go

@@ -978,16 +978,17 @@ func RegisterHandlers(router *gin.Engine, serverCtx *svc.ServiceContext) {
 	}
 
 	publicSubscribeGroupRouter := router.Group("/v1/public/subscribe")
+	publicSubscribeGroupRouter.Use(middleware.AuthMiddleware(serverCtx), middleware.DeviceMiddleware(serverCtx))
 
 	{
 		// Get subscribe list
-		publicSubscribeGroupRouter.GET("/list", middleware.OptionalAuthMiddleware(serverCtx), middleware.DeviceMiddleware(serverCtx), publicSubscribe.QuerySubscribeListHandler(serverCtx))
+		publicSubscribeGroupRouter.GET("/list", publicSubscribe.QuerySubscribeListHandler(serverCtx))
 
 		// Get user subscribe node info
-		publicSubscribeGroupRouter.GET("/node/list", middleware.AuthMiddleware(serverCtx), middleware.DeviceMiddleware(serverCtx), publicSubscribe.QueryUserSubscribeNodeListHandler(serverCtx))
+		publicSubscribeGroupRouter.GET("/node/list", publicSubscribe.QueryUserSubscribeNodeListHandler(serverCtx))
 
 		// Get subscribe group list
-		publicSubscribeGroupRouter.GET("/group/list", middleware.AuthMiddleware(serverCtx), middleware.DeviceMiddleware(serverCtx), publicSubscribe.QuerySubscribeGroupListHandler(serverCtx))
+		publicSubscribeGroupRouter.GET("/group/list", publicSubscribe.QuerySubscribeGroupListHandler(serverCtx))
 	}
 
 	publicTicketGroupRouter := router.Group("/v1/public/ticket")

internal/logic/admin/application/deleteSubscribeApplicationLogic.go

@@ -29,7 +29,7 @@ func (l *DeleteSubscribeApplicationLogic) DeleteSubscribeApplication(req *types.
 	err := l.svcCtx.ClientModel.Delete(l.ctx, req.Id)
 	if err != nil {
 		l.Errorf("Failed to delete subscribe application with ID %d: %v", req.Id, err)
-		return errors.Wrap(xerr.NewErrCode(xerr.DatabaseDeletedError), err.Error())
+		return errors.Wrapf(xerr.NewErrCode(xerr.DatabaseDeletedError), err.Error())
 	}
 	return nil
 }

internal/logic/admin/server/resetSortWithNodeLogic.go

@@ -80,7 +80,7 @@ func (l *ResetSortWithNodeLogic) ResetSortWithNode(req *types.ResetSortRequest)
 	})
 	if err != nil {
 		l.Errorw("[NodeSort] Update Database Error: ", logger.Field("error", err.Error()))
-		return errors.Wrap(xerr.NewErrCode(xerr.DatabaseUpdateError), err.Error())
+		return errors.Wrapf(xerr.NewErrCode(xerr.DatabaseUpdateError), err.Error())
 	}
 	return nil
 }

internal/logic/admin/server/resetSortWithServerLogic.go

@@ -80,7 +80,7 @@ func (l *ResetSortWithServerLogic) ResetSortWithServer(req *types.ResetSortReque
 	})
 	if err != nil {
 		l.Errorw("[NodeSort] Update Database Error: ", logger.Field("error", err.Error()))
-		return errors.Wrap(xerr.NewErrCode(xerr.DatabaseUpdateError), err.Error())
+		return errors.Wrapf(xerr.NewErrCode(xerr.DatabaseUpdateError), err.Error())
 	}
 	return nil
 }

internal/logic/common/promoEligibility.go

@@ -1,170 +0,0 @@
-package common
-
-import (
-	"context"
-	"encoding/json"
-	"time"
-
-	"github.com/perfect-panel/server/internal/model/promo"
-	"github.com/perfect-panel/server/internal/model/user"
-	"github.com/perfect-panel/server/internal/svc"
-	"github.com/perfect-panel/server/pkg/xerr"
-	"github.com/pkg/errors"
-	"gorm.io/gorm"
-)
-
-type PromoResult struct {
-	Eligible   bool
-	RuleID     int64
-	RuleName   string
-	RuleType   string
-	PromoPrice int64
-	ExpiresAt  time.Time
-}
-
-type promoRuleParams struct {
-	WindowHours    int `json:"window_hours"`
-	InactiveMonths int `json:"inactive_months"`
-}
-
-func EvaluatePromo(ctx context.Context, svcCtx *svc.ServiceContext, userID int64, subscribeID int64) (*PromoResult, error) {
-	result := &PromoResult{}
-	if svcCtx == nil || svcCtx.PromoModel == nil || svcCtx.DB == nil || userID <= 0 || subscribeID <= 0 {
-		return result, nil
-	}
-
-	rules, err := svcCtx.PromoModel.QueryEligibleRules(ctx, subscribeID)
-	if err != nil {
-		return nil, errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), "query promo rules failed: %v", err.Error())
-	}
-	if len(rules) == 0 {
-		return result, nil
-	}
-
-	var currentUser user.User
-	now := time.Now()
-	for _, rule := range rules {
-		if rule == nil || !isPromoRuleInTimeWindow(rule, now) {
-			continue
-		}
-		if rule.PromoPrice <= 0 {
-			continue
-		}
-
-		params := promoRuleParams{}
-		if rule.Params != "" {
-			if err = json.Unmarshal([]byte(rule.Params), &params); err != nil {
-				continue
-			}
-		}
-
-		eligible, expiresAt, err := evaluatePromoRule(ctx, svcCtx.DB, rule, params, userID, &currentUser, now)
-		if err != nil {
-			return nil, err
-		}
-		if !eligible {
-			continue
-		}
-
-		return &PromoResult{
-			Eligible:   true,
-			RuleID:     rule.Id,
-			RuleName:   rule.Name,
-			RuleType:   rule.Type,
-			PromoPrice: rule.PromoPrice,
-			ExpiresAt:  expiresAt,
-		}, nil
-	}
-
-	return result, nil
-}
-
-func isPromoRuleInTimeWindow(rule *promo.RuleWithPrice, now time.Time) bool {
-	if rule.StartTime != nil && !rule.StartTime.IsZero() && now.Before(*rule.StartTime) {
-		return false
-	}
-	if rule.EndTime != nil && !rule.EndTime.IsZero() && now.After(*rule.EndTime) {
-		return false
-	}
-	return true
-}
-
-func evaluatePromoRule(
-	ctx context.Context,
-	db *gorm.DB,
-	rule *promo.RuleWithPrice,
-	params promoRuleParams,
-	userID int64,
-	currentUser *user.User,
-	now time.Time,
-) (bool, time.Time, error) {
-	switch rule.Type {
-	case promo.RuleTypeNewUser:
-		return evaluateNewUserPromo(ctx, db, params, userID, currentUser, now)
-	case promo.RuleTypeInactiveUser:
-		return evaluateInactiveUserPromo(ctx, db, params, userID, promoRuleExpiresAt(rule), now)
-	case promo.RuleTypeCampaign:
-		return true, promoRuleExpiresAt(rule), nil
-	default:
-		return false, time.Time{}, nil
-	}
-}
-
-func evaluateNewUserPromo(
-	ctx context.Context,
-	db *gorm.DB,
-	params promoRuleParams,
-	userID int64,
-	currentUser *user.User,
-	now time.Time,
-) (bool, time.Time, error) {
-	if params.WindowHours <= 0 {
-		return false, time.Time{}, nil
-	}
-
-	if currentUser.Id == 0 {
-		if err := db.WithContext(ctx).Model(&user.User{}).Where("id = ?", userID).First(currentUser).Error; err != nil {
-			return false, time.Time{}, errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), "query promo user failed")
-		}
-	}
-
-	expiresAt := currentUser.CreatedAt.Add(time.Duration(params.WindowHours) * time.Hour)
-	return now.Before(expiresAt), expiresAt, nil
-}
-
-func evaluateInactiveUserPromo(
-	ctx context.Context,
-	db *gorm.DB,
-	params promoRuleParams,
-	userID int64,
-	ruleExpiresAt time.Time,
-	now time.Time,
-) (bool, time.Time, error) {
-	if params.InactiveMonths <= 0 {
-		return false, time.Time{}, nil
-	}
-
-	var lastSub user.Subscribe
-	err := db.WithContext(ctx).
-		Model(&user.Subscribe{}).
-		Where("user_id = ?", userID).
-		Order("expire_time DESC").
-		Limit(1).
-		Take(&lastSub).Error
-	if err != nil {
-		if errors.Is(err, gorm.ErrRecordNotFound) {
-			return true, ruleExpiresAt, nil
-		}
-		return false, time.Time{}, errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), "query promo inactive user subscription failed")
-	}
-
-	threshold := now.AddDate(0, -params.InactiveMonths, 0)
-	return lastSub.ExpireTime.Before(threshold) || lastSub.ExpireTime.Equal(threshold), ruleExpiresAt, nil
-}
-
-func promoRuleExpiresAt(rule *promo.RuleWithPrice) time.Time {
-	if rule != nil && rule.EndTime != nil {
-		return *rule.EndTime
-	}
-	return time.Time{}
-}

internal/logic/public/order/preCreateOrderLogic.go

@@ -2,6 +2,7 @@ package order
 
 import (
 	"context"
+	"math"
 
 	commonLogic "github.com/perfect-panel/server/internal/logic/common"
 	"github.com/perfect-panel/server/internal/model/order"
@@ -114,28 +115,14 @@ func (l *PreCreateOrderLogic) PreCreateOrder(req *types.PurchaseOrderRequest) (r
 		return nil, errors.Wrapf(xerr.NewErrCode(xerr.SubscribeNewUserOnly), "not a new user")
 	}
 
-	priceResult, err := calculatePurchasePrice(
-		l.ctx,
-		l.svcCtx,
-		u.Id,
-		targetSubscribeID,
-		sub.UnitPrice,
-		req.Quantity,
-		newUserDiscount.Discounts,
-		newUserDiscount.EligibleForDiscount,
-		!isSingleModeRenewal,
-	)
-	if err != nil {
-		l.Errorw("[PreCreateOrder] Promo price calculation error",
-			logger.Field("error", err.Error()),
-			logger.Field("user_id", u.Id),
-			logger.Field("subscribe_id", targetSubscribeID),
-		)
-		return nil, err
+	var discount float64 = 1
+	if len(newUserDiscount.Discounts) > 0 {
+		discount = getDiscount(newUserDiscount.Discounts, req.Quantity, newUserDiscount.EligibleForDiscount)
 	}
-	price := priceResult.OriginalPrice
-	amount := priceResult.PayableBase
-	discountAmount := priceResult.DiscountAmount
+	price := sub.UnitPrice * req.Quantity
+
+	amount := int64(math.Round(float64(price) * discount))
+	discountAmount := price - amount
 	var couponAmount int64
 	if req.Coupon != "" {
 		couponInfo, err := l.svcCtx.CouponModel.FindOneByCode(l.ctx, req.Coupon)
@@ -198,7 +185,6 @@ func (l *PreCreateOrderLogic) PreCreateOrder(req *types.PurchaseOrderRequest) (r
 		Price:          price,
 		Amount:         amount,
 		Discount:       discountAmount,
-		PromoDiscount:  priceResult.PromoDiscount,
 		GiftAmount:     deductionAmount,
 		Coupon:         req.Coupon,
 		CouponDiscount: couponAmount,

internal/logic/public/order/promoPricing.go

@@ -1,62 +0,0 @@
-package order
-
-import (
-	"context"
-	"math"
-
-	commonLogic "github.com/perfect-panel/server/internal/logic/common"
-	"github.com/perfect-panel/server/internal/svc"
-	"github.com/perfect-panel/server/internal/types"
-)
-
-type orderPriceResult struct {
-	OriginalPrice  int64
-	PayableBase    int64
-	DiscountAmount int64
-	PromoRuleId    int64
-	PromoDiscount  int64
-	PromoPrice     int64
-}
-
-func calculatePurchasePrice(
-	ctx context.Context,
-	svcCtx *svc.ServiceContext,
-	userID int64,
-	subscribeID int64,
-	unitPrice int64,
-	quantity int64,
-	discounts []types.SubscribeDiscount,
-	eligibleForDiscount bool,
-	allowPromo bool,
-) (*orderPriceResult, error) {
-	originalPrice := unitPrice * quantity
-	result := &orderPriceResult{
-		OriginalPrice: originalPrice,
-		PayableBase:   originalPrice,
-	}
-
-	if allowPromo {
-		promoResult, err := commonLogic.EvaluatePromo(ctx, svcCtx, userID, subscribeID)
-		if err != nil {
-			return nil, err
-		}
-		if promoResult != nil && promoResult.Eligible && promoResult.PromoPrice < unitPrice {
-			result.PayableBase = promoResult.PromoPrice * quantity
-			result.PromoRuleId = promoResult.RuleID
-			result.PromoDiscount = originalPrice - result.PayableBase
-			result.PromoPrice = promoResult.PromoPrice
-			if result.PromoDiscount < 0 {
-				result.PromoDiscount = 0
-			}
-			return result, nil
-		}
-	}
-
-	discount := float64(1)
-	if len(discounts) > 0 {
-		discount = getDiscount(discounts, quantity, eligibleForDiscount)
-	}
-	result.PayableBase = int64(math.Round(float64(originalPrice) * discount))
-	result.DiscountAmount = originalPrice - result.PayableBase
-	return result, nil
-}

internal/logic/public/order/promoPricing_test.go

@@ -1,113 +0,0 @@
-package order
-
-import (
-	"context"
-	"testing"
-
-	"github.com/perfect-panel/server/internal/model/promo"
-	"github.com/perfect-panel/server/internal/svc"
-	"github.com/perfect-panel/server/internal/types"
-	"gorm.io/gorm"
-)
-
-type fakePromoModel struct {
-	rules []*promo.RuleWithPrice
-}
-
-func (m fakePromoModel) QueryEligibleRules(context.Context, int64) ([]*promo.RuleWithPrice, error) {
-	return m.rules, nil
-}
-
-func (m fakePromoModel) InsertUsage(context.Context, *promo.Usage, ...*gorm.DB) error {
-	return nil
-}
-
-func TestCalculatePurchasePricePromoSkipsPercentDiscount(t *testing.T) {
-	svcCtx := &svc.ServiceContext{
-		DB: &gorm.DB{},
-		PromoModel: fakePromoModel{rules: []*promo.RuleWithPrice{
-			{
-				Rule: promo.Rule{
-					Id:      9,
-					Name:    "campaign",
-					Type:    promo.RuleTypeCampaign,
-					Enabled: true,
-				},
-				PromoPrice: 600,
-			},
-		}},
-	}
-
-	result, err := calculatePurchasePrice(
-		context.Background(),
-		svcCtx,
-		1,
-		2,
-		1000,
-		3,
-		[]types.SubscribeDiscount{{Quantity: 3, Discount: 50}},
-		true,
-		true,
-	)
-	if err != nil {
-		t.Fatalf("calculatePurchasePrice returned error: %v", err)
-	}
-
-	if result.OriginalPrice != 3000 {
-		t.Fatalf("OriginalPrice = %d, want 3000", result.OriginalPrice)
-	}
-	if result.PayableBase != 1800 {
-		t.Fatalf("PayableBase = %d, want 1800", result.PayableBase)
-	}
-	if result.DiscountAmount != 0 {
-		t.Fatalf("DiscountAmount = %d, want 0", result.DiscountAmount)
-	}
-	if result.PromoRuleId != 9 {
-		t.Fatalf("PromoRuleId = %d, want 9", result.PromoRuleId)
-	}
-	if result.PromoDiscount != 1200 {
-		t.Fatalf("PromoDiscount = %d, want 1200", result.PromoDiscount)
-	}
-}
-
-func TestCalculatePurchasePriceIgnoresInvalidPromoPrice(t *testing.T) {
-	svcCtx := &svc.ServiceContext{
-		DB: &gorm.DB{},
-		PromoModel: fakePromoModel{rules: []*promo.RuleWithPrice{
-			{
-				Rule: promo.Rule{
-					Id:      10,
-					Name:    "invalid campaign",
-					Type:    promo.RuleTypeCampaign,
-					Enabled: true,
-				},
-				PromoPrice: 1000,
-			},
-		}},
-	}
-
-	result, err := calculatePurchasePrice(
-		context.Background(),
-		svcCtx,
-		1,
-		2,
-		1000,
-		3,
-		[]types.SubscribeDiscount{{Quantity: 3, Discount: 50}},
-		true,
-		true,
-	)
-	if err != nil {
-		t.Fatalf("calculatePurchasePrice returned error: %v", err)
-	}
-
-	if result.PayableBase != 1500 {
-		t.Fatalf("PayableBase = %d, want 1500", result.PayableBase)
-	}
-	if result.DiscountAmount != 1500 {
-		t.Fatalf("DiscountAmount = %d, want 1500", result.DiscountAmount)
-	}
-	if result.PromoRuleId != 0 || result.PromoDiscount != 0 {
-		t.Fatalf("promo fields = (%d, %d), want (0, 0)", result.PromoRuleId, result.PromoDiscount)
-	}
-}

internal/logic/public/order/purchaseLogic.go

@@ -3,6 +3,7 @@ package order
 import (
 	"context"
 	"encoding/json"
+	"math"
 	"strings"
 	"time"
 
@@ -203,28 +204,14 @@ func (l *PurchaseLogic) Purchase(req *types.PurchaseOrderRequest) (resp *types.P
 		return nil, err
 	}
 
-	priceResult, err := calculatePurchasePrice(
-		l.ctx,
-		l.svcCtx,
-		u.Id,
-		targetSubscribeID,
-		sub.UnitPrice,
-		req.Quantity,
-		newUserDiscount.Discounts,
-		newUserDiscount.EligibleForDiscount,
-		orderType == 1,
-	)
-	if err != nil {
-		l.Errorw("[Purchase] Promo price calculation error",
-			logger.Field("error", err.Error()),
-			logger.Field("user_id", u.Id),
-			logger.Field("subscribe_id", targetSubscribeID),
-		)
-		return nil, err
+	var discount float64 = 1
+	if len(newUserDiscount.Discounts) > 0 {
+		discount = getDiscount(newUserDiscount.Discounts, req.Quantity, newUserDiscount.EligibleForDiscount)
 	}
-	price := priceResult.OriginalPrice
-	amount := priceResult.PayableBase
-	discountAmount := priceResult.DiscountAmount
+	price := sub.UnitPrice * req.Quantity
+	// discount amount
+	amount := int64(math.Round(float64(price) * discount))
+	discountAmount := price - amount
 
 	// Validate amount to prevent overflow
 	if amount > MaxOrderAmount {
@@ -319,8 +306,6 @@ func (l *PurchaseLogic) Purchase(req *types.PurchaseOrderRequest) (resp *types.P
 		Price:              price,
 		Amount:             amount,
 		Discount:           discountAmount,
-		PromoRuleId:        priceResult.PromoRuleId,
-		PromoDiscount:      priceResult.PromoDiscount,
 		GiftAmount:         deductionAmount,
 		Coupon:             req.Coupon,
 		CouponDiscount:     coupon,

internal/logic/public/subscribe/promo.go

@@ -1,224 +0,0 @@
-package subscribe
-
-import (
-	"context"
-	"encoding/json"
-	stderrors "errors"
-	"strings"
-	"time"
-
-	"github.com/go-sql-driver/mysql"
-	"github.com/perfect-panel/server/internal/model/user"
-	"github.com/perfect-panel/server/internal/svc"
-	"github.com/perfect-panel/server/internal/types"
-	"github.com/perfect-panel/server/pkg/constant"
-	"github.com/perfect-panel/server/pkg/xerr"
-	"github.com/pkg/errors"
-	"gorm.io/gorm"
-)
-
-const (
-	promoRuleTypeNewUser      = "new_user"
-	promoRuleTypeInactiveUser = "inactive_user"
-	promoRuleTypeCampaign     = "campaign"
-)
-
-type subscribePromoCandidate struct {
-	SubscribeId int64      `gorm:"column:subscribe_id"`
-	RuleName    string     `gorm:"column:rule_name"`
-	RuleType    string     `gorm:"column:rule_type"`
-	PromoPrice  int64      `gorm:"column:promo_price"`
-	Params      string     `gorm:"column:params"`
-	StartTime   *time.Time `gorm:"column:start_time"`
-	EndTime     *time.Time `gorm:"column:end_time"`
-}
-
-type promoRuleParams struct {
-	WindowHours    int64 `json:"window_hours"`
-	InactiveMonths int   `json:"inactive_months"`
-}
-
-func loadSubscribePromoMap(ctx context.Context, svcCtx *svc.ServiceContext, subscribeIDs []int64) (map[int64]*types.SubscribePromo, error) {
-	result := make(map[int64]*types.SubscribePromo)
-	if len(subscribeIDs) == 0 || svcCtx == nil || svcCtx.DB == nil {
-		return result, nil
-	}
-
-	userInfo, _ := ctx.Value(constant.CtxKeyUser).(*user.User)
-	candidates, err := querySubscribePromoCandidates(ctx, svcCtx, subscribeIDs, userInfo != nil)
-	if err != nil {
-		if isMissingPromoTableError(err) {
-			return result, nil
-		}
-		return nil, err
-	}
-
-	evaluator := promoEligibilityEvaluator{ctx: ctx, db: svcCtx.DB, userInfo: userInfo}
-	now := time.Now()
-	for _, candidate := range candidates {
-		if _, exists := result[candidate.SubscribeId]; exists {
-			continue
-		}
-		if !candidate.isActive(now) {
-			continue
-		}
-		ok, expiresAt, err := evaluator.match(candidate, now)
-		if err != nil {
-			return nil, err
-		}
-		if !ok {
-			continue
-		}
-		result[candidate.SubscribeId] = &types.SubscribePromo{
-			RuleName:   candidate.RuleName,
-			RuleType:   candidate.RuleType,
-			PromoPrice: candidate.PromoPrice,
-			ExpiresAt:  unixSeconds(expiresAt),
-		}
-	}
-
-	return result, nil
-}
-
-func querySubscribePromoCandidates(ctx context.Context, svcCtx *svc.ServiceContext, subscribeIDs []int64, loggedIn bool) ([]subscribePromoCandidate, error) {
-	var candidates []subscribePromoCandidate
-	query := svcCtx.DB.WithContext(ctx).
-		Table("subscribe_promo AS sp").
-		Select("sp.subscribe_id, sp.promo_price, pr.name AS rule_name, pr.type AS rule_type, pr.params, pr.start_time, pr.end_time").
-		Joins("JOIN promo_rule AS pr ON pr.id = sp.promo_rule_id AND pr.deleted_at IS NULL").
-		Where("sp.subscribe_id IN ? AND sp.promo_price > 0 AND pr.enabled = ?", subscribeIDs, true)
-	if !loggedIn {
-		query = query.Where("pr.type = ?", promoRuleTypeCampaign)
-	}
-	err := query.
-		Order("sp.subscribe_id ASC").
-		Order("pr.priority DESC").
-		Order("pr.id ASC").
-		Scan(&candidates).Error
-	if err != nil {
-		return nil, errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), "query subscribe promo candidates failed: %v", err)
-	}
-	return candidates, nil
-}
-
-func (c subscribePromoCandidate) isActive(now time.Time) bool {
-	if c.PromoPrice <= 0 {
-		return false
-	}
-	if c.StartTime != nil && now.Before(*c.StartTime) {
-		return false
-	}
-	if c.EndTime != nil && now.After(*c.EndTime) {
-		return false
-	}
-	return true
-}
-
-type promoEligibilityEvaluator struct {
-	ctx        context.Context
-	db         *gorm.DB
-	userInfo   *user.User
-	lastExpire *time.Time
-}
-
-func (e *promoEligibilityEvaluator) match(candidate subscribePromoCandidate, now time.Time) (bool, time.Time, error) {
-	switch candidate.RuleType {
-	case promoRuleTypeCampaign:
-		return true, candidate.expiresAt(), nil
-	case promoRuleTypeNewUser:
-		if e.userInfo == nil {
-			return false, time.Time{}, nil
-		}
-		params, err := candidate.params()
-		if err != nil {
-			return false, time.Time{}, err
-		}
-		if params.WindowHours <= 0 || e.userInfo.CreatedAt.IsZero() {
-			return false, time.Time{}, nil
-		}
-		expiresAt := e.userInfo.CreatedAt.Add(time.Duration(params.WindowHours) * time.Hour)
-		return now.Before(expiresAt), expiresAt, nil
-	case promoRuleTypeInactiveUser:
-		if e.userInfo == nil {
-			return false, time.Time{}, nil
-		}
-		params, err := candidate.params()
-		if err != nil {
-			return false, time.Time{}, err
-		}
-		if params.InactiveMonths <= 0 {
-			return false, time.Time{}, nil
-		}
-		lastExpire, err := e.lastSubscribeExpireAt()
-		if err != nil {
-			return false, time.Time{}, err
-		}
-		if lastExpire.Equal(time.UnixMilli(0)) || lastExpire.After(now) {
-			return false, time.Time{}, nil
-		}
-		if lastExpire.IsZero() {
-			return true, candidate.expiresAt(), nil
-		}
-		threshold := now.AddDate(0, -params.InactiveMonths, 0)
-		return !lastExpire.After(threshold), candidate.expiresAt(), nil
-	default:
-		return false, time.Time{}, nil
-	}
-}
-
-func (e *promoEligibilityEvaluator) lastSubscribeExpireAt() (time.Time, error) {
-	if e.lastExpire != nil {
-		return *e.lastExpire, nil
-	}
-	var item user.Subscribe
-	err := e.db.WithContext(e.ctx).
-		Model(&user.Subscribe{}).
-		Where("user_id = ?", e.userInfo.Id).
-		Where("expire_time != ?", time.UnixMilli(0)).
-		Order("expire_time DESC").
-		Limit(1).
-		Take(&item).Error
-	if err != nil {
-		if stderrors.Is(err, gorm.ErrRecordNotFound) {
-			zero := time.Time{}
-			e.lastExpire = &zero
-			return zero, nil
-		}
-		return time.Time{}, errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), "query promo user last subscription failed")
-	}
-	e.lastExpire = &item.ExpireTime
-	return item.ExpireTime, nil
-}
-
-func (c subscribePromoCandidate) expiresAt() time.Time {
-	if c.EndTime == nil {
-		return time.Time{}
-	}
-	return *c.EndTime
-}
-
-func (c subscribePromoCandidate) params() (promoRuleParams, error) {
-	if c.Params == "" {
-		return promoRuleParams{}, nil
-	}
-	var params promoRuleParams
-	if err := json.Unmarshal([]byte(c.Params), &params); err != nil {
-		return promoRuleParams{}, errors.Wrapf(xerr.NewErrCode(xerr.InvalidParams), "parse promo rule params failed")
-	}
-	return params, nil
-}
-
-func unixSeconds(t time.Time) int64 {
-	if t.IsZero() {
-		return 0
-	}
-	return t.Unix()
-}
-
-func isMissingPromoTableError(err error) bool {
-	var mysqlErr *mysql.MySQLError
-	if stderrors.As(err, &mysqlErr) {
-		return mysqlErr.Number == 1146
-	}
-	return strings.Contains(err.Error(), "Error 1146")
-}

internal/logic/public/subscribe/promo_test.go

@@ -1,75 +0,0 @@
-package subscribe
-
-import (
-	"testing"
-	"time"
-
-	"github.com/perfect-panel/server/internal/model/user"
-)
-
-func TestPromoEligibilityEvaluatorMatch(t *testing.T) {
-	now := time.Unix(1710000000, 0)
-	campaignEnd := now.Add(2 * time.Hour)
-
-	campaign := subscribePromoCandidate{
-		RuleName:   "限时活动",
-		RuleType:   promoRuleTypeCampaign,
-		PromoPrice: 99,
-		EndTime:    &campaignEnd,
-	}
-	ok, expiresAt, err := (&promoEligibilityEvaluator{}).match(campaign, now)
-	if err != nil {
-		t.Fatalf("campaign match error: %v", err)
-	}
-	if !ok {
-		t.Fatal("campaign promo should match without login")
-	}
-	if got, want := unixSeconds(expiresAt), campaignEnd.Unix(); got != want {
-		t.Fatalf("campaign expires_at = %d, want %d", got, want)
-	}
-
-	newUser := subscribePromoCandidate{
-		RuleName:   "新客7天优惠",
-		RuleType:   promoRuleTypeNewUser,
-		PromoPrice: 279,
-		Params:     `{"window_hours":168}`,
-	}
-	ok, _, err = (&promoEligibilityEvaluator{}).match(newUser, now)
-	if err != nil {
-		t.Fatalf("anonymous new_user match error: %v", err)
-	}
-	if ok {
-		t.Fatal("new_user promo should not match without login")
-	}
-
-	userInfo := &user.User{Id: 1, CreatedAt: now.Add(-24 * time.Hour)}
-	ok, expiresAt, err = (&promoEligibilityEvaluator{userInfo: userInfo}).match(newUser, now)
-	if err != nil {
-		t.Fatalf("logged-in new_user match error: %v", err)
-	}
-	if !ok {
-		t.Fatal("new_user promo should match inside window")
-	}
-	if got, want := unixSeconds(expiresAt), userInfo.CreatedAt.Add(168*time.Hour).Unix(); got != want {
-		t.Fatalf("new_user expires_at = %d, want %d", got, want)
-	}
-}
-
-func TestSubscribePromoCandidateActiveWindow(t *testing.T) {
-	now := time.Unix(1710000000, 0)
-	start := now.Add(-time.Hour)
-	end := now.Add(time.Hour)
-
-	if !(subscribePromoCandidate{PromoPrice: 1, StartTime: &start, EndTime: &end}).isActive(now) {
-		t.Fatal("candidate inside active window should be active")
-	}
-	if (subscribePromoCandidate{PromoPrice: 0, StartTime: &start, EndTime: &end}).isActive(now) {
-		t.Fatal("candidate with zero promo price should not be active")
-	}
-	if (subscribePromoCandidate{PromoPrice: 1, StartTime: &end}).isActive(now) {
-		t.Fatal("candidate before start time should not be active")
-	}
-	if (subscribePromoCandidate{PromoPrice: 1, EndTime: &start}).isActive(now) {
-		t.Fatal("candidate after end time should not be active")
-	}
-}

internal/logic/public/subscribe/querySubscribeListLogic.go

@@ -47,11 +47,9 @@ func (l *QuerySubscribeListLogic) QuerySubscribeList(req *types.QuerySubscribeLi
 		Total: total,
 	}
 	list := make([]types.Subscribe, len(data))
-	subscribeIDs := make([]int64, 0, len(data))
 	for i, item := range data {
 		var sub types.Subscribe
 		tool.DeepCopy(&sub, item)
-		subscribeIDs = append(subscribeIDs, sub.Id)
 		if item.Discount != "" {
 			var discount []types.SubscribeDiscount
 			_ = json.Unmarshal([]byte(item.Discount), &discount)
@@ -71,15 +69,6 @@ func (l *QuerySubscribeListLogic) QuerySubscribeList(req *types.QuerySubscribeLi
 		}
 	}
 
-	promos, err := loadSubscribePromoMap(l.ctx, l.svcCtx, subscribeIDs)
-	if err != nil {
-		l.Errorw("[QuerySubscribeListLogic] Query Promo Error", logger.Field("error", err.Error()))
-		return nil, err
-	}
-	for i := range list {
-		list[i].Promo = promos[list[i].Id]
-	}
-
 	resp.List = list
 	resp.Total = int64(len(list))
 	return

internal/logic/public/user/ws/deviceWsConnectLogic.go

@@ -39,14 +39,14 @@ func (l *DeviceWsConnectLogic) DeviceWsConnect(c *gin.Context) error {
 		value, _ = c.GetQuery("identifier")
 		if value == nil || value.(string) == "" {
 			l.Errorf("DeviceWsConnectLogic DeviceWsConnect identifier is empty")
-			return errors.Wrap(xerr.NewErrCode(xerr.InvalidParams), "identifier is empty")
+			return errors.Wrapf(xerr.NewErrCode(xerr.InvalidParams), "identifier is empty")
 		}
 	}
 	identifier := value.(string)
 	_, err := l.svcCtx.UserModel.FindOneDeviceByIdentifier(l.ctx, identifier)
 	if err != nil && !sysErr.Is(err, gorm.ErrRecordNotFound) {
 		l.Errorf("DeviceWsConnectLogic DeviceWsConnect FindOneDeviceByIdentifier err: %v", err)
-		return errors.Wrap(xerr.NewErrCode(xerr.DatabaseQueryError), err.Error())
+		return errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), err.Error())
 	}
 
 	value = l.ctx.Value(constant.CtxKeyUser)
@@ -67,7 +67,7 @@ func (l *DeviceWsConnectLogic) DeviceWsConnect(c *gin.Context) error {
 		err := l.svcCtx.UserModel.InsertDevice(l.ctx, &device)
 		if err != nil {
 			l.Errorf("DeviceWsConnectLogic DeviceWsConnect InsertDevice err: %v", err)
-			return errors.Wrap(xerr.NewErrCode(xerr.DatabaseInsertError), err.Error())
+			return errors.Wrapf(xerr.NewErrCode(xerr.DatabaseInsertError), err.Error())
 		}
 	}
 	//默认在线设备1

internal/middleware/authMiddleware.go

@@ -22,92 +22,77 @@ import (
 
 func AuthMiddleware(svc *svc.ServiceContext) func(c *gin.Context) {
 	return func(c *gin.Context) {
-		if !authenticateRequest(c, svc, c.GetHeader("Authorization"), true) {
-			return
-		}
-		c.Next()
-	}
-}
+		ctx := c.Request.Context()
 
-func OptionalAuthMiddleware(svc *svc.ServiceContext) func(c *gin.Context) {
-	return func(c *gin.Context) {
+		jwtConfig := svc.Config.JwtAuth
+		// get token from header
 		token := c.GetHeader("Authorization")
 		if token == "" {
-			c.Next()
-			return
-		}
-		if !authenticateRequest(c, svc, token, false) {
-			return
-		}
-		c.Next()
-	}
-}
-
-func authenticateRequest(c *gin.Context, svc *svc.ServiceContext, token string, requireToken bool) bool {
-	ctx := c.Request.Context()
-
-	if token == "" {
-		if requireToken {
 			logger.WithContext(c.Request.Context()).Debug("[AuthMiddleware] Token Empty")
 			result.HttpResult(c, nil, errors.Wrapf(xerr.NewErrCode(xerr.ErrorTokenEmpty), "Token Empty"))
 			c.Abort()
+			return
+		}
+		// parse token
+		claims, err := jwt.ParseJwtToken(token, jwtConfig.AccessSecret)
+		if err != nil {
+			logger.WithContext(c.Request.Context()).Debug("[AuthMiddleware] ParseJwtToken", logger.Field("error", err.Error()), logger.Field("token", token))
+			result.HttpResult(c, nil, errors.Wrapf(xerr.NewErrCode(xerr.ErrorTokenExpire), "Token Invalid"))
+			c.Abort()
+			return
 		}
-		return !requireToken
-	}
 
-	claims, err := jwt.ParseJwtToken(token, svc.Config.JwtAuth.AccessSecret)
-	if err != nil {
-		logger.WithContext(c.Request.Context()).Debug("[AuthMiddleware] ParseJwtToken", logger.Field("error", err.Error()), logger.Field("token", token))
-		result.HttpResult(c, nil, errors.Wrapf(xerr.NewErrCode(xerr.ErrorTokenExpire), "Token Invalid"))
-		c.Abort()
-		return false
-	}
+		loginType := parseLoginType(claims)
+		if claims["identifier"] != nil {
+			ctx = context.WithValue(ctx, constant.CtxKeyIdentifier, claims["identifier"].(string))
+		}
+		// get user id from token
+		userId := int64(claims["UserId"].(float64))
+		// get session id from token
+		sessionId := claims["SessionId"].(string)
+		// get session id from redis
+		sessionIdCacheKey := fmt.Sprintf("%v:%v", config.SessionIdKey, sessionId)
+		value, err := svc.Redis.Get(c, sessionIdCacheKey).Result()
+		if err != nil {
+			logger.WithContext(c.Request.Context()).Debug("[AuthMiddleware] Redis Get", logger.Field("error", err.Error()), logger.Field("sessionId", sessionId))
+			result.HttpResult(c, nil, errors.Wrapf(xerr.NewErrCode(xerr.InvalidAccess), "Invalid Access"))
+			c.Abort()
+			return
+		}
 
-	loginType := parseLoginType(claims)
-	if claims["identifier"] != nil {
-		ctx = context.WithValue(ctx, constant.CtxKeyIdentifier, claims["identifier"].(string))
-	}
-	userId := int64(claims["UserId"].(float64))
-	sessionId := claims["SessionId"].(string)
-	sessionIdCacheKey := fmt.Sprintf("%v:%v", config.SessionIdKey, sessionId)
-	value, err := svc.Redis.Get(c, sessionIdCacheKey).Result()
-	if err != nil {
-		logger.WithContext(c.Request.Context()).Debug("[AuthMiddleware] Redis Get", logger.Field("error", err.Error()), logger.Field("sessionId", sessionId))
-		result.HttpResult(c, nil, errors.Wrapf(xerr.NewErrCode(xerr.InvalidAccess), "Invalid Access"))
-		c.Abort()
-		return false
-	}
+		//verify user id
+		if value != fmt.Sprintf("%v", userId) {
+			logger.WithContext(c.Request.Context()).Debug("[AuthMiddleware] Invalid Access", logger.Field("userId", userId), logger.Field("sessionId", sessionId))
+			result.HttpResult(c, nil, errors.Wrapf(xerr.NewErrCode(xerr.InvalidAccess), "Invalid Access"))
+			c.Abort()
+			return
+		}
 
-	if value != fmt.Sprintf("%v", userId) {
-		logger.WithContext(c.Request.Context()).Debug("[AuthMiddleware] Invalid Access", logger.Field("userId", userId), logger.Field("sessionId", sessionId))
-		result.HttpResult(c, nil, errors.Wrapf(xerr.NewErrCode(xerr.InvalidAccess), "Invalid Access"))
-		c.Abort()
-		return false
+		// sliding session: refresh TTL on every active request
+		svc.Redis.Expire(c, sessionIdCacheKey, time.Duration(svc.Config.JwtAuth.AccessExpire)*time.Second)
+
+		userInfo, err := svc.UserModel.FindOne(c, userId)
+		if err != nil {
+			logger.WithContext(c.Request.Context()).Debug("[AuthMiddleware] UserModel FindOne", logger.Field("error", err.Error()), logger.Field("userId", userId))
+			result.HttpResult(c, nil, errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), "Database Query Error"))
+			c.Abort()
+			return
+		}
+		// admin verify
+		paths := strings.Split(c.Request.URL.Path, "/")
+		if tool.StringSliceContains(paths, "admin") && !*userInfo.IsAdmin {
+			logger.WithContext(c.Request.Context()).Debug("[AuthMiddleware] Not Admin User", logger.Field("userId", userId), logger.Field("sessionId", sessionId))
+			result.HttpResult(c, nil, errors.Wrapf(xerr.NewErrCode(xerr.InvalidAccess), "Invalid Access"))
+			c.Abort()
+			return
+		}
+		ctx = context.WithValue(ctx, constant.CtxLoginType, loginType)
+		ctx = context.WithValue(ctx, constant.CtxKeyUser, userInfo)
+		ctx = context.WithValue(ctx, constant.CtxKeySessionID, sessionId)
+
+		c.Request = c.Request.WithContext(ctx)
+		c.Next()
 	}
-
-	svc.Redis.Expire(c, sessionIdCacheKey, time.Duration(svc.Config.JwtAuth.AccessExpire)*time.Second)
-
-	userInfo, err := svc.UserModel.FindOne(c, userId)
-	if err != nil {
-		logger.WithContext(c.Request.Context()).Debug("[AuthMiddleware] UserModel FindOne", logger.Field("error", err.Error()), logger.Field("userId", userId))
-		result.HttpResult(c, nil, errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), "Database Query Error"))
-		c.Abort()
-		return false
-	}
-
-	paths := strings.Split(c.Request.URL.Path, "/")
-	if tool.StringSliceContains(paths, "admin") && !*userInfo.IsAdmin {
-		logger.WithContext(c.Request.Context()).Debug("[AuthMiddleware] Not Admin User", logger.Field("userId", userId), logger.Field("sessionId", sessionId))
-		result.HttpResult(c, nil, errors.Wrapf(xerr.NewErrCode(xerr.InvalidAccess), "Invalid Access"))
-		c.Abort()
-		return false
-	}
-	ctx = context.WithValue(ctx, constant.CtxLoginType, loginType)
-	ctx = context.WithValue(ctx, constant.CtxKeyUser, userInfo)
-	ctx = context.WithValue(ctx, constant.CtxKeySessionID, sessionId)
-
-	c.Request = c.Request.WithContext(ctx)
-	return true
 }
 
 func parseLoginType(claims map[string]interface{}) string {

internal/model/order/model.go

@@ -22,8 +22,6 @@ type Details struct {
 	Price          int64                `gorm:"type:int;not null;default:0;comment:Original price"`
 	Amount         int64                `gorm:"type:int;not null;default:0;comment:Order Amount"`
 	Discount       int64                `gorm:"type:int;not null;default:0;comment:Order Discount"`
-	PromoRuleId    int64                `gorm:"type:bigint unsigned;not null;default:0;comment:Promo Rule ID"`
-	PromoDiscount  int64                `gorm:"type:bigint;not null;default:0;comment:Promo Discount Amount"`
 	Coupon         string               `gorm:"type:varchar(255);default:null;comment:Coupon"`
 	CouponDiscount int64                `gorm:"type:int;not null;default:0;comment:Coupon Discount"`
 	PaymentId      int64                `gorm:"type:bigint;not null;default:0;comment:Payment Id"`

internal/model/order/order.go

@@ -3,34 +3,32 @@ package order
 import "time"
 
 type Order struct {
-	Id                 int64     `gorm:"primaryKey"`
-	ParentId           int64     `gorm:"type:bigint;default:null;comment:Parent Order Id"`
+	Id             int64     `gorm:"primaryKey"`
+	ParentId       int64     `gorm:"type:bigint;default:null;comment:Parent Order Id"`
 	UserId             int64     `gorm:"type:bigint;not null;default:0;comment:User Id"`
 	SubscriptionUserId int64     `gorm:"type:bigint;not null;default:0;comment:Target user ID for subscription (0=same as UserId)"`
-	OrderNo            string    `gorm:"type:varchar(255);not null;default:'';unique;comment:Order No"`
-	Type               uint8     `gorm:"type:tinyint(1);not null;default:1;comment:Order Type: 1: Subscribe, 2: Renewal, 3: ResetTraffic, 4: Recharge"`
-	Quantity           int64     `gorm:"type:bigint;not null;default:1;comment:Quantity"`
-	Price              int64     `gorm:"type:int;not null;default:0;comment:Original price"`
-	Amount             int64     `gorm:"type:int;not null;default:0;comment:Order Amount"`
-	GiftAmount         int64     `gorm:"type:int;not null;default:0;comment:User Gift Amount"`
-	Discount           int64     `gorm:"type:int;not null;default:0;comment:Discount Amount"`
-	PromoRuleId        int64     `gorm:"type:bigint unsigned;not null;default:0;comment:Promo Rule ID"`
-	PromoDiscount      int64     `gorm:"type:bigint;not null;default:0;comment:Promo Discount Amount"`
-	Coupon             string    `gorm:"type:varchar(255);default:null;comment:Coupon"`
-	CouponDiscount     int64     `gorm:"type:int;not null;default:0;comment:Coupon Discount Amount"`
-	Commission         int64     `gorm:"type:int;not null;default:0;comment:Order Commission"`
-	PaymentId          int64     `gorm:"type:bigint;not null;default:0;comment:Payment Method Id"`
-	Method             string    `gorm:"type:varchar(255);not null;default:'';comment:Payment Method"`
-	FeeAmount          int64     `gorm:"type:int;not null;default:0;comment:Fee Amount"`
-	TradeNo            string    `gorm:"type:varchar(255);default:null;comment:Trade No"`
-	Status             uint8     `gorm:"type:tinyint(1);not null;default:1;comment:Order Status: 1: Pending, 2: Paid, 3:Close, 4: Failed, 5:Finished;"`
-	SubscribeId        int64     `gorm:"type:bigint;not null;default:0;comment:Subscribe Id"`
-	SubscribeToken     string    `gorm:"type:varchar(255);default:null;comment:Renewal Subscribe Token"`
-	AppAccountToken    string    `gorm:"type:varchar(36);default:null;comment:Apple IAP App Account Token (UUID)"`
-	ActivationContext  string    `gorm:"type:text;default:null;comment:Activation context JSON (guest/redemption info for DB fallback)"`
-	IsNew              bool      `gorm:"type:tinyint(1);not null;default:0;comment:Is New Order"`
-	CreatedAt          time.Time `gorm:"<-:create;comment:Create Time"`
-	UpdatedAt          time.Time `gorm:"comment:Update Time"`
+	OrderNo        string    `gorm:"type:varchar(255);not null;default:'';unique;comment:Order No"`
+	Type           uint8     `gorm:"type:tinyint(1);not null;default:1;comment:Order Type: 1: Subscribe, 2: Renewal, 3: ResetTraffic, 4: Recharge"`
+	Quantity       int64     `gorm:"type:bigint;not null;default:1;comment:Quantity"`
+	Price          int64     `gorm:"type:int;not null;default:0;comment:Original price"`
+	Amount         int64     `gorm:"type:int;not null;default:0;comment:Order Amount"`
+	GiftAmount     int64     `gorm:"type:int;not null;default:0;comment:User Gift Amount"`
+	Discount       int64     `gorm:"type:int;not null;default:0;comment:Discount Amount"`
+	Coupon         string    `gorm:"type:varchar(255);default:null;comment:Coupon"`
+	CouponDiscount int64     `gorm:"type:int;not null;default:0;comment:Coupon Discount Amount"`
+	Commission     int64     `gorm:"type:int;not null;default:0;comment:Order Commission"`
+	PaymentId      int64     `gorm:"type:bigint;not null;default:0;comment:Payment Method Id"`
+	Method         string    `gorm:"type:varchar(255);not null;default:'';comment:Payment Method"`
+	FeeAmount      int64     `gorm:"type:int;not null;default:0;comment:Fee Amount"`
+	TradeNo        string    `gorm:"type:varchar(255);default:null;comment:Trade No"`
+	Status         uint8     `gorm:"type:tinyint(1);not null;default:1;comment:Order Status: 1: Pending, 2: Paid, 3:Close, 4: Failed, 5:Finished;"`
+	SubscribeId    int64     `gorm:"type:bigint;not null;default:0;comment:Subscribe Id"`
+	SubscribeToken  string    `gorm:"type:varchar(255);default:null;comment:Renewal Subscribe Token"`
+	AppAccountToken   string    `gorm:"type:varchar(36);default:null;comment:Apple IAP App Account Token (UUID)"`
+	ActivationContext string    `gorm:"type:text;default:null;comment:Activation context JSON (guest/redemption info for DB fallback)"`
+	IsNew             bool      `gorm:"type:tinyint(1);not null;default:0;comment:Is New Order"`
+	CreatedAt      time.Time `gorm:"<-:create;comment:Create Time"`
+	UpdatedAt      time.Time `gorm:"comment:Update Time"`
 }
 
 type OrdersTotal struct {

internal/model/promo/model.go

@@ -1,48 +0,0 @@
-package promo
-
-import (
-	"context"
-
-	"github.com/redis/go-redis/v9"
-	"gorm.io/gorm"
-)
-
-type RuleWithPrice struct {
-	Rule
-	PromoPrice int64 `gorm:"column:promo_price"`
-}
-
-type Model interface {
-	QueryEligibleRules(ctx context.Context, subscribeId int64) ([]*RuleWithPrice, error)
-	InsertUsage(ctx context.Context, data *Usage, tx ...*gorm.DB) error
-}
-
-type defaultPromoModel struct {
-	db *gorm.DB
-}
-
-func NewModel(db *gorm.DB, _ *redis.Client) Model {
-	return &defaultPromoModel{db: db}
-}
-
-func (m *defaultPromoModel) QueryEligibleRules(ctx context.Context, subscribeId int64) ([]*RuleWithPrice, error) {
-	var list []*RuleWithPrice
-	err := m.db.WithContext(ctx).
-		Table("promo_rule AS pr").
-		Select("pr.*, sp.promo_price").
-		Joins("JOIN subscribe_promo AS sp ON sp.promo_rule_id = pr.id").
-		Where("sp.subscribe_id = ? AND sp.promo_price > 0 AND pr.enabled = ?", subscribeId, true).
-		Where("pr.deleted_at IS NULL").
-		Order("pr.priority DESC").
-		Order("pr.id ASC").
-		Find(&list).Error
-	return list, err
-}
-
-func (m *defaultPromoModel) InsertUsage(ctx context.Context, data *Usage, tx ...*gorm.DB) error {
-	db := m.db.WithContext(ctx)
-	if len(tx) > 0 {
-		db = tx[0].WithContext(ctx)
-	}
-	return db.Model(&Usage{}).Create(data).Error
-}

internal/model/promo/promo.go

@@ -1,58 +0,0 @@
-package promo
-
-import (
-	"time"
-
-	"gorm.io/gorm"
-)
-
-const (
-	RuleTypeNewUser      = "new_user"
-	RuleTypeInactiveUser = "inactive_user"
-	RuleTypeCampaign     = "campaign"
-)
-
-type Rule struct {
-	Id        int64          `gorm:"primaryKey"`
-	Name      string         `gorm:"type:varchar(100);not null;default:'';comment:Rule Name"`
-	Type      string         `gorm:"type:varchar(32);not null;default:'';comment:Rule Type"`
-	Params    string         `gorm:"type:json;not null;comment:Rule Params"`
-	Priority  int64          `gorm:"type:int;not null;default:0;comment:Priority"`
-	Enabled   bool           `gorm:"type:tinyint(1);not null;default:1;comment:Enabled"`
-	StartTime *time.Time     `gorm:"default:null;comment:Start Time"`
-	EndTime   *time.Time     `gorm:"default:null;comment:End Time"`
-	CreatedAt time.Time      `gorm:"<-:create;comment:Create Time"`
-	UpdatedAt time.Time      `gorm:"comment:Update Time"`
-	DeletedAt gorm.DeletedAt `gorm:"index;comment:Delete Time"`
-}
-
-func (Rule) TableName() string {
-	return "promo_rule"
-}
-
-type SubscribePromo struct {
-	Id          int64     `gorm:"primaryKey"`
-	SubscribeId int64     `gorm:"type:bigint unsigned;not null;comment:Subscribe ID"`
-	PromoRuleId int64     `gorm:"type:bigint unsigned;not null;comment:Promo Rule ID"`
-	PromoPrice  int64     `gorm:"type:bigint;not null;default:0;comment:Promo Price"`
-	CreatedAt   time.Time `gorm:"<-:create;comment:Create Time"`
-	UpdatedAt   time.Time `gorm:"comment:Update Time"`
-}
-
-func (SubscribePromo) TableName() string {
-	return "subscribe_promo"
-}
-
-type Usage struct {
-	Id          int64     `gorm:"primaryKey"`
-	UserId      int64     `gorm:"type:bigint unsigned;not null;comment:User ID"`
-	PromoRuleId int64     `gorm:"type:bigint unsigned;not null;comment:Promo Rule ID"`
-	SubscribeId int64     `gorm:"type:bigint unsigned;not null;comment:Subscribe ID"`
-	OrderNo     string    `gorm:"type:varchar(255);not null;default:'';comment:Order No"`
-	PromoPrice  int64     `gorm:"type:bigint;not null;default:0;comment:Promo Price"`
-	CreatedAt   time.Time `gorm:"<-:create;comment:Create Time"`
-}
-
-func (Usage) TableName() string {
-	return "promo_usage"
-}

internal/model/user/user.go

@@ -101,8 +101,6 @@ type Subscribe struct {
 	Traffic         int64      `gorm:"default:0;comment:Traffic"`
 	Download        int64      `gorm:"default:0;comment:Download Traffic"`
 	Upload          int64      `gorm:"default:0;comment:Upload Traffic"`
-	SpeedLimit      int64      `gorm:"default:0;comment:User-level speed limit override (Mbps, 0=use plan default)"`
-	TrafficLimit    string     `gorm:"type:text;default:null;comment:User-level traffic limit rules override (JSON)"`
 	ExpiredDownload int64      `gorm:"default:0;comment:Expired period download traffic (bytes)"`
 	ExpiredUpload   int64      `gorm:"default:0;comment:Expired period upload traffic (bytes)"`
 	Token           string     `gorm:"index:idx_token;unique;type:varchar(255);default:'';comment:Token"`

internal/svc/serviceContext.go

@@ -21,7 +21,6 @@ import (
 	logmessage "github.com/perfect-panel/server/internal/model/logmessage"
 	"github.com/perfect-panel/server/internal/model/order"
 	"github.com/perfect-panel/server/internal/model/payment"
-	"github.com/perfect-panel/server/internal/model/promo"
 	"github.com/perfect-panel/server/internal/model/subscribe"
 	"github.com/perfect-panel/server/internal/model/system"
 	"github.com/perfect-panel/server/internal/model/ticket"
@@ -46,7 +45,7 @@ type ServiceContext struct {
 	ExchangeRate       float64
 	GeoIP              *IPLocation
 	SignatureValidator *signature.Validator
-	S3Store            *storage.S3Store
+	S3Store             *storage.S3Store
 
 	//NodeCache   *cache.NodeCacheClient
 	AuthModel       auth.Model
@@ -64,7 +63,6 @@ type ServiceContext struct {
 	RedemptionCodeModel      redemption.RedemptionCodeModel
 	RedemptionRecordModel    redemption.RedemptionRecordModel
 	PaymentModel             payment.Model
-	PromoModel               promo.Model
 	DocumentModel            document.Model
 	SubscribeModel           subscribe.Model
 	TrafficLogModel          traffic.Model
@@ -140,7 +138,6 @@ func NewServiceContext(c config.Config) *ServiceContext {
 		RedemptionCodeModel:   redemption.NewRedemptionCodeModel(db, rds),
 		RedemptionRecordModel: redemption.NewRedemptionRecordModel(db, rds),
 		PaymentModel:          payment.NewModel(db, rds),
-		PromoModel:            promo.NewModel(db, rds),
 		DocumentModel:         document.NewModel(db, rds),
 		SubscribeModel:        subscribe.NewModel(db, rds),
 		TrafficLogModel:       traffic.NewModel(db),

internal/types/types.go

@@ -541,12 +541,10 @@ type CreateUserRequest struct {
 }
 
 type CreateUserSubscribeRequest struct {
-	UserId       int64  `json:"user_id"`
-	ExpiredAt    int64  `json:"expired_at"`
-	Traffic      int64  `json:"traffic"`
-	SubscribeId  int64  `json:"subscribe_id"`
-	SpeedLimit   int64  `json:"speed_limit,optional"`
-	TrafficLimit string `json:"traffic_limit,optional"`
+	UserId      int64 `json:"user_id"`
+	ExpiredAt   int64 `json:"expired_at"`
+	Traffic     int64 `json:"traffic"`
+	SubscribeId int64 `json:"subscribe_id"`
 }
 
 type CreateUserTicketFollowRequest struct {
@@ -1868,8 +1866,6 @@ type Order struct {
 	Amount         int64         `json:"amount"`
 	GiftAmount     int64         `json:"gift_amount"`
 	Discount       int64         `json:"discount"`
-	PromoRuleId    int64         `json:"promo_rule_id"`
-	PromoDiscount  int64         `json:"promo_discount"`
 	Coupon         string        `json:"coupon"`
 	CouponDiscount int64         `json:"coupon_discount"`
 	Commission     int64         `json:"commission,omitempty"`
@@ -1893,8 +1889,6 @@ type OrderDetail struct {
 	Amount         int64         `json:"amount"`
 	GiftAmount     int64         `json:"gift_amount"`
 	Discount       int64         `json:"discount"`
-	PromoRuleId    int64         `json:"promo_rule_id"`
-	PromoDiscount  int64         `json:"promo_discount"`
 	Coupon         string        `json:"coupon"`
 	CouponDiscount int64         `json:"coupon_discount"`
 	Commission     int64         `json:"commission,omitempty"`
@@ -2016,7 +2010,6 @@ type PreOrderResponse struct {
 	Price          int64  `json:"price"`
 	Amount         int64  `json:"amount"`
 	Discount       int64  `json:"discount"`
-	PromoDiscount  int64  `json:"promo_discount"`
 	GiftAmount     int64  `json:"gift_amount"`
 	Coupon         string `json:"coupon"`
 	CouponDiscount int64  `json:"coupon_discount"`
@@ -2785,13 +2778,6 @@ type StripePayment struct {
 	PublishableKey string `json:"publishable_key"`
 }
 
-type SubscribePromo struct {
-	RuleName   string `json:"rule_name"`
-	RuleType   string `json:"rule_type"`
-	PromoPrice int64  `json:"promo_price"`
-	ExpiresAt  int64  `json:"expires_at"`
-}
-
 type Subscribe struct {
 	Id                int64               `json:"id"`
 	Name              string              `json:"name"`
@@ -2800,7 +2786,6 @@ type Subscribe struct {
 	UnitPrice         int64               `json:"unit_price"`
 	UnitTime          string              `json:"unit_time"`
 	Discount          []SubscribeDiscount `json:"discount"`
-	Promo             *SubscribePromo     `json:"promo"`
 	NodeCount         int64               `json:"node_count"`
 	Replacement       int64               `json:"replacement"`
 	Inventory         int64               `json:"inventory"`
@@ -3332,14 +3317,12 @@ type UpdateUserSubscribeNoteRequest struct {
 }
 
 type UpdateUserSubscribeRequest struct {
-	UserSubscribeId int64   `json:"user_subscribe_id"`
-	SubscribeId     int64   `json:"subscribe_id"`
-	Traffic         int64   `json:"traffic"`
-	ExpiredAt       int64   `json:"expired_at"`
-	Upload          int64   `json:"upload"`
-	Download        int64   `json:"download"`
-	SpeedLimit      *int64  `json:"speed_limit,omitempty"`
-	TrafficLimit    *string `json:"traffic_limit,omitempty"`
+	UserSubscribeId int64 `json:"user_subscribe_id"`
+	SubscribeId     int64 `json:"subscribe_id"`
+	Traffic         int64 `json:"traffic"`
+	ExpiredAt       int64 `json:"expired_at"`
+	Upload          int64 `json:"upload"`
+	Download        int64 `json:"download"`
 }
 
 type UpdateUserTicketStatusRequest struct {
@@ -3491,33 +3474,30 @@ type UserSubscribe struct {
 }
 
 type UserSubscribeDetail struct {
-	Id             int64          `json:"id"`
-	UserId         int64          `json:"user_id"`
-	User           User           `json:"user"`
-	OrderId        int64          `json:"order_id"`
-	SubscribeId    int64          `json:"subscribe_id"`
-	Subscribe      Subscribe      `json:"subscribe"`
-	NodeGroupId    int64          `json:"node_group_id"`
-	NodeGroupName  string         `json:"node_group_name"`
-	GroupLocked    bool           `json:"group_locked"`
-	StartTime      int64          `json:"start_time"`
-	ExpireTime     int64          `json:"expire_time"`
-	ResetTime      int64          `json:"reset_time"`
-	Traffic        int64          `json:"traffic"`
-	Download       int64          `json:"download"`
-	Upload         int64          `json:"upload"`
-	SpeedLimit     int64          `json:"speed_limit"`
-	TrafficLimit   []TrafficLimit `json:"user_traffic_limit"`
-	PlanSpeedLimit int64          `json:"plan_speed_limit"`
-	Token          string         `json:"token"`
-	Status         uint8          `json:"status"`
-	EffectiveSpeed int64          `json:"effective_speed"`
-	IsThrottled    bool           `json:"is_throttled"`
-	ThrottleRule   string         `json:"throttle_rule,omitempty"`
-	ThrottleStart  int64          `json:"throttle_start,omitempty"`
-	ThrottleEnd    int64          `json:"throttle_end,omitempty"`
-	CreatedAt      int64          `json:"created_at"`
-	UpdatedAt      int64          `json:"updated_at"`
+	Id             int64     `json:"id"`
+	UserId         int64     `json:"user_id"`
+	User           User      `json:"user"`
+	OrderId        int64     `json:"order_id"`
+	SubscribeId    int64     `json:"subscribe_id"`
+	Subscribe      Subscribe `json:"subscribe"`
+	NodeGroupId    int64     `json:"node_group_id"`
+	NodeGroupName  string    `json:"node_group_name"`
+	GroupLocked    bool      `json:"group_locked"`
+	StartTime      int64     `json:"start_time"`
+	ExpireTime     int64     `json:"expire_time"`
+	ResetTime      int64     `json:"reset_time"`
+	Traffic        int64     `json:"traffic"`
+	Download       int64     `json:"download"`
+	Upload         int64     `json:"upload"`
+	Token          string    `json:"token"`
+	Status         uint8     `json:"status"`
+	EffectiveSpeed int64     `json:"effective_speed"`
+	IsThrottled    bool      `json:"is_throttled"`
+	ThrottleRule   string    `json:"throttle_rule,omitempty"`
+	ThrottleStart  int64     `json:"throttle_start,omitempty"`
+	ThrottleEnd    int64     `json:"throttle_end,omitempty"`
+	CreatedAt      int64     `json:"created_at"`
+	UpdatedAt      int64     `json:"updated_at"`
 }
 
 type UserSubscribeInfo struct {

ops/hifast-upload-chain-runbook-zh.md

@@ -0,0 +1,130 @@
+# Hifast 上传链路自检 Runbook
+
+本文档用于排查 `POST /v1/public/file/upload`、`/upload/init`、`/upload/complete` 相关问题。上传链路依赖：
+
+`客户端 -> Nginx -> ppanel-server -> S3/RustFS endpoint`
+
+## 1. 先确认业务服务健康
+
+在测试机执行：
+
+```bash
+curl -k -sS -m 8 -i https://tapi.hifast.biz/v1/common/heartbeat | head -30
+docker ps --format '{{.Names}} {{.Image}} {{.Status}} {{.Ports}}'
+ss -lntp | grep -E ':(80|443|8080|3306|6379)'
+```
+
+预期：
+
+- `/v1/common/heartbeat` 返回 `HTTP 200`，业务 `code=200`
+- `ppanel-server`、`ppanel-mysql`、`ppanel-redis` 运行中
+- Nginx 监听 `80/443`，ppanel 监听 `8080`
+
+## 2. 检查上传配置
+
+测试环境当前业务容器使用挂载配置：
+
+```bash
+docker inspect ppanel-server --format '{{json .Mounts}}'
+docker cp ppanel-server:/app/etc/ppanel.yaml /tmp/ppanel.yaml
+awk '/^S3:/{flag=1} flag && /^[A-Za-z0-9_]+:/{if($1!="S3:") exit} flag{print}' /tmp/ppanel.yaml \
+  | sed -E 's/(AccessKey:).*/\1 ***REDACTED***/; s/(SecretKey:).*/\1 ***REDACTED***/; s/(SessionToken:).*/\1 ***REDACTED***/'
+```
+
+重点确认：
+
+- `S3.Enable: true`
+- `S3.Endpoint` 是 ppanel-server 所在机器可以访问的地址
+- `S3.Bucket` 存在且凭据有 `PutObject` / `HeadObject` 权限
+- `S3.UsePathStyle` 与对象存储实现一致
+- `S3.PublicBaseURL` 只影响返回 URL，不代表写入 endpoint
+
+## 3. 检查对象存储连通性
+
+先从测试机主机网络检查：
+
+```bash
+endpoint='http://107.173.50.22:5017'
+host='107.173.50.22'
+port='5017'
+
+timeout 5 bash -lc "</dev/tcp/${host}/${port}" && echo tcp_ok || echo tcp_fail
+curl -v --connect-timeout 5 --max-time 10 -I "${endpoint}/"
+curl -v --connect-timeout 5 --max-time 10 -I "${endpoint}/hifastvpn"
+ip route get "${host}"
+```
+
+判定：
+
+- TCP 超时：优先查对象存储主机防火墙、安全组、服务监听、源 IP 白名单
+- TCP 通但 HTTP 空响应：优先查 endpoint 协议、反向代理、对象存储进程健康
+- 返回 S3 XML/鉴权错误：网络已通，再查 AK/SK、bucket、path-style 配置
+
+## 4. 检查应用日志
+
+```bash
+docker logs --since 3h ppanel-server 2>&1 \
+  | grep -Ei 'put object failed|upload|s3|timeout|context canceled|error' \
+  | tail -120
+```
+
+典型根因：
+
+- `put object failed ... context canceled` 且请求耗时约 60 秒：上游对象存储请求没有在 Nginx upstream timeout 前完成，通常是 `S3.Endpoint` 不可达或对象存储服务 hang。
+- 立即返回业务错误：通常是 `S3.Enable=false`、Content-Type 不在白名单、bucket/权限错误。
+
+## 5. Nginx 检查
+
+```bash
+grep -RIn 'proxy_pass\|proxy_read_timeout\|client_max_body_size\|tapi.hifast.biz' /etc/nginx/sites-enabled /etc/nginx/conf.d
+nginx -t
+```
+
+注意：单纯放大 `proxy_read_timeout` 只能掩盖现象，不能修复对象存储不可达。
+
+## 6. 修复与回滚
+
+修复优先级：
+
+1. 恢复对象存储 endpoint 的网络访问或服务监听。
+2. 如 endpoint 已迁移，更新 `/root/bindbox/configs/ppanel.yaml` 的 `S3.Endpoint`，重启 `ppanel-server`。
+3. 如果凭据或 bucket 变更，同步更新 `S3.AccessKey`、`S3.SecretKey`、`S3.Bucket`、`S3.UsePathStyle`。
+
+改配置前先备份：
+
+```bash
+cp /root/bindbox/configs/ppanel.yaml /root/bindbox/configs/ppanel.yaml.bak.$(date +%Y%m%d%H%M%S)
+docker restart ppanel-server
+```
+
+回滚：
+
+```bash
+cp /root/bindbox/configs/ppanel.yaml.bak.YYYYMMDDHHMMSS /root/bindbox/configs/ppanel.yaml
+docker restart ppanel-server
+curl -k -sS -m 8 -i https://tapi.hifast.biz/v1/common/heartbeat | head -30
+```
+
+## 7. 验证
+
+使用有效 JWT 和有效签名复测：
+
+```bash
+curl -i -X POST 'https://tapi.hifast.biz/v1/public/file/upload' \
+  -H 'x-app-id: android-client' \
+  -H 'Authorization: <client-jwt>' \
+  -H 'x-signature-version: v101' \
+  -H 'login-type: device' \
+  -H 'x-signature: <sig>' \
+  -H 'x-nonce: <nonce>' \
+  -H 'x-timestamp: <ts>' \
+  -F 'biz_type=app-package' \
+  -F 'file=@nconf.zip;type=application/zip' \
+  --max-time 120
+```
+
+预期：
+
+- HTTP 不再出现 `504 Gateway Time-out`
+- 业务响应 `code=200`
+- `docker logs ppanel-server` 不再出现新的 `put object failed`

queue/logic/order/activateOrderLogic.go

@@ -19,7 +19,6 @@ import (
 	"github.com/google/uuid"
 	"github.com/hibiken/asynq"
 	"github.com/perfect-panel/server/internal/model/order"
-	"github.com/perfect-panel/server/internal/model/promo"
 	"github.com/perfect-panel/server/internal/model/redemption"
 	"github.com/perfect-panel/server/internal/model/subscribe"
 	"github.com/perfect-panel/server/internal/model/user"
@@ -149,7 +148,6 @@ func (l *ActivateOrderLogic) ProcessTask(ctx context.Context, task *asynq.Task)
 		return err
 	}
 
-	l.recordPromoUsage(ctx, orderInfo)
 	l.finalizeCouponAndOrder(ctx, orderInfo)
 
 	commonLogic.SubscriptionTraceInfo(logger.WithContext(ctx), commonLogic.SubscriptionTraceFlowOrder, "activation_finished",
@@ -159,44 +157,6 @@ func (l *ActivateOrderLogic) ProcessTask(ctx context.Context, task *asynq.Task)
 	return nil
 }
 
-func (l *ActivateOrderLogic) recordPromoUsage(ctx context.Context, orderInfo *order.Order) {
-	if orderInfo == nil || orderInfo.PromoRuleId <= 0 || orderInfo.Quantity <= 0 || orderInfo.SubscribeId <= 0 || orderInfo.OrderNo == "" {
-		return
-	}
-
-	promoPrice := int64(0)
-	if orderInfo.Price > orderInfo.PromoDiscount {
-		promoPrice = (orderInfo.Price - orderInfo.PromoDiscount) / orderInfo.Quantity
-	}
-	if promoPrice <= 0 {
-		return
-	}
-
-	err := l.svc.DB.WithContext(ctx).Transaction(func(tx *gorm.DB) error {
-		var count int64
-		if e := tx.Model(&promo.Usage{}).Where("order_no = ?", orderInfo.OrderNo).Count(&count).Error; e != nil {
-			return e
-		}
-		if count > 0 {
-			return nil
-		}
-		return l.svc.PromoModel.InsertUsage(ctx, &promo.Usage{
-			UserId:      orderInfo.UserId,
-			PromoRuleId: orderInfo.PromoRuleId,
-			SubscribeId: orderInfo.SubscribeId,
-			OrderNo:     orderInfo.OrderNo,
-			PromoPrice:  promoPrice,
-		}, tx)
-	})
-	if err != nil {
-		logger.WithContext(ctx).Error("Insert promo usage failed",
-			logger.Field("error", err.Error()),
-			logger.Field("order_no", orderInfo.OrderNo),
-			logger.Field("promo_rule_id", orderInfo.PromoRuleId),
-		)
-	}
-}
-
 // parsePayload unMarshals the task payload into a structured format
 func (l *ActivateOrderLogic) parsePayload(ctx context.Context, payload []byte) (*queueTypes.ForthwithActivateOrderPayload, error) {
 	var p queueTypes.ForthwithActivateOrderPayload

scripts/convert_recovery_orders/main.go

@@ -1,5 +1,3 @@
-//go:build ignore
-
 package main
 
 import (

scripts/doc.go

@@ -1,3 +0,0 @@
-// Package scripts keeps standalone maintenance tools out of normal package
-// builds. Run individual tools with go run scripts/<tool>.go.
-package scripts

scripts/reconcile_mihapay_orders/main.go

@@ -1,5 +1,3 @@
-//go:build ignore
-
 package main
 
 import (