修复(#79): 合并最新internal迁移

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

apis/admin/promo.api

@@ -37,8 +37,8 @@ type (
 		Id int64 `uri:"id" validate:"required,gt=0"`
 	}
 	GetPromoRuleListRequest {
-		Page    int64  `form:"page" validate:"required,gt=0"`
-		Size    int64  `form:"size" validate:"required,gt=0,lte=200"`
+		Page    int64  `form:"page" validate:"required"`
+		Size    int64  `form:"size" validate:"required"`
 		Type    string `form:"type" validate:"omitempty,oneof=new_user inactive_user campaign"`
 		Enabled *bool  `form:"enabled"`
 		Search  string `form:"search,omitempty"`
@@ -49,12 +49,12 @@ type (
 	}
 	SetPromoPriceRequest {
 		PromoRuleId int64            `json:"promo_rule_id" validate:"required,gt=0"`
-		Items       []PromoPriceItem `json:"items" validate:"required,min=1,dive"`
+		Items       []PromoPriceItem `json:"items" validate:"required,dive"`
 	}
 	GetPromoPriceListRequest {
 		PromoRuleId int64 `form:"promo_rule_id" validate:"required,gt=0"`
-		Page        int64 `form:"page" validate:"required,gt=0"`
-		Size        int64 `form:"size" validate:"required,gt=0,lte=200"`
+		Page        int64 `form:"page" validate:"required"`
+		Size        int64 `form:"size" validate:"required"`
 	}
 	GetPromoPriceListResponse {
 		Total int64        `json:"total"`
@@ -64,8 +64,8 @@ type (
 		Id int64 `uri:"id" validate:"required,gt=0"`
 	}
 	GetPromoUsageListRequest {
-		Page        int64  `form:"page" validate:"required,gt=0"`
-		Size        int64  `form:"size" validate:"required,gt=0,lte=200"`
+		Page        int64  `form:"page" validate:"required"`
+		Size        int64  `form:"size" validate:"required"`
 		RuleId      int64  `form:"rule_id,omitempty"`
 		UserId      int64  `form:"user_id,omitempty"`
 		SubscribeId int64  `form:"subscribe_id,omitempty"`

apis/admin/user.api

@@ -149,7 +149,7 @@ type (
 		ExpiredAt       int64   `json:"expired_at"`
 		Upload          int64   `json:"upload"`
 		Download        int64   `json:"download"`
-		SpeedLimit      *int64  `json:"speed_limit,omitempty" validate:"omitempty,gte=0"`
+		SpeedLimit      *int64  `json:"speed_limit,omitempty"`
 		TrafficLimit    *string `json:"traffic_limit,omitempty"`
 	}
 	GetUserLoginLogsRequest {

apis/public/user.api

@@ -201,22 +201,21 @@ type (
 		GrowthRate     string `json:"growth_rate"`
 		PaidGrowthRate string `json:"paid_growth_rate"`
 	}
-	GetInviteRecordsRequest {
+	GetInviteSalesRequest {
 		Page      int   `form:"page"`
 		Size      int   `form:"size"`
 		StartTime int64 `form:"start_time"`
 		EndTime   int64 `form:"end_time"`
 	}
-	InviteRecord {
-		Role      string `json:"role"`
-		PeerHash  string `json:"peer_hash"`
-		GiftDays  int64  `json:"gift_days"`
-		OrderNo   string `json:"order_no"`
-		CreatedAt int64  `json:"created_at"`
+	InvitedUserSale {
+		Amount      float64 `json:"amount"`
+		UpdatedAt   int64   `json:"updated_at"`
+		UserHash    string  `json:"user_hash"`
+		ProductName string  `json:"product_name"`
 	}
-	GetInviteRecordsResponse {
-		Total int64          `json:"total"`
-		List  []InviteRecord `json:"list"`
+	GetInviteSalesResponse {
+		Total int64             `json:"total"`
+		List  []InvitedUserSale `json:"list"`
 	}
 	GetSubscribeStatusRequest {
 		Email string `form:"email" json:"email" validate:"omitempty,email"`
@@ -398,9 +397,9 @@ service ppanel {
 	@handler GetAgentRealtime
 	get /agent_realtime (GetAgentRealtimeRequest) returns (GetAgentRealtimeResponse)
 
-	@doc "Get Invite Records"
-	@handler GetInviteRecords
-	get /invite_records (GetInviteRecordsRequest) returns (GetInviteRecordsResponse)
+	@doc "Get Invite Sales"
+	@handler GetInviteSales
+	get /invite_sales (GetInviteSalesRequest) returns (GetInviteSalesResponse)
 
 	@doc "Get Subscribe Status"
 	@handler GetSubscribeStatus
@@ -425,3 +424,4 @@ service ppanel {
 	@handler DeviceWsConnect
 	get /device_ws_connect
 }
+

apis/types.api

@@ -229,7 +229,6 @@ type (
 		Quantity int64   `json:"quantity"`
 		Discount float64 `json:"discount"`
 		MapApple string  `json:"map_apple"`
-		Promo    *SubscribePromo `json:"promo"`
 	}
 	PromoPrice {
 		Id          int64 `json:"id"`
@@ -286,6 +285,7 @@ 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"`

common.json

@@ -4316,9 +4316,6 @@
         "discount": {
           "type": "number",
           "format": "double"
-        },
-        "promo": {
-          "$ref": "#/definitions/SubscribePromo"
         }
       },
       "title": "SubscribeDiscount",

doc/tapi-file-upload-zh.md

@@ -128,10 +128,6 @@ curl -X PUT 'https://bucket.s3.ap-east-1.amazonaws.com/...' \
 说明：
 
 - `Content-Type` 需和 `init` 返回的 `headers.Content-Type` 一致
-- 允许的 `Content-Type` 由服务端 `S3.AllowedContentTypes` 配置控制，默认包含：
-  - 压缩包：`application/zip`、`application/x-zip-compressed`、`application/gzip`、`application/x-gzip`
-  - 通用文件：`application/octet-stream`、`text/plain`、`application/json`
-  - 图片：`image/jpeg`、`image/jpg`、`image/png`、`image/webp`、`image/gif`、`image/heic`、`image/heif`、`image/bmp`
 - `upload_url` 有过期时间，通常 300 秒
 - 成功时 S3 常见返回 `200` 或 `204`
 
@@ -168,13 +164,11 @@ curl -X POST 'https://tapi.hifast.biz/v1/public/file/upload/complete' \
 - 如果请求带了 `X-App-Id`，就按现有逻辑验签
 - 如果没有 `X-App-Id`，仍按旧逻辑放行
 - 如果要给该接口加签，签名时必须对原始 multipart body 计算 `BODY_SHA256`
-- 允许的 `Content-Type` 与预签名三段式一致；multipart 文件字段未显式携带 `Content-Type` 时，服务端会基于文件内容嗅探常见类型。
 
 ## 常见错误码
 
 - `200`: 成功
 - `400`: 参数错误
-- `400 content_type is not allowed`: 文件 `Content-Type` 不在 `S3.AllowedContentTypes` 白名单内
 - `40008`: 缺少签名头
 - `40009`: 签名已过期
 - `40010`: 签名无效

etc/ppanel.yaml

@@ -74,7 +74,7 @@ S3:
   UsePathStyle: false
   PresignExpireSeconds: 300
   MaxUploadSize: 104857600
-  AllowedContentTypes: "application/zip,application/x-zip-compressed,application/gzip,application/x-gzip,application/octet-stream,text/plain,application/json,image/jpeg,image/jpg,image/png,image/webp,image/gif,image/heic,image/heif,image/bmp"
+  AllowedContentTypes: "application/zip,application/x-zip-compressed,application/gzip,application/x-gzip,application/octet-stream,text/plain,application/json"
 
 device:
   enable: true # 开启设备加密通信

go.mod

@@ -53,7 +53,6 @@ require (
 )
 
 require (
-	github.com/DATA-DOG/go-sqlmock v1.5.2
 	github.com/Masterminds/sprig/v3 v3.3.0
 	github.com/aws/aws-sdk-go-v2 v1.41.7
 	github.com/aws/aws-sdk-go-v2/config v1.32.17

go.sum

@@ -8,8 +8,6 @@ filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4
 github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 h1:L/gRVlceqvL25UVaW/CKtUDjefjrs0SPonmDGUVOYP0=
 github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
-github.com/DATA-DOG/go-sqlmock v1.5.2 h1:OcvFkGmslmlZibjAjaHm3L//6LiuBgolP7OputlJIzU=
-github.com/DATA-DOG/go-sqlmock v1.5.2/go.mod h1:88MAG/4G7SMwSE3CeA0ZKzrT5CiOU3OJ+JlNzwDqpNU=
 github.com/GUAIK-ORG/go-snowflake v0.0.0-20200116064823-220c4260e85f h1:RDkg3pyE1qGbBpRWmvSN9RNZC5nUrOaEPiEpEb8y2f0=
 github.com/GUAIK-ORG/go-snowflake v0.0.0-20200116064823-220c4260e85f/go.mod h1:zA7AF9RTfpluCfz0omI4t5KCMaWHUMicsZoMccnaT44=
 github.com/Masterminds/goutils v1.1.1 h1:5nUrii3FMTL5diU80unEVvNevw1nH4+ZV4DSLVJLSYI=
@@ -266,7 +264,6 @@ github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/
 github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
 github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
 github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
-github.com/kisielk/sqlstruct v0.0.0-20201105191214-5f3e10d3ab46/go.mod h1:yyMNCyc/Ib3bDTKd379tNMpB/7/H5TjM2Y9QJ5THLbE=
 github.com/klauspost/compress v1.17.7 h1:ehO88t2UGzQK66LMdE8tibEd1ErmzZjNEqWkjLAKQQg=
 github.com/klauspost/compress v1.17.7/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw=
 github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=

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

@@ -1,35 +1,5 @@
-SET @traffic_limit_exists = (
-  SELECT COUNT(*)
-  FROM INFORMATION_SCHEMA.COLUMNS
-  WHERE TABLE_SCHEMA = DATABASE()
-    AND TABLE_NAME = 'user_subscribe'
-    AND COLUMN_NAME = 'traffic_limit'
-);
+-- Purpose: Rollback user-level speed limit overrides from user_subscribe
 
-SET @traffic_limit_sql = IF(
-  @traffic_limit_exists = 1,
-  'ALTER TABLE `user_subscribe` DROP COLUMN `traffic_limit`',
-  'SELECT 1'
-);
-
-PREPARE traffic_limit_stmt FROM @traffic_limit_sql;
-EXECUTE traffic_limit_stmt;
-DEALLOCATE PREPARE traffic_limit_stmt;
-
-SET @speed_limit_exists = (
-  SELECT COUNT(*)
-  FROM INFORMATION_SCHEMA.COLUMNS
-  WHERE TABLE_SCHEMA = DATABASE()
-    AND TABLE_NAME = 'user_subscribe'
-    AND COLUMN_NAME = 'speed_limit'
-);
-
-SET @speed_limit_sql = IF(
-  @speed_limit_exists = 1,
-  'ALTER TABLE `user_subscribe` DROP COLUMN `speed_limit`',
-  'SELECT 1'
-);
-
-PREPARE speed_limit_stmt FROM @speed_limit_sql;
-EXECUTE speed_limit_stmt;
-DEALLOCATE PREPARE speed_limit_stmt;
+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,4 +1,6 @@
-SET @speed_limit_exists = (
+-- Purpose: Add user-level speed limit overrides to user_subscribe
+
+SET @column_exists = (
   SELECT COUNT(*)
   FROM INFORMATION_SCHEMA.COLUMNS
   WHERE TABLE_SCHEMA = DATABASE()
@@ -6,17 +8,17 @@ SET @speed_limit_exists = (
     AND COLUMN_NAME = 'speed_limit'
 );
 
-SET @speed_limit_sql = IF(
-  @speed_limit_exists = 0,
-  'ALTER TABLE `user_subscribe` ADD COLUMN `speed_limit` BIGINT NOT NULL DEFAULT 0 COMMENT ''User-level speed limit override (Mbps), 0 uses plan-level'' AFTER `upload`',
-  'SELECT 1'
+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 speed_limit_stmt FROM @speed_limit_sql;
-EXECUTE speed_limit_stmt;
-DEALLOCATE PREPARE speed_limit_stmt;
+PREPARE stmt FROM @sql;
+EXECUTE stmt;
+DEALLOCATE PREPARE stmt;
 
-SET @traffic_limit_exists = (
+SET @column_exists = (
   SELECT COUNT(*)
   FROM INFORMATION_SCHEMA.COLUMNS
   WHERE TABLE_SCHEMA = DATABASE()
@@ -24,12 +26,12 @@ SET @traffic_limit_exists = (
     AND COLUMN_NAME = 'traffic_limit'
 );
 
-SET @traffic_limit_sql = IF(
-  @traffic_limit_exists = 0,
-  'ALTER TABLE `user_subscribe` ADD COLUMN `traffic_limit` TEXT DEFAULT NULL COMMENT ''User-level traffic limit override (JSON), NULL uses plan-level'' AFTER `speed_limit`',
-  'SELECT 1'
+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 traffic_limit_stmt FROM @traffic_limit_sql;
-EXECUTE traffic_limit_stmt;
-DEALLOCATE PREPARE traffic_limit_stmt;
+PREPARE stmt FROM @sql;
+EXECUTE stmt;
+DEALLOCATE PREPARE stmt;

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

@@ -14,155 +14,19 @@ CREATE TABLE IF NOT EXISTS `promo_rule` (
   KEY `idx_enabled_priority_deleted` (`enabled`, `deleted_at`, `priority` DESC)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='促销规则表';
 
-SET @index_exists = (
-  SELECT COUNT(*)
-  FROM INFORMATION_SCHEMA.STATISTICS
-  WHERE TABLE_SCHEMA = DATABASE()
-    AND TABLE_NAME = 'promo_rule'
-    AND INDEX_NAME = 'idx_enabled_priority'
-);
-
-SET @sql = IF(
-  @index_exists = 1,
-  'ALTER TABLE `promo_rule` DROP INDEX `idx_enabled_priority`',
-  'SELECT ''Index idx_enabled_priority does not exist on promo_rule table'''
-);
-
-PREPARE stmt FROM @sql;
-EXECUTE stmt;
-DEALLOCATE PREPARE stmt;
-
-SET @index_exists = (
-  SELECT COUNT(*)
-  FROM INFORMATION_SCHEMA.STATISTICS
-  WHERE TABLE_SCHEMA = DATABASE()
-    AND TABLE_NAME = 'promo_rule'
-    AND INDEX_NAME = 'idx_deleted_at'
-);
-
-SET @sql = IF(
-  @index_exists = 1,
-  'ALTER TABLE `promo_rule` DROP INDEX `idx_deleted_at`',
-  'SELECT ''Index idx_deleted_at does not exist on promo_rule table'''
-);
-
-PREPARE stmt FROM @sql;
-EXECUTE stmt;
-DEALLOCATE PREPARE stmt;
-
-SET @index_exists = (
-  SELECT COUNT(*)
-  FROM INFORMATION_SCHEMA.STATISTICS
-  WHERE TABLE_SCHEMA = DATABASE()
-    AND TABLE_NAME = 'promo_rule'
-    AND INDEX_NAME = 'idx_enabled_priority_deleted'
-);
-
-SET @sql = IF(
-  @index_exists = 0,
-  'ALTER TABLE `promo_rule` ADD KEY `idx_enabled_priority_deleted` (`enabled`, `deleted_at`, `priority` DESC)',
-  'SELECT ''Index idx_enabled_priority_deleted already exists on promo_rule table'''
-);
-
-PREPARE stmt FROM @sql;
-EXECUTE stmt;
-DEALLOCATE PREPARE stmt;
-
 CREATE TABLE IF NOT EXISTS `subscribe_promo` (
   `id` BIGINT UNSIGNED NOT NULL AUTO_INCREMENT,
   `subscribe_id` BIGINT UNSIGNED NOT NULL COMMENT '套餐规格 ID',
-  `quantity` BIGINT NOT NULL DEFAULT 1 COMMENT '购买数量',
+  `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_quantity_rule` (`subscribe_id`, `quantity`, `promo_rule_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='规格促销价表';
 
-SET @column_exists = (
-  SELECT COUNT(*)
-  FROM INFORMATION_SCHEMA.COLUMNS
-  WHERE TABLE_SCHEMA = DATABASE()
-    AND TABLE_NAME = 'subscribe_promo'
-    AND COLUMN_NAME = 'quantity'
-);
-
-SET @sql = IF(
-  @column_exists = 0,
-  'ALTER TABLE `subscribe_promo` ADD COLUMN `quantity` BIGINT NOT NULL DEFAULT 1 COMMENT ''购买数量'' AFTER `subscribe_id`',
-  'SELECT ''Column quantity already exists in subscribe_promo table'''
-);
-
-PREPARE stmt FROM @sql;
-EXECUTE stmt;
-DEALLOCATE PREPARE stmt;
-
-SET @sql = IF(
-  @column_exists = 1,
-  'ALTER TABLE `subscribe_promo` MODIFY COLUMN `quantity` BIGINT NOT NULL DEFAULT 1 COMMENT ''购买数量''',
-  'SELECT ''Column quantity does not exist in subscribe_promo table'''
-);
-
-PREPARE stmt FROM @sql;
-EXECUTE stmt;
-DEALLOCATE PREPARE stmt;
-
-SET @index_exists = (
-  SELECT COUNT(*)
-  FROM INFORMATION_SCHEMA.STATISTICS
-  WHERE TABLE_SCHEMA = DATABASE()
-    AND TABLE_NAME = 'subscribe_promo'
-    AND INDEX_NAME = 'uk_subscribe_rule'
-);
-
-SET @sql = IF(
-  @index_exists = 1,
-  'ALTER TABLE `subscribe_promo` DROP INDEX `uk_subscribe_rule`',
-  'SELECT ''Index uk_subscribe_rule does not exist on subscribe_promo table'''
-);
-
-PREPARE stmt FROM @sql;
-EXECUTE stmt;
-DEALLOCATE PREPARE stmt;
-
-SET @index_exists = (
-  SELECT COUNT(*)
-  FROM INFORMATION_SCHEMA.STATISTICS
-  WHERE TABLE_SCHEMA = DATABASE()
-    AND TABLE_NAME = 'subscribe_promo'
-    AND INDEX_NAME = 'uk_subscribe_qty_rule'
-);
-
-SET @sql = IF(
-  @index_exists = 1,
-  'ALTER TABLE `subscribe_promo` DROP INDEX `uk_subscribe_qty_rule`',
-  'SELECT ''Index uk_subscribe_qty_rule does not exist on subscribe_promo table'''
-);
-
-PREPARE stmt FROM @sql;
-EXECUTE stmt;
-DEALLOCATE PREPARE stmt;
-
-SET @index_exists = (
-  SELECT COUNT(*)
-  FROM INFORMATION_SCHEMA.STATISTICS
-  WHERE TABLE_SCHEMA = DATABASE()
-    AND TABLE_NAME = 'subscribe_promo'
-    AND INDEX_NAME = 'uk_subscribe_quantity_rule'
-);
-
-SET @sql = IF(
-  @index_exists = 0,
-  'ALTER TABLE `subscribe_promo` ADD UNIQUE KEY `uk_subscribe_quantity_rule` (`subscribe_id`, `quantity`, `promo_rule_id`)',
-  'SELECT ''Index uk_subscribe_quantity_rule already exists on subscribe_promo table'''
-);
-
-PREPARE stmt FROM @sql;
-EXECUTE stmt;
-DEALLOCATE PREPARE stmt;
-
 CREATE TABLE IF NOT EXISTS `promo_usage` (
   `id` BIGINT UNSIGNED NOT NULL AUTO_INCREMENT,
   `user_id` BIGINT UNSIGNED NOT NULL COMMENT '用户 ID',

internal/config/config.go

@@ -58,7 +58,7 @@ type S3Config struct {
 	UsePathStyle         bool   `yaml:"UsePathStyle" default:"false"`
 	PresignExpireSeconds int64  `yaml:"PresignExpireSeconds" default:"300"`
 	MaxUploadSize        int64  `yaml:"MaxUploadSize" default:"104857600"`
-	AllowedContentTypes  string `yaml:"AllowedContentTypes" default:"application/zip,application/x-zip-compressed,application/gzip,application/x-gzip,application/octet-stream,text/plain,application/json,image/jpeg,image/jpg,image/png,image/webp,image/gif,image/heic,image/heif,image/bmp"`
+	AllowedContentTypes  string `yaml:"AllowedContentTypes" default:"application/zip,application/x-zip-compressed,application/gzip,application/x-gzip,application/octet-stream,text/plain,application/json"`
 }
 
 type RedisConfig struct {

internal/handler/admin/invite/getInviteManageListHandler.go

@@ -1,25 +0,0 @@
-package invite
-
-import (
-	"github.com/gin-gonic/gin"
-	"github.com/perfect-panel/server/internal/logic/admin/invite"
-	"github.com/perfect-panel/server/internal/svc"
-	"github.com/perfect-panel/server/internal/types"
-	"github.com/perfect-panel/server/pkg/result"
-)
-
-// Get invite manage list
-func GetInviteManageListHandler(svcCtx *svc.ServiceContext) func(c *gin.Context) {
-	return func(c *gin.Context) {
-		var req types.GetInviteManageListRequest
-		_ = c.ShouldBind(&req)
-		if err := svcCtx.Validate(&req); err != nil {
-			result.ParamErrorResult(c, err)
-			return
-		}
-
-		l := invite.NewGetInviteManageListLogic(c.Request.Context(), svcCtx)
-		resp, err := l.GetInviteManageList(&req)
-		result.HttpResult(c, resp, err)
-	}
-}

internal/handler/admin/user/updateUserSubscribeHandler.go

@@ -1,9 +1,6 @@
 package user
 
 import (
-	"encoding/json"
-	"errors"
-
 	"github.com/gin-gonic/gin"
 	"github.com/perfect-panel/server/internal/logic/admin/user"
 	"github.com/perfect-panel/server/internal/svc"
@@ -21,25 +18,9 @@ func UpdateUserSubscribeHandler(svcCtx *svc.ServiceContext) func(c *gin.Context)
 			result.ParamErrorResult(c, validateErr)
 			return
 		}
-		if err := validateUpdateUserSubscribeTrafficLimit(&req); err != nil {
-			result.ParamErrorResult(c, err)
-			return
-		}
 
 		l := user.NewUpdateUserSubscribeLogic(c.Request.Context(), svcCtx)
 		err := l.UpdateUserSubscribe(&req)
 		result.HttpResult(c, nil, err)
 	}
 }
-
-func validateUpdateUserSubscribeTrafficLimit(req *types.UpdateUserSubscribeRequest) error {
-	if req.TrafficLimit == nil || *req.TrafficLimit == "" {
-		return nil
-	}
-
-	var rules []types.TrafficLimit
-	if err := json.Unmarshal([]byte(*req.TrafficLimit), &rules); err != nil {
-		return errors.New("traffic_limit must be a valid JSON array")
-	}
-	return nil
-}

internal/handler/admin/user/updateUserSubscribeHandler_test.go

@@ -1,59 +0,0 @@
-package user
-
-import (
-	"bytes"
-	"encoding/json"
-	"net/http"
-	"net/http/httptest"
-	"testing"
-
-	"github.com/gin-gonic/gin"
-	"github.com/perfect-panel/server/internal/svc"
-	"github.com/perfect-panel/server/pkg/xerr"
-)
-
-func TestUpdateUserSubscribeHandlerRejectsInvalidLimits(t *testing.T) {
-	gin.SetMode(gin.TestMode)
-
-	tests := []struct {
-		name string
-		body string
-	}{
-		{
-			name: "negative speed limit",
-			body: `{"user_subscribe_id":1,"subscribe_id":1,"traffic":0,"expired_at":4102444800000,"upload":0,"download":0,"speed_limit":-1}`,
-		},
-		{
-			name: "invalid traffic limit json",
-			body: `{"user_subscribe_id":1,"subscribe_id":1,"traffic":0,"expired_at":4102444800000,"upload":0,"download":0,"traffic_limit":"not-json"}`,
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			router := gin.New()
-			router.PUT("/v1/admin/user/subscribe", UpdateUserSubscribeHandler(&svc.ServiceContext{}))
-
-			req := httptest.NewRequest(http.MethodPut, "/v1/admin/user/subscribe", bytes.NewBufferString(tt.body))
-			req.Header.Set("Content-Type", "application/json")
-			rec := httptest.NewRecorder()
-
-			router.ServeHTTP(rec, req)
-
-			if rec.Code != http.StatusOK {
-				t.Fatalf("expected HTTP 200, got %d", rec.Code)
-			}
-
-			var resp struct {
-				Code uint32 `json:"code"`
-				Msg  string `json:"msg"`
-			}
-			if err := json.Unmarshal(rec.Body.Bytes(), &resp); err != nil {
-				t.Fatalf("unmarshal response: %v", err)
-			}
-			if resp.Code != xerr.InvalidParams {
-				t.Fatalf("expected code %d, got %d (%s)", xerr.InvalidParams, resp.Code, resp.Msg)
-			}
-		})
-	}
-}

internal/handler/public/user/getInviteSalesHandler.go

@@ -8,10 +8,10 @@ import (
 	"github.com/perfect-panel/server/pkg/result"
 )
 
-// Get invite gift records
-func GetInviteRecordsHandler(svcCtx *svc.ServiceContext) func(c *gin.Context) {
+// Get invite sales data
+func GetInviteSalesHandler(svcCtx *svc.ServiceContext) func(c *gin.Context) {
 	return func(c *gin.Context) {
-		var req types.GetInviteRecordsRequest
+		var req types.GetInviteSalesRequest
 		if err := c.ShouldBind(&req); err != nil {
 			result.ParamErrorResult(c, err)
 			return
@@ -23,8 +23,8 @@ func GetInviteRecordsHandler(svcCtx *svc.ServiceContext) func(c *gin.Context) {
 			return
 		}
 
-		l := user.NewGetInviteRecordsLogic(c.Request.Context(), svcCtx)
-		resp, err := l.GetInviteRecords(&req)
+		l := user.NewGetInviteSalesLogic(c.Request.Context(), svcCtx)
+		resp, err := l.GetInviteSales(&req)
 		result.HttpResult(c, resp, err)
 	}
 }

internal/handler/routes.go

@@ -13,7 +13,6 @@ import (
 	adminCoupon "github.com/perfect-panel/server/internal/handler/admin/coupon"
 	adminDocument "github.com/perfect-panel/server/internal/handler/admin/document"
 	adminGroup "github.com/perfect-panel/server/internal/handler/admin/group"
-	adminInvite "github.com/perfect-panel/server/internal/handler/admin/invite"
 	adminLog "github.com/perfect-panel/server/internal/handler/admin/log"
 	adminMarketing "github.com/perfect-panel/server/internal/handler/admin/marketing"
 	adminOrder "github.com/perfect-panel/server/internal/handler/admin/order"
@@ -195,14 +194,6 @@ func RegisterHandlers(router *gin.Engine, serverCtx *svc.ServiceContext) {
 		adminDocumentGroupRouter.GET("/list", adminDocument.GetDocumentListHandler(serverCtx))
 	}
 
-	adminInviteGroupRouter := router.Group("/v1/admin/invite")
-	adminInviteGroupRouter.Use(middleware.AuthMiddleware(serverCtx))
-
-	{
-		// Get invite manage list
-		adminInviteGroupRouter.GET("/list", adminInvite.GetInviteManageListHandler(serverCtx))
-	}
-
 	adminGroupGroupRouter := router.Group("/v1/admin/group")
 	adminGroupGroupRouter.Use(middleware.AuthMiddleware(serverCtx))
 
@@ -1118,8 +1109,9 @@ func RegisterHandlers(router *gin.Engine, serverCtx *svc.ServiceContext) {
 		// Query User Info
 		publicUserGroupRouter.GET("/info", publicUser.QueryUserInfoHandler(serverCtx))
 
-		// Get Invite Records
-		publicUserGroupRouter.GET("/invite_records", publicUser.GetInviteRecordsHandler(serverCtx))
+		// Get Invite Sales
+		publicUserGroupRouter.GET("/invite_sales", publicUser.GetInviteSalesHandler(serverCtx))
+		publicUserGroupRouter.GET("/invite/sales", publicUser.GetInviteSalesHandler(serverCtx)) // alias: backward-compat
 
 		// Get User Invite Stats
 		publicUserGroupRouter.GET("/invite_stats", publicUser.GetUserInviteStatsHandler(serverCtx))

internal/logic/admin/invite/benefits.go

@@ -1,203 +0,0 @@
-package invite
-
-import (
-	"context"
-
-	modellog "github.com/perfect-panel/server/internal/model/log"
-	"github.com/perfect-panel/server/pkg/xerr"
-	"github.com/pkg/errors"
-	"gorm.io/gorm"
-)
-
-type Benefits struct {
-	OrderCount        int64
-	HasPurchased      bool
-	InviterCommission int64
-	InviterGiftDays   int64
-	InviteeGiftDays   int64
-}
-
-type InviteRelation struct {
-	InviteeId int64
-	InviterId int64
-}
-
-type paidOrderRow struct {
-	UserId  int64  `gorm:"column:user_id"`
-	OrderNo string `gorm:"column:order_no"`
-}
-
-type systemLogRow struct {
-	ObjectID int64  `gorm:"column:object_id"`
-	Content  string `gorm:"column:content"`
-}
-
-func NormalizePage(page, size int) (int, int) {
-	if page < 1 {
-		page = 1
-	}
-	if size < 1 {
-		size = 10
-	}
-	if size > 100 {
-		size = 100
-	}
-	return page, size
-}
-
-func QueryBenefits(ctx context.Context, db *gorm.DB, relations []InviteRelation) (map[int64]Benefits, error) {
-	result := make(map[int64]Benefits, len(relations))
-	if len(relations) == 0 {
-		return result, nil
-	}
-
-	inviteeIds := make([]int64, 0, len(relations))
-	inviteeToInviter := make(map[int64]int64, len(relations))
-	for _, relation := range relations {
-		inviteeIds = append(inviteeIds, relation.InviteeId)
-		inviteeToInviter[relation.InviteeId] = relation.InviterId
-		result[relation.InviteeId] = Benefits{}
-	}
-
-	var orderCounts []struct {
-		UserId int64 `gorm:"column:user_id"`
-		Cnt    int64 `gorm:"column:cnt"`
-	}
-	if err := db.WithContext(ctx).
-		Table("`order`").
-		Select("user_id, COUNT(*) as cnt").
-		Where("user_id IN ? AND status IN ?", inviteeIds, []int{2, 5}).
-		Group("user_id").
-		Scan(&orderCounts).Error; err != nil {
-		return nil, errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), "count invitee paid orders failed: %v", err)
-	}
-	for _, row := range orderCounts {
-		benefit := result[row.UserId]
-		benefit.OrderCount = row.Cnt
-		benefit.HasPurchased = row.Cnt > 0
-		result[row.UserId] = benefit
-	}
-
-	var paidOrders []paidOrderRow
-	if err := db.WithContext(ctx).
-		Table("`order`").
-		Select("user_id, order_no").
-		Where("user_id IN ? AND status IN ?", inviteeIds, []int{2, 5}).
-		Scan(&paidOrders).Error; err != nil {
-		return nil, errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), "query invitee paid orders failed: %v", err)
-	}
-	if len(paidOrders) == 0 {
-		return result, nil
-	}
-
-	orderNos := make([]string, 0, len(paidOrders))
-	orderToInvitee := make(map[string]int64, len(paidOrders))
-	inviterIds := make([]int64, 0, len(relations))
-	inviteeAndInviterSet := make(map[int64]struct{}, len(relations)*2)
-	for _, order := range paidOrders {
-		orderNos = append(orderNos, order.OrderNo)
-		orderToInvitee[order.OrderNo] = order.UserId
-	}
-	for _, relation := range relations {
-		inviterIds = append(inviterIds, relation.InviterId)
-		inviteeAndInviterSet[relation.InviteeId] = struct{}{}
-		inviteeAndInviterSet[relation.InviterId] = struct{}{}
-	}
-	inviteeAndInviterIds := make([]int64, 0, len(inviteeAndInviterSet))
-	for userId := range inviteeAndInviterSet {
-		inviteeAndInviterIds = append(inviteeAndInviterIds, userId)
-	}
-
-	if err := fillCommissionBenefits(ctx, db, result, orderToInvitee, inviteeToInviter, orderNos, inviterIds); err != nil {
-		return nil, err
-	}
-	if err := fillGiftBenefits(ctx, db, result, orderToInvitee, inviteeToInviter, orderNos, inviteeAndInviterIds); err != nil {
-		return nil, err
-	}
-
-	return result, nil
-}
-
-func fillCommissionBenefits(ctx context.Context, db *gorm.DB, benefits map[int64]Benefits, orderToInvitee map[string]int64, inviteeToInviter map[int64]int64, orderNos []string, inviterIds []int64) error {
-	var rows []systemLogRow
-	if err := db.WithContext(ctx).
-		Table("system_logs").
-		Select("object_id, content").
-		Where("type = ? AND object_id IN ? AND JSON_UNQUOTE(JSON_EXTRACT(content, '$.order_no')) IN ? AND JSON_EXTRACT(content, '$.type') IN ?", modellog.TypeCommission.Uint8(), inviterIds, orderNos, []int{int(modellog.CommissionTypePurchase), int(modellog.CommissionTypeRenewal)}).
-		Scan(&rows).Error; err != nil {
-		return errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), "query invite commission logs failed: %v", err)
-	}
-	for _, row := range rows {
-		content := modellog.Commission{}
-		if err := content.Unmarshal([]byte(row.Content)); err != nil {
-			continue
-		}
-		inviteeId, ok := orderToInvitee[content.OrderNo]
-		if !ok || inviteeToInviter[inviteeId] != row.ObjectID {
-			continue
-		}
-		benefit := benefits[inviteeId]
-		benefit.InviterCommission += content.Amount
-		benefits[inviteeId] = benefit
-	}
-	return nil
-}
-
-func fillGiftBenefits(ctx context.Context, db *gorm.DB, benefits map[int64]Benefits, orderToInvitee map[string]int64, inviteeToInviter map[int64]int64, orderNos []string, userIds []int64) error {
-	var rows []systemLogRow
-	if err := db.WithContext(ctx).
-		Table("system_logs").
-		Select("object_id, content").
-		Where("type = ? AND object_id IN ? AND JSON_UNQUOTE(JSON_EXTRACT(content, '$.order_no')) IN ?", modellog.TypeGift.Uint8(), userIds, orderNos).
-		Scan(&rows).Error; err != nil {
-		return errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), "query invite gift logs failed: %v", err)
-	}
-	for _, row := range rows {
-		content := modellog.Gift{}
-		if err := content.Unmarshal([]byte(row.Content)); err != nil {
-			continue
-		}
-		if content.Type != modellog.GiftTypeIncrease {
-			continue
-		}
-		inviteeId, ok := orderToInvitee[content.OrderNo]
-		if !ok {
-			continue
-		}
-		benefit := benefits[inviteeId]
-		switch row.ObjectID {
-		case inviteeToInviter[inviteeId]:
-			benefit.InviterGiftDays += content.Amount
-		case inviteeId:
-			benefit.InviteeGiftDays += content.Amount
-		default:
-			continue
-		}
-		benefits[inviteeId] = benefit
-	}
-	return nil
-}
-
-func QueryIdentifiers(ctx context.Context, db *gorm.DB, userIds []int64) (map[int64]string, error) {
-	identifiers := make(map[int64]string, len(userIds))
-	if len(userIds) == 0 {
-		return identifiers, nil
-	}
-
-	type identifierRow struct {
-		UserId     int64  `gorm:"column:user_id"`
-		Identifier string `gorm:"column:identifier"`
-	}
-	var rows []identifierRow
-	if err := db.WithContext(ctx).
-		Table("user_auth_methods uam").
-		Select("uam.user_id, uam.auth_identifier as identifier").
-		Joins("JOIN (SELECT user_id, MIN(id) AS id FROM user_auth_methods WHERE user_id IN ? GROUP BY user_id) first_uam ON first_uam.id = uam.id", userIds).
-		Scan(&rows).Error; err != nil {
-		return nil, errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), "query user identifiers failed: %v", err)
-	}
-	for _, row := range rows {
-		identifiers[row.UserId] = row.Identifier
-	}
-	return identifiers, nil
-}

internal/logic/admin/invite/getInviteManageListLogic.go

@@ -1,117 +0,0 @@
-package invite
-
-import (
-	"context"
-
-	"github.com/perfect-panel/server/internal/svc"
-	"github.com/perfect-panel/server/internal/types"
-	"github.com/perfect-panel/server/pkg/logger"
-	"github.com/perfect-panel/server/pkg/xerr"
-	"github.com/pkg/errors"
-	"gorm.io/gorm"
-)
-
-type GetInviteManageListLogic struct {
-	logger.Logger
-	ctx    context.Context
-	svcCtx *svc.ServiceContext
-}
-
-func NewGetInviteManageListLogic(ctx context.Context, svcCtx *svc.ServiceContext) *GetInviteManageListLogic {
-	return &GetInviteManageListLogic{
-		Logger: logger.WithContext(ctx),
-		ctx:    ctx,
-		svcCtx: svcCtx,
-	}
-}
-
-func (l *GetInviteManageListLogic) GetInviteManageList(req *types.GetInviteManageListRequest) (resp *types.GetInviteManageListResponse, err error) {
-	req.Page, req.Size = NormalizePage(req.Page, req.Size)
-
-	type inviteRow struct {
-		InviteeId     int64  `gorm:"column:invitee_id"`
-		InviteeAvatar string `gorm:"column:invitee_avatar"`
-		InviteeEnable bool   `gorm:"column:invitee_enable"`
-		InvitedAt     int64  `gorm:"column:invited_at"`
-		InviterId     int64  `gorm:"column:inviter_id"`
-	}
-
-	baseQuery := applyInviteManageFilters(l.svcCtx.DB.WithContext(l.ctx).
-		Table("user invitee").
-		Where("invitee.referer_id > 0 AND invitee.deleted_at IS NULL"), req)
-
-	var total int64
-	if err = baseQuery.Count(&total).Error; err != nil {
-		return nil, errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), "count invite manage records failed: %v", err)
-	}
-
-	var rows []inviteRow
-	if err = applyInviteManageFilters(l.svcCtx.DB.WithContext(l.ctx).
-		Table("user invitee").
-		Select("invitee.id as invitee_id, invitee.avatar as invitee_avatar, invitee.enable as invitee_enable, UNIX_TIMESTAMP(invitee.created_at) as invited_at, invitee.referer_id as inviter_id").
-		Where("invitee.referer_id > 0 AND invitee.deleted_at IS NULL"), req).
-		Order("invitee.created_at DESC").
-		Limit(req.Size).
-		Offset((req.Page - 1) * req.Size).
-		Scan(&rows).Error; err != nil {
-		return nil, errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), "query invite manage records failed: %v", err)
-	}
-
-	relations := make([]InviteRelation, 0, len(rows))
-	userIds := make([]int64, 0, len(rows)*2)
-	for _, row := range rows {
-		relations = append(relations, InviteRelation{InviteeId: row.InviteeId, InviterId: row.InviterId})
-		userIds = append(userIds, row.InviteeId, row.InviterId)
-	}
-
-	benefits, err := QueryBenefits(l.ctx, l.svcCtx.DB, relations)
-	if err != nil {
-		return nil, err
-	}
-	identifiers, err := QueryIdentifiers(l.ctx, l.svcCtx.DB, userIds)
-	if err != nil {
-		return nil, err
-	}
-
-	list := make([]types.InviteManageRecord, 0, len(rows))
-	for _, row := range rows {
-		benefit := benefits[row.InviteeId]
-		list = append(list, types.InviteManageRecord{
-			InviterId:         row.InviterId,
-			InviterIdentifier: identifiers[row.InviterId],
-			InviteeId:         row.InviteeId,
-			InviteeIdentifier: identifiers[row.InviteeId],
-			InviteeAvatar:     row.InviteeAvatar,
-			InviteeEnable:     row.InviteeEnable,
-			InvitedAt:         row.InvitedAt,
-			OrderCount:        benefit.OrderCount,
-			HasPurchased:      benefit.HasPurchased,
-			InviterCommission: benefit.InviterCommission,
-			InviterGiftDays:   benefit.InviterGiftDays,
-			InviteeGiftDays:   benefit.InviteeGiftDays,
-		})
-	}
-
-	return &types.GetInviteManageListResponse{
-		Total: total,
-		List:  list,
-	}, nil
-}
-
-func applyInviteManageFilters(db *gorm.DB, req *types.GetInviteManageListRequest) *gorm.DB {
-	if req.InviterId > 0 {
-		db = db.Where("invitee.referer_id = ?", req.InviterId)
-	}
-	if req.InviteeId > 0 {
-		db = db.Where("invitee.id = ?", req.InviteeId)
-	}
-	if req.Search != "" {
-		search := "%" + req.Search + "%"
-		db = db.Where(
-			"(EXISTS (SELECT 1 FROM user_auth_methods inviter_auth WHERE inviter_auth.user_id = invitee.referer_id AND inviter_auth.auth_identifier LIKE ?) OR EXISTS (SELECT 1 FROM user_auth_methods invitee_auth WHERE invitee_auth.user_id = invitee.id AND invitee_auth.auth_identifier LIKE ?))",
-			search,
-			search,
-		)
-	}
-	return db
-}

internal/logic/admin/promo/deletePriceLogic.go

@@ -2,14 +2,12 @@ package promo
 
 import (
 	"context"
-	stderrors "errors"
 
 	"github.com/perfect-panel/server/internal/svc"
 	"github.com/perfect-panel/server/internal/types"
 	"github.com/perfect-panel/server/pkg/logger"
 	"github.com/perfect-panel/server/pkg/xerr"
 	"github.com/pkg/errors"
-	"gorm.io/gorm"
 )
 
 type DeletePriceLogic struct {
@@ -29,10 +27,6 @@ func NewDeletePriceLogic(ctx context.Context, svcCtx *svc.ServiceContext) *Delet
 func (l *DeletePriceLogic) DeletePrice(req *types.DeletePromoPriceRequest) error {
 	price, err := l.svcCtx.PromoModel.FindPrice(l.ctx, req.Id)
 	if err != nil {
-		if stderrors.Is(err, gorm.ErrRecordNotFound) {
-			l.Errorw("[DeletePromoPrice] Price Not Found", logger.Field("id", req.Id))
-			return errors.Wrapf(xerr.NewErrCodeMsg(404, "promo price not found"), "promo price not found: %d", req.Id)
-		}
 		l.Errorw("[DeletePromoPrice] Find Price Error", logger.Field("error", err.Error()))
 		return errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), "find promo price error: %v", err.Error())
 	}

internal/logic/admin/promo/deleteRuleLogic.go

@@ -2,14 +2,12 @@ package promo
 
 import (
 	"context"
-	stderrors "errors"
 
 	"github.com/perfect-panel/server/internal/svc"
 	"github.com/perfect-panel/server/internal/types"
 	"github.com/perfect-panel/server/pkg/logger"
 	"github.com/perfect-panel/server/pkg/xerr"
 	"github.com/pkg/errors"
-	"gorm.io/gorm"
 )
 
 type DeleteRuleLogic struct {
@@ -27,14 +25,6 @@ func NewDeleteRuleLogic(ctx context.Context, svcCtx *svc.ServiceContext) *Delete
 }
 
 func (l *DeleteRuleLogic) DeleteRule(req *types.DeletePromoRuleRequest) error {
-	if _, err := l.svcCtx.PromoModel.FindRule(l.ctx, req.Id); err != nil {
-		if stderrors.Is(err, gorm.ErrRecordNotFound) {
-			l.Errorw("[DeletePromoRule] Rule Not Found", logger.Field("id", req.Id))
-			return errors.Wrapf(xerr.NewErrCodeMsg(404, "promo rule not found"), "promo rule not found: %d", req.Id)
-		}
-		l.Errorw("[DeletePromoRule] Find Rule Error", logger.Field("error", err.Error()))
-		return errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), "find promo rule error: %v", err.Error())
-	}
 	if err := l.svcCtx.PromoModel.DeleteRule(l.ctx, req.Id); err != nil {
 		l.Errorw("[DeletePromoRule] Database Error", logger.Field("error", err.Error()))
 		return errors.Wrapf(xerr.NewErrCode(xerr.DatabaseDeletedError), "delete promo rule error: %v", err.Error())

internal/logic/admin/promo/delete_not_found_test.go

@@ -1,93 +0,0 @@
-package promo
-
-import (
-	"context"
-	"testing"
-
-	promomodel "github.com/perfect-panel/server/internal/model/promo"
-	"github.com/perfect-panel/server/internal/svc"
-	"github.com/perfect-panel/server/internal/types"
-	"github.com/perfect-panel/server/pkg/xerr"
-	pkgerrors "github.com/pkg/errors"
-	"gorm.io/gorm"
-)
-
-type fakePromoModel struct{}
-
-func (fakePromoModel) QueryEligibleRules(context.Context, int64, int64) ([]*promomodel.RuleWithPrice, error) {
-	return nil, nil
-}
-
-func (fakePromoModel) InsertUsage(context.Context, *promomodel.Usage, ...*gorm.DB) error {
-	return nil
-}
-
-func (fakePromoModel) InsertRule(context.Context, *promomodel.Rule) error {
-	return nil
-}
-
-func (fakePromoModel) FindRule(context.Context, int64) (*promomodel.Rule, error) {
-	return nil, gorm.ErrRecordNotFound
-}
-
-func (fakePromoModel) UpdateRule(context.Context, *promomodel.Rule) error {
-	return nil
-}
-
-func (fakePromoModel) DeleteRule(context.Context, int64) error {
-	return nil
-}
-
-func (fakePromoModel) QueryRuleList(context.Context, int, int, string, *bool, string) (int64, []*promomodel.Rule, error) {
-	return 0, nil, nil
-}
-
-func (fakePromoModel) UpsertPrices(context.Context, int64, []*promomodel.SubscribePromo) error {
-	return nil
-}
-
-func (fakePromoModel) FindPrice(context.Context, int64) (*promomodel.SubscribePromo, error) {
-	return nil, gorm.ErrRecordNotFound
-}
-
-func (fakePromoModel) DeletePrice(context.Context, int64) error {
-	return nil
-}
-
-func (fakePromoModel) QueryPriceList(context.Context, int64, int, int) (int64, []*promomodel.SubscribePromo, error) {
-	return 0, nil, nil
-}
-
-func (fakePromoModel) QueryUsageList(context.Context, promomodel.UsageFilter) (int64, []*promomodel.Usage, error) {
-	return 0, nil, nil
-}
-
-func (fakePromoModel) Transaction(context.Context, func(*gorm.DB) error) error {
-	return nil
-}
-
-func TestDeleteRuleNotFoundReturns404(t *testing.T) {
-	svcCtx := &svc.ServiceContext{PromoModel: fakePromoModel{}}
-	err := NewDeleteRuleLogic(context.Background(), svcCtx).DeleteRule(&types.DeletePromoRuleRequest{Id: 1})
-	assertCodeError(t, err, 404)
-}
-
-func TestDeletePriceNotFoundReturns404(t *testing.T) {
-	svcCtx := &svc.ServiceContext{PromoModel: fakePromoModel{}}
-	err := NewDeletePriceLogic(context.Background(), svcCtx).DeletePrice(&types.DeletePromoPriceRequest{Id: 1})
-	assertCodeError(t, err, 404)
-}
-
-func assertCodeError(t *testing.T, err error, want uint32) {
-	t.Helper()
-	if err == nil {
-		t.Fatal("expected error")
-	}
-	codeErr, ok := pkgerrors.Cause(err).(*xerr.CodeError)
-	if !ok {
-		t.Fatalf("expected CodeError, got %T", pkgerrors.Cause(err))
-	}
-	if got := codeErr.GetErrCode(); got != want {
-		t.Fatalf("unexpected error code: got %d want %d", got, want)
-	}
-}

internal/logic/admin/promo/setPriceLogic.go

@@ -4,12 +4,12 @@ import (
 	"context"
 
 	promomodel "github.com/perfect-panel/server/internal/model/promo"
-	subscribeModel "github.com/perfect-panel/server/internal/model/subscribe"
 	"github.com/perfect-panel/server/internal/svc"
 	"github.com/perfect-panel/server/internal/types"
 	"github.com/perfect-panel/server/pkg/logger"
 	"github.com/perfect-panel/server/pkg/xerr"
 	"github.com/pkg/errors"
+	"gorm.io/gorm"
 )
 
 type SetPriceLogic struct {
@@ -31,30 +31,16 @@ func (l *SetPriceLogic) SetPrice(req *types.SetPromoPriceRequest) error {
 		l.Errorw("[SetPromoPrice] Find Rule Error", logger.Field("error", err.Error()))
 		return errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), "find promo rule error: %v", err.Error())
 	}
-	subscribeIds := make([]int64, 0, len(req.Items))
-	seenSubscribeIds := make(map[int64]struct{}, len(req.Items))
-	for _, item := range req.Items {
-		if _, ok := seenSubscribeIds[item.SubscribeId]; ok {
-			continue
-		}
-		seenSubscribeIds[item.SubscribeId] = struct{}{}
-		subscribeIds = append(subscribeIds, item.SubscribeId)
-	}
-	var subscribes []*subscribeModel.Subscribe
-	if err := l.svcCtx.DB.WithContext(l.ctx).Model(&subscribeModel.Subscribe{}).Where("id IN ?", subscribeIds).Find(&subscribes).Error; err != nil {
-		l.Errorw("[SetPromoPrice] Find Subscribe Error", logger.Field("error", err.Error()))
-		return errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), "find subscribe error: %v", err.Error())
-	}
-	subscribeById := make(map[int64]*subscribeModel.Subscribe, len(subscribes))
-	for _, sub := range subscribes {
-		subscribeById[sub.Id] = sub
-	}
 	items := make([]*promomodel.SubscribePromo, 0, len(req.Items))
 	cacheKeys := make([]string, 0, len(req.Items))
 	for _, item := range req.Items {
-		sub, ok := subscribeById[item.SubscribeId]
-		if !ok {
-			return errors.Wrapf(xerr.NewErrCode(xerr.InvalidParams), "subscribe plan not found")
+		sub, err := l.svcCtx.SubscribeModel.FindOne(l.ctx, item.SubscribeId)
+		if err != nil {
+			if errors.Is(err, gorm.ErrRecordNotFound) {
+				return errors.Wrapf(xerr.NewErrCode(xerr.InvalidParams), "subscribe plan not found")
+			}
+			l.Errorw("[SetPromoPrice] Find Subscribe Error", logger.Field("error", err.Error()))
+			return errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), "find subscribe error: %v", err.Error())
 		}
 		originPrice := sub.UnitPrice * item.Quantity
 		if item.PromoPrice >= originPrice {

internal/logic/admin/user/getAdminUserInviteListLogic.go

@@ -3,13 +3,11 @@ package user
 import (
 	"context"
 
-	adminInvite "github.com/perfect-panel/server/internal/logic/admin/invite"
 	"github.com/perfect-panel/server/internal/svc"
 	"github.com/perfect-panel/server/internal/types"
 	"github.com/perfect-panel/server/pkg/logger"
 	"github.com/perfect-panel/server/pkg/xerr"
 	"github.com/pkg/errors"
-	"gorm.io/gorm"
 )
 
 type GetAdminUserInviteListLogic struct {
@@ -27,7 +25,15 @@ func NewGetAdminUserInviteListLogic(ctx context.Context, svcCtx *svc.ServiceCont
 }
 
 func (l *GetAdminUserInviteListLogic) GetAdminUserInviteList(req *types.GetAdminUserInviteListRequest) (resp *types.GetAdminUserInviteListResponse, err error) {
-	req.Page, req.Size = adminInvite.NormalizePage(req.Page, req.Size)
+	if req.Page < 1 {
+		req.Page = 1
+	}
+	if req.Size < 1 {
+		req.Size = 10
+	}
+	if req.Size > 100 {
+		req.Size = 100
+	}
 
 	type InvitedUser struct {
 		Id         int64  `gorm:"column:id"`
@@ -38,19 +44,19 @@ func (l *GetAdminUserInviteListLogic) GetAdminUserInviteList(req *types.GetAdmin
 	}
 
 	var total int64
-	baseQuery := applyAdminUserInviteFilters(l.svcCtx.DB.WithContext(l.ctx).
+	baseQuery := l.svcCtx.DB.WithContext(l.ctx).
 		Table("user u").
-		Where("u.referer_id = ? AND u.deleted_at IS NULL", req.UserId), req)
+		Where("u.referer_id = ? AND u.deleted_at IS NULL", req.UserId)
 
 	if err = baseQuery.Count(&total).Error; err != nil {
 		return nil, errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), "count invited users failed: %v", err)
 	}
 
 	var rows []InvitedUser
-	err = applyAdminUserInviteFilters(l.svcCtx.DB.WithContext(l.ctx).
+	err = l.svcCtx.DB.WithContext(l.ctx).
 		Table("user u").
 		Select("u.id, u.avatar, u.enable, UNIX_TIMESTAMP(u.created_at) as created_at, COALESCE((SELECT uam.auth_identifier FROM user_auth_methods uam WHERE uam.user_id = u.id ORDER BY uam.id ASC LIMIT 1), '') as identifier").
-		Where("u.referer_id = ? AND u.deleted_at IS NULL", req.UserId), req).
+		Where("u.referer_id = ? AND u.deleted_at IS NULL", req.UserId).
 		Order("u.created_at DESC").
 		Limit(req.Size).
 		Offset((req.Page - 1) * req.Size).
@@ -59,29 +65,14 @@ func (l *GetAdminUserInviteListLogic) GetAdminUserInviteList(req *types.GetAdmin
 		return nil, errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), "query invited users failed: %v", err)
 	}
 
-	relations := make([]adminInvite.InviteRelation, 0, len(rows))
-	for _, r := range rows {
-		relations = append(relations, adminInvite.InviteRelation{InviteeId: r.Id, InviterId: req.UserId})
-	}
-	benefits, err := adminInvite.QueryBenefits(l.ctx, l.svcCtx.DB, relations)
-	if err != nil {
-		return nil, err
-	}
-
 	list := make([]types.AdminInvitedUser, 0, len(rows))
 	for _, r := range rows {
-		benefit := benefits[r.Id]
 		list = append(list, types.AdminInvitedUser{
-			Id:                r.Id,
-			Avatar:            r.Avatar,
-			Identifier:        r.Identifier,
-			Enable:            r.Enable,
-			CreatedAt:         r.CreatedAt,
-			OrderCount:        benefit.OrderCount,
-			HasPurchased:      benefit.HasPurchased,
-			InviterCommission: benefit.InviterCommission,
-			InviterGiftDays:   benefit.InviterGiftDays,
-			InviteeGiftDays:   benefit.InviteeGiftDays,
+			Id:         r.Id,
+			Avatar:     r.Avatar,
+			Identifier: r.Identifier,
+			Enable:     r.Enable,
+			CreatedAt:  r.CreatedAt,
 		})
 	}
 
@@ -90,16 +81,3 @@ func (l *GetAdminUserInviteListLogic) GetAdminUserInviteList(req *types.GetAdmin
 		List:  list,
 	}, nil
 }
-
-func applyAdminUserInviteFilters(db *gorm.DB, req *types.GetAdminUserInviteListRequest) *gorm.DB {
-	if req.Search != "" {
-		db = db.Where("EXISTS (SELECT 1 FROM user_auth_methods uam WHERE uam.user_id = u.id AND uam.auth_identifier LIKE ?)", "%"+req.Search+"%")
-	}
-	if req.Enable != nil {
-		db = db.Where("u.enable = ?", *req.Enable)
-	}
-	if req.UserIdSearch > 0 {
-		db = db.Where("u.id = ?", req.UserIdSearch)
-	}
-	return db
-}

internal/logic/admin/user/getUserSubscribeByIdLogic.go

@@ -2,7 +2,6 @@ package user
 
 import (
 	"context"
-	"encoding/json"
 
 	"github.com/perfect-panel/server/internal/model/group"
 	"github.com/perfect-panel/server/internal/svc"
@@ -37,13 +36,6 @@ func (l *GetUserSubscribeByIdLogic) GetUserSubscribeById(req *types.GetUserSubsc
 	}
 	var subscribeDetails types.UserSubscribeDetail
 	tool.DeepCopy(&subscribeDetails, sub)
-	subscribeDetails.SpeedLimit = sub.SpeedLimit
-	if sub.TrafficLimit != nil && *sub.TrafficLimit != "" {
-		_ = json.Unmarshal([]byte(*sub.TrafficLimit), &subscribeDetails.TrafficLimit)
-	}
-	if sub.Subscribe != nil {
-		subscribeDetails.PlanSpeedLimit = sub.Subscribe.SpeedLimit
-	}
 
 	// 填充分组名
 	if sub.NodeGroupId > 0 {
@@ -55,17 +47,7 @@ func (l *GetUserSubscribeByIdLogic) GetUserSubscribeById(req *types.GetUserSubsc
 
 	// Calculate speed limit status
 	if sub.Subscribe != nil && sub.Status == 1 {
-		baseSpeed := sub.Subscribe.SpeedLimit
-		if sub.SpeedLimit > 0 {
-			baseSpeed = sub.SpeedLimit
-		}
-
-		trafficLimit := sub.Subscribe.TrafficLimit
-		if sub.TrafficLimit != nil && *sub.TrafficLimit != "" {
-			trafficLimit = *sub.TrafficLimit
-		}
-
-		result := speedlimit.Calculate(l.ctx, l.svcCtx.DB, sub.UserId, sub.Id, baseSpeed, trafficLimit)
+		result := speedlimit.Calculate(l.ctx, l.svcCtx.DB, sub.UserId, sub.Id, sub.Subscribe.SpeedLimit, sub.Subscribe.TrafficLimit)
 		subscribeDetails.EffectiveSpeed = result.EffectiveSpeed
 		subscribeDetails.IsThrottled = result.IsThrottled
 		subscribeDetails.ThrottleRule = result.ThrottleRule

internal/logic/admin/user/updateUserSubscribeLogic.go

@@ -39,32 +39,22 @@ func (l *UpdateUserSubscribeLogic) UpdateUserSubscribe(req *types.UpdateUserSubs
 	} else {
 		userSub.Status = 1
 	}
-	speedLimit := userSub.SpeedLimit
-	if req.SpeedLimit != nil {
-		speedLimit = *req.SpeedLimit
-	}
-	trafficLimit := userSub.TrafficLimit
-	if req.TrafficLimit != nil {
-		trafficLimit = req.TrafficLimit
-	}
 
 	err = l.svcCtx.UserModel.UpdateSubscribe(l.ctx, &user.Subscribe{
-		Id:           userSub.Id,
-		UserId:       userSub.UserId,
-		OrderId:      userSub.OrderId,
-		SubscribeId:  req.SubscribeId,
-		StartTime:    userSub.StartTime,
-		ExpireTime:   time.UnixMilli(req.ExpiredAt),
-		Traffic:      req.Traffic,
-		Download:     req.Download,
-		Upload:       req.Upload,
-		SpeedLimit:   speedLimit,
-		TrafficLimit: trafficLimit,
-		Token:        userSub.Token,
-		UUID:         userSub.UUID,
-		Status:       userSub.Status,
-		NodeGroupId:  userSub.NodeGroupId,
-		GroupLocked:  userSub.GroupLocked,
+		Id:          userSub.Id,
+		UserId:      userSub.UserId,
+		OrderId:     userSub.OrderId,
+		SubscribeId: req.SubscribeId,
+		StartTime:   userSub.StartTime,
+		ExpireTime:  time.UnixMilli(req.ExpiredAt),
+		Traffic:     req.Traffic,
+		Download:    req.Download,
+		Upload:      req.Upload,
+		Token:       userSub.Token,
+		UUID:        userSub.UUID,
+		Status:      userSub.Status,
+		NodeGroupId: userSub.NodeGroupId,
+		GroupLocked: userSub.GroupLocked,
 	})
 
 	if err != nil {

internal/logic/common/promoEligibility.go

@@ -11,7 +11,6 @@ import (
 	"github.com/perfect-panel/server/pkg/xerr"
 	"github.com/pkg/errors"
 	"gorm.io/gorm"
-	"gorm.io/gorm/clause"
 )
 
 type PromoResult struct {
@@ -149,12 +148,7 @@ func evaluateInactiveUserPromo(
 	err := db.WithContext(ctx).
 		Model(&user.Subscribe{}).
 		Where("user_id = ?", userID).
-		Order(clause.OrderBy{
-			Expression: clause.Expr{
-				SQL:  "CASE WHEN expire_time = ? THEN 0 ELSE 1 END, expire_time DESC",
-				Vars: []interface{}{time.UnixMilli(0)},
-			},
-		}).
+		Order("expire_time DESC").
 		Limit(1).
 		Take(&lastSub).Error
 	if err != nil {
@@ -164,16 +158,8 @@ func evaluateInactiveUserPromo(
 		return false, time.Time{}, errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), "query promo inactive user subscription failed")
 	}
 
-	return evaluateInactiveUserExpire(lastSub.ExpireTime, params, now), ruleExpiresAt, nil
-}
-
-func evaluateInactiveUserExpire(lastExpire time.Time, params promoRuleParams, now time.Time) bool {
-	if lastExpire.Equal(time.UnixMilli(0)) {
-		return false
-	}
-
 	threshold := now.AddDate(0, -params.InactiveMonths, 0)
-	return lastExpire.Before(threshold) || lastExpire.Equal(threshold)
+	return lastSub.ExpireTime.Before(threshold) || lastSub.ExpireTime.Equal(threshold), ruleExpiresAt, nil
 }
 
 func promoRuleExpiresAt(rule *promo.RuleWithPrice) time.Time {

internal/logic/common/promoEligibility_test.go

@@ -1,46 +0,0 @@
-package common
-
-import (
-	"testing"
-	"time"
-)
-
-func TestEvaluateInactiveUserExpire(t *testing.T) {
-	now := time.Date(2026, 5, 27, 8, 0, 0, 0, time.UTC)
-	params := promoRuleParams{InactiveMonths: 3}
-
-	tests := []struct {
-		name       string
-		lastExpire time.Time
-		want       bool
-	}{
-		{
-			name:       "permanent subscription is not inactive",
-			lastExpire: time.UnixMilli(0),
-			want:       false,
-		},
-		{
-			name:       "active subscription is not inactive",
-			lastExpire: now.Add(time.Hour),
-			want:       false,
-		},
-		{
-			name:       "expire at threshold is inactive",
-			lastExpire: now.AddDate(0, -3, 0),
-			want:       true,
-		},
-		{
-			name:       "expire before threshold is inactive",
-			lastExpire: now.AddDate(0, -3, -1),
-			want:       true,
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			if got := evaluateInactiveUserExpire(tt.lastExpire, params, now); got != tt.want {
-				t.Fatalf("evaluateInactiveUserExpire() = %v, want %v", got, tt.want)
-			}
-		})
-	}
-}

internal/logic/public/file/common.go

@@ -80,7 +80,7 @@ func validateInitRequest(svcCtx *svc.ServiceContext, bizType, fileName, contentT
 	allowed := allowedContentTypeSet(svcCtx.Config.S3.AllowedContentTypes)
 	if len(allowed) > 0 {
 		if _, ok := allowed[strings.ToLower(strings.TrimSpace(contentType))]; !ok {
-			return errors.Wrapf(xerr.NewErrCodeMsg(xerr.InvalidParams, "content_type is not allowed"), "content_type is not allowed")
+			return errors.Wrapf(xerr.NewErrCode(xerr.InvalidParams), "content_type is not allowed")
 		}
 	}
 	return nil

internal/logic/public/file/common_test.go

@@ -1,91 +0,0 @@
-package file
-
-import (
-	"mime/multipart"
-	"strings"
-	"testing"
-
-	"github.com/perfect-panel/server/internal/config"
-	"github.com/perfect-panel/server/internal/svc"
-	"github.com/perfect-panel/server/pkg/storage"
-)
-
-const testAllowedContentTypes = "application/zip,application/x-zip-compressed,application/gzip,application/x-gzip,application/octet-stream,text/plain,application/json,image/jpeg,image/jpg,image/png,image/webp,image/gif,image/heic,image/heif,image/bmp"
-
-type testMultipartFile struct {
-	*strings.Reader
-}
-
-func (testMultipartFile) Close() error {
-	return nil
-}
-
-func TestValidateInitRequestAllowedContentTypes(t *testing.T) {
-	svcCtx := &svc.ServiceContext{
-		Config: config.Config{
-			S3: config.S3Config{
-				Enable:              true,
-				MaxUploadSize:       1024,
-				AllowedContentTypes: testAllowedContentTypes,
-			},
-		},
-		S3Store: &storage.S3Store{},
-	}
-
-	tests := []struct {
-		name        string
-		contentType string
-		wantErr     bool
-	}{
-		{name: "allow jpeg", contentType: "image/jpeg"},
-		{name: "allow png", contentType: "image/png"},
-		{name: "allow webp", contentType: "image/webp"},
-		{name: "reject unknown", contentType: "application/x-sh", wantErr: true},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			err := validateInitRequest(svcCtx, "app-package", "demo.bin", tt.contentType, 10)
-			if tt.wantErr {
-				if err == nil {
-					t.Fatal("expected error, got nil")
-				}
-				if !strings.Contains(err.Error(), "content_type is not allowed") {
-					t.Fatalf("expected content type error, got %v", err)
-				}
-				return
-			}
-			if err != nil {
-				t.Fatalf("expected nil error, got %v", err)
-			}
-		})
-	}
-}
-
-func TestSniffContentTypeDetectsCommonImages(t *testing.T) {
-	tests := []struct {
-		name string
-		data string
-		want string
-	}{
-		{name: "jpeg", data: "\xff\xd8\xff\xe0\x00\x10JFIF\x00\x01\x01", want: "image/jpeg"},
-		{name: "png", data: "\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR", want: "image/png"},
-		{name: "webp", data: "RIFF\x1a\x00\x00\x00WEBPVP8 \x0e\x00\x00\x00", want: "image/webp"},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			file := testMultipartFile{Reader: strings.NewReader(tt.data)}
-			got, err := sniffContentType(&multipart.FileHeader{}, file)
-			if err != nil {
-				t.Fatalf("expected nil error, got %v", err)
-			}
-			if got != tt.want {
-				t.Fatalf("expected %q, got %q", tt.want, got)
-			}
-			if pos, err := file.Seek(0, 1); err != nil || pos != 0 {
-				t.Fatalf("expected reader reset to start, pos=%d err=%v", pos, err)
-			}
-		})
-	}
-}

internal/logic/public/order/preCreateOrderLogic.go

@@ -47,18 +47,13 @@ func (l *PreCreateOrderLogic) PreCreateOrder(req *types.PurchaseOrderRequest) (r
 		l.Debugf("[PreCreateOrder] Quantity is less than or equal to 0, setting to 1")
 		req.Quantity = 1
 	}
-	entitlement, entErr := commonLogic.ResolveEntitlementUser(l.ctx, l.svcCtx.DB, u.Id)
-	if entErr != nil {
-		return nil, entErr
-	}
 
 	targetSubscribeID := req.SubscribeId
-	orderType := uint8(1)
 	isSingleModeRenewal := false
 	decision, routeErr := commonLogic.ResolvePurchaseRoute(
 		l.ctx,
 		l.svcCtx.Config.Subscribe.SingleModel,
-		entitlement.EffectiveUserID,
+		u.Id,
 		req.SubscribeId,
 		l.svcCtx.UserModel.FindSingleModeAnchorSubscribe,
 	)
@@ -73,44 +68,15 @@ func (l *PreCreateOrderLogic) PreCreateOrder(req *types.PurchaseOrderRequest) (r
 		targetSubscribeID = decision.ResolvedSubscribeID
 		isSingleModeRenewal = decision.Route == commonLogic.PurchaseRoutePurchaseToRenewal
 		if isSingleModeRenewal && decision.Anchor != nil {
-			orderType = 2
 			l.Infow("[PreCreateOrder] single mode purchase routed to renewal preview",
 				logger.Field("mode", "single"),
 				logger.Field("route", "purchase_to_renewal"),
 				logger.Field("anchor_user_subscribe_id", decision.Anchor.Id),
 				logger.Field("user_id", u.Id),
-				logger.Field("effective_user_id", entitlement.EffectiveUserID),
 			)
 		}
 	}
 
-	// Keep promo eligibility preview aligned with Purchase: an existing paid subscription
-	// routes the request to renewal semantics, where first-purchase promos are disabled.
-	if !l.svcCtx.Config.Subscribe.SingleModel && orderType == 1 {
-		var existSub user.Subscribe
-		if e := l.svcCtx.DB.WithContext(l.ctx).
-			Model(&user.Subscribe{}).
-			Where("user_id = ? AND token != '' AND (order_id > 0 OR token LIKE 'iap:%')", entitlement.EffectiveUserID).
-			Order("expire_time DESC").
-			Order("updated_at DESC").
-			Order("id DESC").
-			First(&existSub).Error; e == nil && existSub.Id > 0 && existSub.Token != "" {
-			orderType = 2
-			l.Infow("[PreCreateOrder] purchase preview routed to renewal because an existing subscription was found",
-				logger.Field("route_mode", "global_single_subscription"),
-				logger.Field("route", "purchase_to_existing_subscription"),
-				logger.Field("existing_subscribe_id", existSub.Id),
-				logger.Field("existing_status", existSub.Status),
-				logger.Field("user_id", u.Id),
-				logger.Field("effective_user_id", entitlement.EffectiveUserID),
-				logger.Field("resolved_subscribe_id", targetSubscribeID),
-			)
-		} else if e != nil && !errors.Is(e, gorm.ErrRecordNotFound) {
-			l.Errorw("[PreCreateOrder] Database query error", logger.Field("error", e.Error()), logger.Field("user_id", u.Id))
-			return nil, errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), "find existing subscription error: %v", e.Error())
-		}
-	}
-
 	// find subscribe plan
 	sub, err := l.svcCtx.SubscribeModel.FindOne(l.ctx, targetSubscribeID)
 	if err != nil {
@@ -120,7 +86,7 @@ func (l *PreCreateOrderLogic) PreCreateOrder(req *types.PurchaseOrderRequest) (r
 
 	// check subscribe plan quota limit for new purchase flow only
 	if !isSingleModeRenewal && sub.Quota > 0 {
-		userSub, err := l.svcCtx.UserModel.QueryUserSubscribe(l.ctx, entitlement.EffectiveUserID)
+		userSub, err := l.svcCtx.UserModel.QueryUserSubscribe(l.ctx, u.Id)
 		if err != nil {
 			l.Errorw("[PreCreateOrder] Database query error", logger.Field("error", err.Error()), logger.Field("user_id", u.Id))
 			return nil, errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), "find user subscription error: %v", err.Error())
@@ -136,7 +102,7 @@ func (l *PreCreateOrderLogic) PreCreateOrder(req *types.PurchaseOrderRequest) (r
 		}
 	}
 
-	newUserDiscount, err := resolveNewUserDiscountEligibility(l.ctx, l.svcCtx.DB, entitlement.EffectiveUserID, targetSubscribeID, req.Quantity, sub.Discount)
+	newUserDiscount, err := resolveNewUserDiscountEligibility(l.ctx, l.svcCtx.DB, u.Id, targetSubscribeID, req.Quantity, sub.Discount)
 	if err != nil {
 		l.Errorw("[PreCreateOrder] Database query error resolving new user eligibility",
 			logger.Field("error", err.Error()),
@@ -151,13 +117,13 @@ func (l *PreCreateOrderLogic) PreCreateOrder(req *types.PurchaseOrderRequest) (r
 	priceResult, err := calculatePurchasePrice(
 		l.ctx,
 		l.svcCtx,
-		entitlement.EffectiveUserID,
+		u.Id,
 		targetSubscribeID,
 		sub.UnitPrice,
 		req.Quantity,
 		newUserDiscount.Discounts,
 		newUserDiscount.EligibleForDiscount,
-		orderType == 1,
+		!isSingleModeRenewal,
 	)
 	if err != nil {
 		l.Errorw("[PreCreateOrder] Promo price calculation error",

internal/logic/public/order/promoPricing.go

@@ -40,8 +40,8 @@ func calculatePurchasePrice(
 		if err != nil {
 			return nil, err
 		}
-		if promoResult != nil && promoResult.Eligible && promoResult.PromoPrice < originalPrice {
-			result.PayableBase = promoResult.PromoPrice
+		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

internal/logic/public/order/promoPricing_test.go

@@ -11,85 +11,75 @@ import (
 )
 
 type fakePromoModel struct {
-	rules            []*promo.RuleWithPrice
-	lastSubscribeID  int64
-	lastQuantity     int64
-	requireQuantity  int64
-	quantityMismatch []*promo.RuleWithPrice
+	rules []*promo.RuleWithPrice
 }
 
-func (m *fakePromoModel) QueryEligibleRules(_ context.Context, subscribeID int64, quantity int64) ([]*promo.RuleWithPrice, error) {
-	m.lastSubscribeID = subscribeID
-	m.lastQuantity = quantity
-	if m.requireQuantity > 0 && quantity != m.requireQuantity {
-		return m.quantityMismatch, nil
-	}
+func (m fakePromoModel) QueryEligibleRules(context.Context, int64, int64) ([]*promo.RuleWithPrice, error) {
 	return m.rules, nil
 }
 
-func (m *fakePromoModel) InsertUsage(context.Context, *promo.Usage, ...*gorm.DB) error {
+func (m fakePromoModel) InsertUsage(context.Context, *promo.Usage, ...*gorm.DB) error {
 	return nil
 }
 
-func (m *fakePromoModel) InsertRule(context.Context, *promo.Rule) error {
+func (m fakePromoModel) InsertRule(context.Context, *promo.Rule) error {
 	return nil
 }
 
-func (m *fakePromoModel) FindRule(context.Context, int64) (*promo.Rule, error) {
+func (m fakePromoModel) FindRule(context.Context, int64) (*promo.Rule, error) {
 	return nil, gorm.ErrRecordNotFound
 }
 
-func (m *fakePromoModel) UpdateRule(context.Context, *promo.Rule) error {
+func (m fakePromoModel) UpdateRule(context.Context, *promo.Rule) error {
 	return nil
 }
 
-func (m *fakePromoModel) DeleteRule(context.Context, int64) error {
+func (m fakePromoModel) DeleteRule(context.Context, int64) error {
 	return nil
 }
 
-func (m *fakePromoModel) QueryRuleList(context.Context, int, int, string, *bool, string) (int64, []*promo.Rule, error) {
+func (m fakePromoModel) QueryRuleList(context.Context, int, int, string, *bool, string) (int64, []*promo.Rule, error) {
 	return 0, nil, nil
 }
 
-func (m *fakePromoModel) UpsertPrices(context.Context, int64, []*promo.SubscribePromo) error {
+func (m fakePromoModel) UpsertPrices(context.Context, int64, []*promo.SubscribePromo) error {
 	return nil
 }
 
-func (m *fakePromoModel) FindPrice(context.Context, int64) (*promo.SubscribePromo, error) {
+func (m fakePromoModel) FindPrice(context.Context, int64) (*promo.SubscribePromo, error) {
 	return nil, gorm.ErrRecordNotFound
 }
 
-func (m *fakePromoModel) DeletePrice(context.Context, int64) error {
+func (m fakePromoModel) DeletePrice(context.Context, int64) error {
 	return nil
 }
 
-func (m *fakePromoModel) QueryPriceList(context.Context, int64, int, int) (int64, []*promo.SubscribePromo, error) {
+func (m fakePromoModel) QueryPriceList(context.Context, int64, int, int) (int64, []*promo.SubscribePromo, error) {
 	return 0, nil, nil
 }
 
-func (m *fakePromoModel) QueryUsageList(context.Context, promo.UsageFilter) (int64, []*promo.Usage, error) {
+func (m fakePromoModel) QueryUsageList(context.Context, promo.UsageFilter) (int64, []*promo.Usage, error) {
 	return 0, nil, nil
 }
 
-func (m *fakePromoModel) Transaction(context.Context, func(*gorm.DB) error) error {
+func (m fakePromoModel) Transaction(context.Context, func(*gorm.DB) error) error {
 	return nil
 }
 
-func TestCalculatePurchasePricePromoUsesQuantityTierTotalPrice(t *testing.T) {
-	model := &fakePromoModel{rules: []*promo.RuleWithPrice{
-		{
-			Rule: promo.Rule{
-				Id:      9,
-				Name:    "campaign",
-				Type:    promo.RuleTypeCampaign,
-				Enabled: true,
-			},
-			PromoPrice: 279,
-		},
-	}}
+func TestCalculatePurchasePricePromoSkipsPercentDiscount(t *testing.T) {
 	svcCtx := &svc.ServiceContext{
-		DB:         &gorm.DB{},
-		PromoModel: model,
+		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(
@@ -97,9 +87,9 @@ func TestCalculatePurchasePricePromoUsesQuantityTierTotalPrice(t *testing.T) {
 		svcCtx,
 		1,
 		2,
-		100,
-		7,
-		[]types.SubscribeDiscount{{Quantity: 7, Discount: 50}},
+		1000,
+		3,
+		[]types.SubscribeDiscount{{Quantity: 3, Discount: 50}},
 		true,
 		true,
 	)
@@ -107,11 +97,11 @@ func TestCalculatePurchasePricePromoUsesQuantityTierTotalPrice(t *testing.T) {
 		t.Fatalf("calculatePurchasePrice returned error: %v", err)
 	}
 
-	if result.OriginalPrice != 700 {
-		t.Fatalf("OriginalPrice = %d, want 700", result.OriginalPrice)
+	if result.OriginalPrice != 3000 {
+		t.Fatalf("OriginalPrice = %d, want 3000", result.OriginalPrice)
 	}
-	if result.PayableBase != 279 {
-		t.Fatalf("PayableBase = %d, want 279", result.PayableBase)
+	if result.PayableBase != 1800 {
+		t.Fatalf("PayableBase = %d, want 1800", result.PayableBase)
 	}
 	if result.DiscountAmount != 0 {
 		t.Fatalf("DiscountAmount = %d, want 0", result.DiscountAmount)
@@ -119,32 +109,25 @@ func TestCalculatePurchasePricePromoUsesQuantityTierTotalPrice(t *testing.T) {
 	if result.PromoRuleId != 9 {
 		t.Fatalf("PromoRuleId = %d, want 9", result.PromoRuleId)
 	}
-	if result.PromoDiscount != 421 {
-		t.Fatalf("PromoDiscount = %d, want 421", result.PromoDiscount)
-	}
-	if result.PromoPrice != 279 {
-		t.Fatalf("PromoPrice = %d, want 279", result.PromoPrice)
-	}
-	if model.lastQuantity != 7 {
-		t.Fatalf("promo query quantity = %d, want 7", model.lastQuantity)
+	if result.PromoDiscount != 1200 {
+		t.Fatalf("PromoDiscount = %d, want 1200", result.PromoDiscount)
 	}
 }
 
 func TestCalculatePurchasePriceIgnoresInvalidPromoPrice(t *testing.T) {
-	model := &fakePromoModel{rules: []*promo.RuleWithPrice{
-		{
-			Rule: promo.Rule{
-				Id:      10,
-				Name:    "invalid campaign",
-				Type:    promo.RuleTypeCampaign,
-				Enabled: true,
-			},
-			PromoPrice: 3000,
-		},
-	}}
 	svcCtx := &svc.ServiceContext{
-		DB:         &gorm.DB{},
-		PromoModel: model,
+		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(
@@ -172,52 +155,3 @@ func TestCalculatePurchasePriceIgnoresInvalidPromoPrice(t *testing.T) {
 		t.Fatalf("promo fields = (%d, %d), want (0, 0)", result.PromoRuleId, result.PromoDiscount)
 	}
 }
-
-func TestCalculatePurchasePricePassesQuantityToPromoEvaluation(t *testing.T) {
-	promoModel := &fakePromoModel{
-		requireQuantity: 6,
-		rules: []*promo.RuleWithPrice{
-			{
-				Rule: promo.Rule{
-					Id:      11,
-					Name:    "quantity campaign",
-					Type:    promo.RuleTypeCampaign,
-					Enabled: true,
-				},
-				PromoPrice: 3000,
-			},
-		},
-	}
-	svcCtx := &svc.ServiceContext{
-		DB:         &gorm.DB{},
-		PromoModel: promoModel,
-	}
-
-	result, err := calculatePurchasePrice(
-		context.Background(),
-		svcCtx,
-		1,
-		2,
-		1000,
-		6,
-		[]types.SubscribeDiscount{{Quantity: 6, Discount: 80}},
-		true,
-		true,
-	)
-	if err != nil {
-		t.Fatalf("calculatePurchasePrice returned error: %v", err)
-	}
-
-	if promoModel.lastSubscribeID != 2 {
-		t.Fatalf("lastSubscribeID = %d, want 2", promoModel.lastSubscribeID)
-	}
-	if promoModel.lastQuantity != 6 {
-		t.Fatalf("lastQuantity = %d, want 6", promoModel.lastQuantity)
-	}
-	if result.PayableBase != 3000 {
-		t.Fatalf("PayableBase = %d, want 3000", result.PayableBase)
-	}
-	if result.PromoRuleId != 11 {
-		t.Fatalf("PromoRuleId = %d, want 11", result.PromoRuleId)
-	}
-}

internal/logic/public/subscribe/promo.go

@@ -15,7 +15,6 @@ import (
 	"github.com/perfect-panel/server/pkg/xerr"
 	"github.com/pkg/errors"
 	"gorm.io/gorm"
-	"gorm.io/gorm/clause"
 )
 
 const (
@@ -26,7 +25,6 @@ const (
 
 type subscribePromoCandidate struct {
 	SubscribeId int64      `gorm:"column:subscribe_id"`
-	Quantity    int64      `gorm:"column:quantity"`
 	RuleName    string     `gorm:"column:rule_name"`
 	RuleType    string     `gorm:"column:rule_type"`
 	PromoPrice  int64      `gorm:"column:promo_price"`
@@ -40,8 +38,8 @@ type promoRuleParams struct {
 	InactiveMonths int   `json:"inactive_months"`
 }
 
-func loadSubscribePromoMap(ctx context.Context, svcCtx *svc.ServiceContext, subscribeIDs []int64) (map[int64]map[int64]*types.SubscribePromo, error) {
-	result := make(map[int64]map[int64]*types.SubscribePromo)
+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
 	}
@@ -58,13 +56,7 @@ func loadSubscribePromoMap(ctx context.Context, svcCtx *svc.ServiceContext, subs
 	evaluator := promoEligibilityEvaluator{ctx: ctx, db: svcCtx.DB, userInfo: userInfo}
 	now := time.Now()
 	for _, candidate := range candidates {
-		if candidate.Quantity <= 0 {
-			continue
-		}
-		if result[candidate.SubscribeId] == nil {
-			result[candidate.SubscribeId] = make(map[int64]*types.SubscribePromo)
-		}
-		if _, exists := result[candidate.SubscribeId][candidate.Quantity]; exists {
+		if _, exists := result[candidate.SubscribeId]; exists {
 			continue
 		}
 		if !candidate.isActive(now) {
@@ -77,7 +69,7 @@ func loadSubscribePromoMap(ctx context.Context, svcCtx *svc.ServiceContext, subs
 		if !ok {
 			continue
 		}
-		result[candidate.SubscribeId][candidate.Quantity] = &types.SubscribePromo{
+		result[candidate.SubscribeId] = &types.SubscribePromo{
 			RuleName:   candidate.RuleName,
 			RuleType:   candidate.RuleType,
 			PromoPrice: candidate.PromoPrice,
@@ -90,28 +82,23 @@ func loadSubscribePromoMap(ctx context.Context, svcCtx *svc.ServiceContext, subs
 
 func querySubscribePromoCandidates(ctx context.Context, svcCtx *svc.ServiceContext, subscribeIDs []int64, loggedIn bool) ([]subscribePromoCandidate, error) {
 	var candidates []subscribePromoCandidate
-	err := subscribePromoCandidatesQuery(ctx, svcCtx.DB, subscribeIDs, loggedIn).
-		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 subscribePromoCandidatesQuery(ctx context.Context, db *gorm.DB, subscribeIDs []int64, loggedIn bool) *gorm.DB {
-	query := db.WithContext(ctx).
+	query := svcCtx.DB.WithContext(ctx).
 		Table("subscribe_promo AS sp").
-		Select("sp.subscribe_id, sp.quantity, sp.promo_price, pr.name AS rule_name, pr.type AS rule_type, pr.params, pr.start_time, pr.end_time").
+		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)
 	}
-	return query.
+	err := query.
 		Order("sp.subscribe_id ASC").
-		Order("sp.quantity ASC").
 		Order("pr.priority DESC").
-		Order("pr.id ASC")
+		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 {
@@ -184,7 +171,11 @@ func (e *promoEligibilityEvaluator) lastSubscribeExpireAt() (time.Time, error) {
 		return *e.lastExpire, nil
 	}
 	var item user.Subscribe
-	err := e.lastSubscribeExpireQuery().
+	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 {
@@ -199,18 +190,6 @@ func (e *promoEligibilityEvaluator) lastSubscribeExpireAt() (time.Time, error) {
 	return item.ExpireTime, nil
 }
 
-func (e *promoEligibilityEvaluator) lastSubscribeExpireQuery() *gorm.DB {
-	return e.db.WithContext(e.ctx).
-		Model(&user.Subscribe{}).
-		Where("user_id = ?", e.userInfo.Id).
-		Order(clause.OrderBy{
-			Expression: clause.Expr{
-				SQL:  "CASE WHEN expire_time = ? THEN 0 ELSE 1 END, expire_time DESC",
-				Vars: []interface{}{time.UnixMilli(0)},
-			},
-		})
-}
-
 func (c subscribePromoCandidate) expiresAt() time.Time {
 	if c.EndTime == nil {
 		return time.Time{}

internal/logic/public/subscribe/promo_test.go

@@ -1,15 +1,10 @@
 package subscribe
 
 import (
-	"context"
-	"strings"
 	"testing"
 	"time"
 
 	"github.com/perfect-panel/server/internal/model/user"
-	"github.com/perfect-panel/server/internal/types"
-	"gorm.io/driver/mysql"
-	"gorm.io/gorm"
 )
 
 func TestPromoEligibilityEvaluatorMatch(t *testing.T) {
@@ -78,83 +73,3 @@ func TestSubscribePromoCandidateActiveWindow(t *testing.T) {
 		t.Fatal("candidate after end time should not be active")
 	}
 }
-
-func TestLastSubscribeExpireAtPrioritizesPermanentSubscription(t *testing.T) {
-	db, err := gorm.Open(mysql.New(mysql.Config{
-		DSN:                       "gorm:gorm@tcp(localhost:9910)/gorm?charset=utf8&parseTime=True&loc=Local",
-		SkipInitializeWithVersion: true,
-	}), &gorm.Config{DryRun: true, DisableAutomaticPing: true})
-	if err != nil {
-		t.Fatalf("open dry-run db: %v", err)
-	}
-
-	evaluator := &promoEligibilityEvaluator{
-		db:       db,
-		userInfo: &user.User{Id: 7},
-	}
-	var item user.Subscribe
-	tx := evaluator.lastSubscribeExpireQuery().Limit(1).Take(&item)
-
-	sql := tx.Statement.SQL.String()
-	if !strings.Contains(sql, "CASE WHEN expire_time = ? THEN 0 ELSE 1 END") {
-		t.Fatalf("SQL missing permanent subscription priority order: %s", sql)
-	}
-	if strings.Contains(sql, "expire_time !=") {
-		t.Fatalf("SQL should not filter out permanent subscriptions: %s", sql)
-	}
-	if len(tx.Statement.Vars) < 2 {
-		t.Fatalf("SQL vars length = %d, want at least 2; vars=%v", len(tx.Statement.Vars), tx.Statement.Vars)
-	}
-	if got, want := tx.Statement.Vars[1], time.UnixMilli(0); got != want {
-		t.Fatalf("permanent subscription order var = %v, want %v; vars=%v", got, want, tx.Statement.Vars)
-	}
-}
-
-func TestQuerySubscribePromoCandidatesIncludesQuantity(t *testing.T) {
-	db, err := gorm.Open(mysql.New(mysql.Config{
-		DSN:                       "gorm:gorm@tcp(localhost:9910)/gorm?charset=utf8&parseTime=True&loc=Local",
-		SkipInitializeWithVersion: true,
-	}), &gorm.Config{DryRun: true, DisableAutomaticPing: true})
-	if err != nil {
-		t.Fatalf("open dry-run db: %v", err)
-	}
-
-	var candidates []subscribePromoCandidate
-	tx := subscribePromoCandidatesQuery(context.Background(), db, []int64{11, 12}, true).Scan(&candidates)
-	stmt := tx.Statement
-	sql := stmt.SQL.String()
-	if !strings.Contains(sql, "sp.subscribe_id, sp.quantity, sp.promo_price") {
-		t.Fatalf("SQL missing quantity select: %s", sql)
-	}
-	if !strings.Contains(sql, "ORDER BY sp.subscribe_id ASC,sp.quantity ASC,pr.priority DESC,pr.id ASC") {
-		t.Fatalf("SQL missing quantity order: %s", sql)
-	}
-}
-
-func TestApplySubscribeDiscountPromosMatchesQuantity(t *testing.T) {
-	subscribe := types.Subscribe{Discount: []types.SubscribeDiscount{
-		{Quantity: 1},
-		{Quantity: 12},
-	}}
-	promos := map[int64]*types.SubscribePromo{
-		3:  {RuleName: "季度优惠", PromoPrice: 2900},
-		12: {RuleName: "年度优惠", PromoPrice: 9900},
-	}
-
-	applySubscribeDiscountPromos(&subscribe, promos)
-	if subscribe.Discount[0].Promo != nil {
-		t.Fatalf("quantity 1 promo should be nil, got %+v", subscribe.Discount[0].Promo)
-	}
-	if subscribe.Discount[1].Promo == nil {
-		t.Fatal("quantity 12 promo should match")
-	}
-	if got, want := subscribe.Discount[1].Promo.RuleName, "年度优惠"; got != want {
-		t.Fatalf("promo rule name = %q, want %q", got, want)
-	}
-
-	subscribe = types.Subscribe{Discount: []types.SubscribeDiscount{{Quantity: 6}}}
-	applySubscribeDiscountPromos(&subscribe, promos)
-	if subscribe.Discount[0].Promo != nil {
-		t.Fatalf("promo should be nil when quantity does not match, got %+v", subscribe.Discount[0].Promo)
-	}
-}

internal/logic/public/subscribe/querySubscribeListLogic.go

@@ -56,19 +56,11 @@ func (l *QuerySubscribeListLogic) QuerySubscribeList(req *types.QuerySubscribeLi
 			var discount []types.SubscribeDiscount
 			_ = json.Unmarshal([]byte(item.Discount), &discount)
 			sub.Discount = discount
+			list[i] = sub
 		}
 		list[i] = sub
 	}
 
-	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 {
-		applySubscribeDiscountPromos(&list[i], promos[list[i].Id])
-	}
-
 	// 老版本客户端（无 X-App-Id）去掉每个套餐 discount 的最后一个
 	hasAppId, _ := l.ctx.Value(constant.CtxKeyHasAppId).(bool)
 	if !hasAppId {
@@ -79,13 +71,16 @@ 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
 }
-
-func applySubscribeDiscountPromos(subscribe *types.Subscribe, promoByQuantity map[int64]*types.SubscribePromo) {
-	for i := range subscribe.Discount {
-		subscribe.Discount[i].Promo = promoByQuantity[subscribe.Discount[i].Quantity]
-	}
-}

internal/logic/public/user/getInviteRecordsLogic.go

@@ -1,198 +0,0 @@
-package user
-
-import (
-	"context"
-	"encoding/json"
-
-	logmodel "github.com/perfect-panel/server/internal/model/log"
-	ordermodel "github.com/perfect-panel/server/internal/model/order"
-	"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/hash"
-	"github.com/perfect-panel/server/pkg/logger"
-	"github.com/perfect-panel/server/pkg/xerr"
-	"github.com/pkg/errors"
-)
-
-const (
-	inviteRecordRoleInviter = "inviter"
-	inviteRecordRoleInvitee = "invitee"
-)
-
-type GetInviteRecordsLogic struct {
-	logger.Logger
-	ctx    context.Context
-	svcCtx *svc.ServiceContext
-}
-
-type inviteRecordLog struct {
-	Id        int64  `gorm:"column:id"`
-	ObjectId  int64  `gorm:"column:object_id"`
-	Content   string `gorm:"column:content"`
-	CreatedAt int64  `gorm:"column:created_at"`
-}
-
-type inviteGiftContent struct {
-	OrderNo string `json:"order_no"`
-	Amount  int64  `json:"amount"`
-}
-
-type parsedInviteRecordLog struct {
-	log     inviteRecordLog
-	content inviteGiftContent
-}
-
-type inviteOrderUser struct {
-	OrderNo string `gorm:"column:order_no"`
-	UserId  int64  `gorm:"column:user_id"`
-}
-
-// Get invite gift records
-func NewGetInviteRecordsLogic(ctx context.Context, svcCtx *svc.ServiceContext) *GetInviteRecordsLogic {
-	return &GetInviteRecordsLogic{
-		Logger: logger.WithContext(ctx),
-		ctx:    ctx,
-		svcCtx: svcCtx,
-	}
-}
-
-func (l *GetInviteRecordsLogic) GetInviteRecords(req *types.GetInviteRecordsRequest) (resp *types.GetInviteRecordsResponse, err error) {
-	u, ok := l.ctx.Value(constant.CtxKeyUser).(*user.User)
-	if !ok {
-		l.Errorw("[GetInviteRecords] user not found in context")
-		return nil, errors.Wrapf(xerr.NewErrCode(xerr.InvalidAccess), "Invalid Access")
-	}
-
-	normalizeInviteRecordsPagination(req)
-
-	query := l.svcCtx.DB.WithContext(l.ctx).
-		Table("system_logs").
-		Where("type = ? AND object_id = ?", logmodel.TypeGift.Uint8(), u.Id).
-		Where("JSON_VALID(content) = 1").
-		Where("JSON_UNQUOTE(JSON_EXTRACT(content, '$.remark')) = ?", "邀请赠送")
-	if req.StartTime > 0 {
-		query = query.Where("created_at >= FROM_UNIXTIME(?)", req.StartTime)
-	}
-	if req.EndTime > 0 {
-		query = query.Where("created_at <= FROM_UNIXTIME(?)", req.EndTime)
-	}
-
-	var total int64
-	if err = query.Count(&total).Error; err != nil {
-		l.Errorw("[GetInviteRecords] count logs failed",
-			logger.Field("error", err.Error()),
-			logger.Field("user_id", u.Id))
-		return nil, errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), "count logs failed: %v", err.Error())
-	}
-
-	var logs []inviteRecordLog
-	if err = query.
-		Select("id, object_id, content, CAST(UNIX_TIMESTAMP(created_at) * 1000 AS SIGNED) AS created_at").
-		Order("created_at DESC, id DESC").
-		Limit(req.Size).
-		Offset((req.Page - 1) * req.Size).
-		Scan(&logs).Error; err != nil {
-		l.Errorw("[GetInviteRecords] query logs failed",
-			logger.Field("error", err.Error()),
-			logger.Field("user_id", u.Id))
-		return nil, errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), "query logs failed: %v", err.Error())
-	}
-
-	parsedLogs, orderNos := l.parseInviteRecordContents(logs)
-	if len(logs) == 0 || len(parsedLogs) == 0 {
-		return &types.GetInviteRecordsResponse{Total: total, List: []types.InviteRecord{}}, nil
-	}
-
-	orders, err := l.queryInviteRecordOrders(orderNos)
-	if err != nil {
-		l.Errorw("[GetInviteRecords] query orders failed",
-			logger.Field("error", err.Error()),
-			logger.Field("user_id", u.Id))
-		return nil, errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), "query orders failed: %v", err.Error())
-	}
-
-	list := make([]types.InviteRecord, 0, len(parsedLogs))
-	for _, parsed := range parsedLogs {
-		content := parsed.content
-		logItem := parsed.log
-		record := types.InviteRecord{
-			Role:      inviteRecordRoleInviter,
-			GiftDays:  content.Amount,
-			OrderNo:   content.OrderNo,
-			CreatedAt: logItem.CreatedAt,
-		}
-
-		if orderInfo, ok := orders[content.OrderNo]; ok {
-			peerId := orderInfo.UserId
-			if orderInfo.UserId == u.Id {
-				record.Role = inviteRecordRoleInvitee
-				peerId = u.RefererId
-			}
-			if peerId > 0 {
-				record.PeerHash = hash.InvitePeerHash(peerId)
-			}
-		}
-
-		list = append(list, record)
-	}
-
-	return &types.GetInviteRecordsResponse{
-		Total: total,
-		List:  list,
-	}, nil
-}
-
-func normalizeInviteRecordsPagination(req *types.GetInviteRecordsRequest) {
-	if req.Page < 1 {
-		req.Page = 1
-	}
-	if req.Size < 1 {
-		req.Size = 10
-	}
-	if req.Size > 100 {
-		req.Size = 100
-	}
-}
-
-func (l *GetInviteRecordsLogic) parseInviteRecordContents(logs []inviteRecordLog) ([]parsedInviteRecordLog, []string) {
-	parsedLogs := make([]parsedInviteRecordLog, 0, len(logs))
-	orderNos := make([]string, 0, len(logs))
-	for _, logItem := range logs {
-		var content inviteGiftContent
-		if err := json.Unmarshal([]byte(logItem.Content), &content); err != nil {
-			l.Infow("[GetInviteRecords] parse content failed",
-				logger.Field("error", err.Error()),
-				logger.Field("log_id", logItem.Id))
-			continue
-		}
-		parsedLogs = append(parsedLogs, parsedInviteRecordLog{log: logItem, content: content})
-		if content.OrderNo != "" {
-			orderNos = append(orderNos, content.OrderNo)
-		}
-	}
-	return parsedLogs, orderNos
-}
-
-func (l *GetInviteRecordsLogic) queryInviteRecordOrders(orderNos []string) (map[string]inviteOrderUser, error) {
-	orders := make(map[string]inviteOrderUser, len(orderNos))
-	if len(orderNos) == 0 {
-		return orders, nil
-	}
-
-	var orderData []inviteOrderUser
-	err := l.svcCtx.DB.WithContext(l.ctx).
-		Model(&ordermodel.Order{}).
-		Select("order_no, user_id").
-		Where("order_no IN ?", orderNos).
-		Scan(&orderData).Error
-	if err != nil {
-		return nil, err
-	}
-
-	for _, item := range orderData {
-		orders[item.OrderNo] = item
-	}
-	return orders, nil
-}

internal/logic/public/user/getInviteRecordsLogic_test.go

@@ -1,157 +0,0 @@
-package user
-
-import (
-	"context"
-	"fmt"
-	"strings"
-	"testing"
-
-	"github.com/DATA-DOG/go-sqlmock"
-	modeluser "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/hash"
-	"gorm.io/driver/mysql"
-	"gorm.io/gorm"
-)
-
-func TestGetInviteRecordsInviter(t *testing.T) {
-	svcCtx, mock, cleanup := newInviteRecordsTestSvc(t)
-	defer cleanup()
-
-	mock.ExpectQuery("count(*)").
-		WithArgs(34, int64(100), "邀请赠送").
-		WillReturnRows(sqlmock.NewRows([]string{"count"}).AddRow(1))
-	mock.ExpectQuery("SELECT id, object_id, content").
-		WithArgs(34, int64(100), "邀请赠送", 10).
-		WillReturnRows(sqlmock.NewRows([]string{"id", "object_id", "content", "created_at"}).
-			AddRow(1, 100, `{"order_no":"order-1","amount":7,"remark":"邀请赠送"}`, 1779934580000))
-	mock.ExpectQuery("SELECT order_no, user_id FROM `order`").
-		WithArgs("order-1").
-		WillReturnRows(sqlmock.NewRows([]string{"order_no", "user_id"}).AddRow("order-1", 200))
-
-	resp, err := NewGetInviteRecordsLogic(inviteRecordsContext(100, 0), svcCtx).GetInviteRecords(&types.GetInviteRecordsRequest{Page: 1, Size: 10})
-	if err != nil {
-		t.Fatalf("GetInviteRecords returned error: %v", err)
-	}
-	assertInviteRecordResponse(t, resp, types.InviteRecord{
-		Role:      inviteRecordRoleInviter,
-		PeerHash:  hash.InvitePeerHash(200),
-		GiftDays:  7,
-		OrderNo:   "order-1",
-		CreatedAt: 1779934580000,
-	})
-	assertInviteRecordsExpectations(t, mock)
-}
-
-func TestGetInviteRecordsInvitee(t *testing.T) {
-	svcCtx, mock, cleanup := newInviteRecordsTestSvc(t)
-	defer cleanup()
-
-	mock.ExpectQuery("count(*)").
-		WithArgs(34, int64(200), "邀请赠送").
-		WillReturnRows(sqlmock.NewRows([]string{"count"}).AddRow(1))
-	mock.ExpectQuery("SELECT id, object_id, content").
-		WithArgs(34, int64(200), "邀请赠送", 10).
-		WillReturnRows(sqlmock.NewRows([]string{"id", "object_id", "content", "created_at"}).
-			AddRow(2, 200, `{"order_no":"order-2","amount":7,"remark":"邀请赠送"}`, 1779934590000))
-	mock.ExpectQuery("SELECT order_no, user_id FROM `order`").
-		WithArgs("order-2").
-		WillReturnRows(sqlmock.NewRows([]string{"order_no", "user_id"}).AddRow("order-2", 200))
-
-	resp, err := NewGetInviteRecordsLogic(inviteRecordsContext(200, 100), svcCtx).GetInviteRecords(&types.GetInviteRecordsRequest{Page: 1, Size: 10})
-	if err != nil {
-		t.Fatalf("GetInviteRecords returned error: %v", err)
-	}
-	assertInviteRecordResponse(t, resp, types.InviteRecord{
-		Role:      inviteRecordRoleInvitee,
-		PeerHash:  hash.InvitePeerHash(100),
-		GiftDays:  7,
-		OrderNo:   "order-2",
-		CreatedAt: 1779934590000,
-	})
-	assertInviteRecordsExpectations(t, mock)
-}
-
-func TestGetInviteRecordsMissingOrderReturnsDirtyRecord(t *testing.T) {
-	svcCtx, mock, cleanup := newInviteRecordsTestSvc(t)
-	defer cleanup()
-
-	mock.ExpectQuery("count(*)").
-		WithArgs(34, int64(100), "邀请赠送").
-		WillReturnRows(sqlmock.NewRows([]string{"count"}).AddRow(1))
-	mock.ExpectQuery("SELECT id, object_id, content").
-		WithArgs(34, int64(100), "邀请赠送", 10).
-		WillReturnRows(sqlmock.NewRows([]string{"id", "object_id", "content", "created_at"}).
-			AddRow(3, 100, `{"order_no":"missing-order","amount":7,"remark":"邀请赠送"}`, 1779934600000))
-	mock.ExpectQuery("SELECT order_no, user_id FROM `order`").
-		WithArgs("missing-order").
-		WillReturnRows(sqlmock.NewRows([]string{"order_no", "user_id"}))
-
-	resp, err := NewGetInviteRecordsLogic(inviteRecordsContext(100, 0), svcCtx).GetInviteRecords(&types.GetInviteRecordsRequest{Page: 1, Size: 10})
-	if err != nil {
-		t.Fatalf("GetInviteRecords returned error: %v", err)
-	}
-	assertInviteRecordResponse(t, resp, types.InviteRecord{
-		Role:      inviteRecordRoleInviter,
-		GiftDays:  7,
-		OrderNo:   "missing-order",
-		CreatedAt: 1779934600000,
-	})
-	assertInviteRecordsExpectations(t, mock)
-}
-
-func newInviteRecordsTestSvc(t *testing.T) (*svc.ServiceContext, sqlmock.Sqlmock, func()) {
-	t.Helper()
-
-	sqlDB, mock, err := sqlmock.New(sqlmock.QueryMatcherOption(sqlmock.QueryMatcherFunc(func(expectedSQL, actualSQL string) error {
-		if strings.Contains(actualSQL, expectedSQL) {
-			return nil
-		}
-		return fmt.Errorf("actual sql %q does not contain %q", actualSQL, expectedSQL)
-	})))
-	if err != nil {
-		t.Fatalf("create sqlmock: %v", err)
-	}
-
-	db, err := gorm.Open(mysql.New(mysql.Config{Conn: sqlDB, SkipInitializeWithVersion: true}), &gorm.Config{})
-	if err != nil {
-		_ = sqlDB.Close()
-		t.Fatalf("open gorm db: %v", err)
-	}
-
-	return &svc.ServiceContext{DB: db}, mock, func() {
-		_ = sqlDB.Close()
-	}
-}
-
-func inviteRecordsContext(userId, refererId int64) context.Context {
-	return context.WithValue(context.Background(), constant.CtxKeyUser, &modeluser.User{
-		Id:        userId,
-		RefererId: refererId,
-	})
-}
-
-func assertInviteRecordResponse(t *testing.T, resp *types.GetInviteRecordsResponse, want types.InviteRecord) {
-	t.Helper()
-	if resp == nil {
-		t.Fatal("response is nil")
-	}
-	if resp.Total != 1 {
-		t.Fatalf("Total = %d, want 1", resp.Total)
-	}
-	if len(resp.List) != 1 {
-		t.Fatalf("len(List) = %d, want 1", len(resp.List))
-	}
-	if got := resp.List[0]; got != want {
-		t.Fatalf("record = %+v, want %+v", got, want)
-	}
-}
-
-func assertInviteRecordsExpectations(t *testing.T, mock sqlmock.Sqlmock) {
-	t.Helper()
-	if err := mock.ExpectationsWereMet(); err != nil {
-		t.Fatalf("unmet sql expectations: %v", err)
-	}
-}

internal/logic/public/user/getInviteSalesLogic.go

@@ -0,0 +1,145 @@
+package user
+
+import (
+	"context"
+	"fmt"
+	"hash/fnv"
+	"strconv"
+
+	"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/logger"
+	"github.com/perfect-panel/server/pkg/xerr"
+	"github.com/pkg/errors"
+)
+
+type GetInviteSalesLogic struct {
+	logger.Logger
+	ctx    context.Context
+	svcCtx *svc.ServiceContext
+}
+
+func NewGetInviteSalesLogic(ctx context.Context, svcCtx *svc.ServiceContext) *GetInviteSalesLogic {
+	return &GetInviteSalesLogic{
+		Logger: logger.WithContext(ctx),
+		ctx:    ctx,
+		svcCtx: svcCtx,
+	}
+}
+
+func (l *GetInviteSalesLogic) GetInviteSales(req *types.GetInviteSalesRequest) (resp *types.GetInviteSalesResponse, err error) {
+	// 1. Get current user
+	u, ok := l.ctx.Value(constant.CtxKeyUser).(*user.User)
+	if !ok {
+		l.Errorw("[GetInviteSales] user not found in context")
+		return nil, errors.Wrapf(xerr.NewErrCode(xerr.InvalidAccess), "Invalid Access")
+	}
+	userId := u.Id
+
+	// 2. Count total sales
+	var totalSales int64
+	db := l.svcCtx.DB.WithContext(l.ctx).
+		Table("`order` o").
+		Joins("JOIN user u ON o.user_id = u.id").
+		Where("u.referer_id = ? AND o.status IN ?", userId, []int{2, 5})
+
+	if req.StartTime > 0 {
+		db = db.Where("o.updated_at >= FROM_UNIXTIME(?)", req.StartTime)
+	}
+	if req.EndTime > 0 {
+		db = db.Where("o.updated_at <= FROM_UNIXTIME(?)", req.EndTime)
+	}
+
+	err = db.Count(&totalSales).Error
+	if err != nil {
+		l.Errorw("[GetInviteSales] count sales failed",
+			logger.Field("error", err.Error()),
+			logger.Field("user_id", userId))
+		return nil, errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError),
+			"count sales failed: %v", err.Error())
+	}
+
+	// 3. Pagination
+	if req.Page < 1 {
+		req.Page = 1
+	}
+	if req.Size < 1 {
+		req.Size = 10
+	}
+	if req.Size > 100 {
+		req.Size = 100
+	}
+	offset := (req.Page - 1) * req.Size
+
+	// 4. Get sales data
+	type OrderWithUser struct {
+		Amount      int64  `gorm:"column:amount"`
+		UpdatedAt   int64  `gorm:"column:updated_at"`
+		UserId      int64  `gorm:"column:user_id"`
+		ProductName string `gorm:"column:product_name"`
+		Quantity    int64  `gorm:"column:quantity"`
+	}
+
+	var orderData []OrderWithUser
+	query := l.svcCtx.DB.WithContext(l.ctx).
+		Table("`order` o").
+		Select("o.amount, CAST(UNIX_TIMESTAMP(o.updated_at) * 1000 AS SIGNED) as updated_at, u.id as user_id, s.name as product_name, o.quantity").
+		Joins("JOIN user u ON o.user_id = u.id").
+		Joins("LEFT JOIN subscribe s ON o.subscribe_id = s.id").
+		Where("u.referer_id = ? AND o.status IN ?", userId, []int{2, 5}) // status 2: Active, 5: Finished
+
+	if req.StartTime > 0 {
+		query = query.Where("o.updated_at >= FROM_UNIXTIME(?)", req.StartTime)
+	}
+	if req.EndTime > 0 {
+		query = query.Where("o.updated_at <= FROM_UNIXTIME(?)", req.EndTime)
+	}
+
+	err = query.Order("o.updated_at DESC").
+		Limit(req.Size).
+		Offset(offset).
+		Scan(&orderData).Error
+	if err != nil {
+		l.Errorw("[GetInviteSales] query sales failed",
+			logger.Field("error", err.Error()),
+			logger.Field("user_id", userId))
+		return nil, errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError),
+			"query sales failed: %v", err.Error())
+	}
+
+	// 5. Get sales list
+	const HashSalt = "ppanel_invite_sales_v1" // Fixed Key
+	var list []types.InvitedUserSale
+	for _, order := range orderData {
+		// Calculate unique numeric hash (FNV-64a)
+		h := fnv.New64a()
+		h.Write([]byte(HashSalt))
+		h.Write([]byte(strconv.FormatInt(order.UserId, 10)))
+		// Truncate to 10 digits using modulo 10^10
+		hashVal := h.Sum64() % 10000000000
+		userHashStr := fmt.Sprintf("%010d", hashVal)
+
+		// Format product name: prefer subscribe name, fallback to quantity-based label
+		productName := order.ProductName
+		if productName == "" {
+			productName = fmt.Sprintf("%d天VPN服务", order.Quantity)
+			if order.Quantity <= 0 {
+				productName = "VPN服务"
+			}
+		}
+
+		list = append(list, types.InvitedUserSale{
+			Amount:      float64(order.Amount) / 100.0, // Convert cents to dollars
+			UpdatedAt:   order.UpdatedAt,
+			UserHash:    userHashStr,
+			ProductName: productName,
+		})
+	}
+
+	return &types.GetInviteSalesResponse{
+		Total: totalSales,
+		List:  list,
+	}, nil
+}

internal/logic/server/getServerUserListLogic.go

@@ -307,24 +307,14 @@ func (l *GetServerUserListLogic) canUseExpiredNodeGroup(userSub *user.Subscribe,
 
 // calculateEffectiveSpeedLimit 计算用户的实际限速值（考虑按量限速规则）
 func (l *GetServerUserListLogic) calculateEffectiveSpeedLimit(sub *subscribe.Subscribe, userSub *user.Subscribe) int64 {
-	baseSpeed := sub.SpeedLimit
-	if userSub.SpeedLimit > 0 {
-		baseSpeed = userSub.SpeedLimit
-	}
-
-	trafficLimit := sub.TrafficLimit
-	if userSub.TrafficLimit != nil && *userSub.TrafficLimit != "" {
-		trafficLimit = *userSub.TrafficLimit
-	}
-
 	result := speedlimit.CalculateWithCache(
 		l.ctx.Request.Context(),
 		l.svcCtx.Redis,
 		l.svcCtx.DB,
 		userSub.UserId,
 		userSub.Id,
-		baseSpeed,
-		trafficLimit,
+		sub.SpeedLimit,
+		sub.TrafficLimit,
 		30*time.Second,
 	)
 	return result.EffectiveSpeed

internal/model/promo/model.go

@@ -81,15 +81,7 @@ func (m *defaultPromoModel) FindRule(ctx context.Context, id int64) (*Rule, erro
 }
 
 func (m *defaultPromoModel) UpdateRule(ctx context.Context, data *Rule) error {
-	return m.db.WithContext(ctx).Model(&Rule{}).Where("id = ?", data.Id).Updates(map[string]interface{}{
-		"name":       data.Name,
-		"type":       data.Type,
-		"params":     data.Params,
-		"priority":   data.Priority,
-		"enabled":    data.Enabled,
-		"start_time": data.StartTime,
-		"end_time":   data.EndTime,
-	}).Error
+	return m.db.WithContext(ctx).Save(data).Error
 }
 
 func (m *defaultPromoModel) DeleteRule(ctx context.Context, id int64) error {
@@ -137,10 +129,7 @@ func (m *defaultPromoModel) UpsertPrices(ctx context.Context, ruleId int64, item
 				return err
 			}
 			if errors.Is(err, gorm.ErrRecordNotFound) {
-				if err := tx.Create(item).Error; err != nil {
-					return err
-				}
-				continue
+				return tx.Create(item).Error
 			}
 			existing.Quantity = item.Quantity
 			existing.PromoPrice = item.PromoPrice

internal/model/promo/promo.go

@@ -33,7 +33,7 @@ func (Rule) TableName() string {
 type SubscribePromo struct {
 	Id          int64     `gorm:"primaryKey"`
 	SubscribeId int64     `gorm:"type:bigint unsigned;not null;comment:Subscribe ID"`
-	Quantity    int64     `gorm:"type:int;not null;default:0;comment:购买数量"`
+	Quantity    int64     `gorm:"type:bigint;not null;default:1;comment:Quantity"`
 	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"`

internal/model/user/model.go

@@ -23,27 +23,25 @@ const (
 )
 
 type SubscribeDetails struct {
-	Id           int64                `gorm:"primarykey"`
-	UserId       int64                `gorm:"index:idx_user_id;not null;comment:User ID"`
-	User         *User                `gorm:"foreignKey:UserId;references:Id"`
-	OrderId      int64                `gorm:"index:idx_order_id;not null;comment:Order ID"`
-	SubscribeId  int64                `gorm:"index:idx_subscribe_id;not null;comment:Subscription ID"`
-	Subscribe    *subscribe.Subscribe `gorm:"foreignKey:SubscribeId;references:Id"`
-	NodeGroupId  int64                `gorm:"index:idx_node_group_id;not null;default:0;comment:Node Group ID (single ID)"`
-	StartTime    time.Time            `gorm:"default:CURRENT_TIMESTAMP(3);not null;comment:Subscription Start Time"`
-	ExpireTime   time.Time            `gorm:"default:NULL;comment:Subscription Expire Time"`
-	FinishedAt   *time.Time           `gorm:"default:NULL;comment:Finished Time"`
-	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 uses plan-level"`
-	TrafficLimit *string              `gorm:"type:text;default:null;comment:User-level traffic limit override (JSON), NULL uses plan-level"`
-	Token        string               `gorm:"index:idx_token;unique;type:varchar(255);default:'';comment:Token"`
-	UUID         string               `gorm:"type:varchar(255);unique;index:idx_uuid;default:'';comment:UUID"`
-	Status       uint8                `gorm:"type:tinyint(1);default:0;comment:Subscription Status: 0: Pending 1: Active 2: Finished 3: Expired; 4: Cancelled"`
-	Note         string               `gorm:"type:varchar(500);default:'';comment:User note for subscription"`
-	CreatedAt    time.Time            `gorm:"<-:create;comment:Creation Time"`
-	UpdatedAt    time.Time            `gorm:"comment:Update Time"`
+	Id          int64                `gorm:"primarykey"`
+	UserId      int64                `gorm:"index:idx_user_id;not null;comment:User ID"`
+	User        *User                `gorm:"foreignKey:UserId;references:Id"`
+	OrderId     int64                `gorm:"index:idx_order_id;not null;comment:Order ID"`
+	SubscribeId int64                `gorm:"index:idx_subscribe_id;not null;comment:Subscription ID"`
+	Subscribe   *subscribe.Subscribe `gorm:"foreignKey:SubscribeId;references:Id"`
+	NodeGroupId int64                `gorm:"index:idx_node_group_id;not null;default:0;comment:Node Group ID (single ID)"`
+	StartTime   time.Time            `gorm:"default:CURRENT_TIMESTAMP(3);not null;comment:Subscription Start Time"`
+	ExpireTime  time.Time            `gorm:"default:NULL;comment:Subscription Expire Time"`
+	FinishedAt  *time.Time           `gorm:"default:NULL;comment:Finished Time"`
+	Traffic     int64                `gorm:"default:0;comment:Traffic"`
+	Download    int64                `gorm:"default:0;comment:Download Traffic"`
+	Upload      int64                `gorm:"default:0;comment:Upload Traffic"`
+	Token       string               `gorm:"index:idx_token;unique;type:varchar(255);default:'';comment:Token"`
+	UUID        string               `gorm:"type:varchar(255);unique;index:idx_uuid;default:'';comment:UUID"`
+	Status      uint8                `gorm:"type:tinyint(1);default:0;comment:Subscription Status: 0: Pending 1: Active 2: Finished 3: Expired; 4: Cancelled"`
+	Note        string               `gorm:"type:varchar(500);default:'';comment:User note for subscription"`
+	CreatedAt   time.Time            `gorm:"<-:create;comment:Creation Time"`
+	UpdatedAt   time.Time            `gorm:"comment:Update Time"`
 }
 
 type SubscribeLogFilterParams struct {

internal/model/user/user.go

@@ -101,10 +101,10 @@ 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)"`
-	SpeedLimit      int64      `gorm:"default:0;comment:User-level speed limit override (Mbps), 0 uses plan-level"`
-	TrafficLimit    *string    `gorm:"type:text;default:null;comment:User-level traffic limit override (JSON), NULL uses plan-level"`
 	Token           string     `gorm:"index:idx_token;unique;type:varchar(255);default:'';comment:Token"`
 	UUID            string     `gorm:"type:varchar(255);unique;index:idx_uuid;default:'';comment:UUID"`
 	Status          uint8      `gorm:"type:tinyint(1);default:0;comment:Subscription Status: 0: Pending 1: Active 2: Finished 3: Expired 4: Deducted 5: stopped"`

internal/types/promo_validation_test.go

@@ -1,58 +0,0 @@
-package types
-
-import (
-	"testing"
-
-	"github.com/go-playground/validator/v10"
-)
-
-func TestPromoPriceItemsMustNotBeEmpty(t *testing.T) {
-	validate := validator.New()
-	req := SetPromoPriceRequest{
-		PromoRuleId: 1,
-		Items:       []PromoPriceItem{},
-	}
-
-	if err := validate.Struct(req); err == nil {
-		t.Fatal("expected empty promo price items to fail validation")
-	}
-}
-
-func TestPromoListPageSizeLimit(t *testing.T) {
-	validate := validator.New()
-	tests := []struct {
-		name string
-		req  any
-	}{
-		{
-			name: "rule list",
-			req: GetPromoRuleListRequest{
-				Page: 1,
-				Size: 201,
-			},
-		},
-		{
-			name: "price list",
-			req: GetPromoPriceListRequest{
-				PromoRuleId: 1,
-				Page:        1,
-				Size:        201,
-			},
-		},
-		{
-			name: "usage list",
-			req: GetPromoUsageListRequest{
-				Page: 1,
-				Size: 201,
-			},
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			if err := validate.Struct(tt.req); err == nil {
-				t.Fatal("expected page size greater than 200 to fail validation")
-			}
-		})
-	}
-}

internal/types/types.go

@@ -1147,8 +1147,8 @@ type GetCouponListResponse struct {
 
 type GetPromoPriceListRequest struct {
 	PromoRuleId int64 `form:"promo_rule_id" validate:"required,gt=0"`
-	Page        int64 `form:"page" validate:"required,gt=0"`
-	Size        int64 `form:"size" validate:"required,gt=0,lte=200"`
+	Page        int64 `form:"page" validate:"required"`
+	Size        int64 `form:"size" validate:"required"`
 }
 
 type GetPromoPriceListResponse struct {
@@ -1161,8 +1161,8 @@ type GetPromoRuleDetailRequest struct {
 }
 
 type GetPromoRuleListRequest struct {
-	Page    int64  `form:"page" validate:"required,gt=0"`
-	Size    int64  `form:"size" validate:"required,gt=0,lte=200"`
+	Page    int64  `form:"page" validate:"required"`
+	Size    int64  `form:"size" validate:"required"`
 	Type    string `form:"type" validate:"omitempty,oneof=new_user inactive_user campaign"`
 	Enabled *bool  `form:"enabled"`
 	Search  string `form:"search,omitempty"`
@@ -1174,8 +1174,8 @@ type GetPromoRuleListResponse struct {
 }
 
 type GetPromoUsageListRequest struct {
-	Page        int64  `form:"page" validate:"required,gt=0"`
-	Size        int64  `form:"size" validate:"required,gt=0,lte=200"`
+	Page        int64  `form:"page" validate:"required"`
+	Size        int64  `form:"size" validate:"required"`
 	RuleId      int64  `form:"rule_id,omitempty"`
 	UserId      int64  `form:"user_id,omitempty"`
 	SubscribeId int64  `form:"subscribe_id,omitempty"`
@@ -1327,16 +1327,16 @@ type GetGroupHistoryResponse struct {
 	List  []GroupHistory `json:"list"`
 }
 
-type GetInviteRecordsRequest struct {
+type GetInviteSalesRequest struct {
 	Page      int   `form:"page"`
 	Size      int   `form:"size"`
 	StartTime int64 `form:"start_time"`
 	EndTime   int64 `form:"end_time"`
 }
 
-type GetInviteRecordsResponse struct {
-	Total int64          `json:"total"`
-	List  []InviteRecord `json:"list"`
+type GetInviteSalesResponse struct {
+	Total int64             `json:"total"`
+	List  []InvitedUserSale `json:"list"`
 }
 
 type GetLoginLogRequest struct {
@@ -1768,12 +1768,11 @@ type InviteConfig struct {
 	GiftDays           int64 `json:"gift_days"`
 }
 
-type InviteRecord struct {
-	Role      string `json:"role"`
-	PeerHash  string `json:"peer_hash"`
-	GiftDays  int64  `json:"gift_days"`
-	OrderNo   string `json:"order_no"`
-	CreatedAt int64  `json:"created_at"`
+type InvitedUserSale struct {
+	Amount      float64 `json:"amount"`
+	UpdatedAt   int64   `json:"updated_at"`
+	UserHash    string  `json:"user_hash"`
+	ProductName string  `json:"product_name"`
 }
 
 type KickOfflineRequest struct {
@@ -2881,6 +2880,7 @@ 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"`
@@ -2941,11 +2941,10 @@ type SubscribeConfig struct {
 }
 
 type SubscribeDiscount struct {
-	Quantity    int64           `json:"quantity"`
-	Discount    float64         `json:"discount"`
-	NewUserOnly bool            `json:"new_user_only"`
-	MapApple    string          `json:"map_apple"`
-	Promo       *SubscribePromo `json:"promo"`
+	Quantity    int64   `json:"quantity"`
+	Discount    float64 `json:"discount"`
+	NewUserOnly bool    `json:"new_user_only"`
+	MapApple    string  `json:"map_apple"`
 }
 
 type SubscribeGroup struct {
@@ -3224,7 +3223,7 @@ type UpdateCouponRequest struct {
 
 type SetPromoPriceRequest struct {
 	PromoRuleId int64            `json:"promo_rule_id" validate:"required,gt=0"`
-	Items       []PromoPriceItem `json:"items" validate:"required,min=1,dive"`
+	Items       []PromoPriceItem `json:"items" validate:"required,dive"`
 }
 
 type DeletePromoPriceRequest struct {
@@ -3443,7 +3442,7 @@ type UpdateUserSubscribeRequest struct {
 	ExpiredAt       int64   `json:"expired_at"`
 	Upload          int64   `json:"upload"`
 	Download        int64   `json:"download"`
-	SpeedLimit      *int64  `json:"speed_limit,omitempty" validate:"omitempty,gte=0"`
+	SpeedLimit      *int64  `json:"speed_limit,omitempty"`
 	TrafficLimit    *string `json:"traffic_limit,omitempty"`
 }
 
@@ -3801,25 +3800,17 @@ type GetAdminUserInviteStatsResponse struct {
 }
 
 type GetAdminUserInviteListRequest struct {
-	UserId       int64  `form:"user_id" validate:"required"`
-	Page         int    `form:"page"`
-	Size         int    `form:"size"`
-	Search       string `form:"search"`
-	Enable       *int   `form:"enable"`
-	UserIdSearch int64  `form:"user_id_search"`
+	UserId int64 `form:"user_id" validate:"required"`
+	Page   int   `form:"page"`
+	Size   int   `form:"size"`
 }
 
 type AdminInvitedUser struct {
-	Id                int64  `json:"id"`
-	Avatar            string `json:"avatar"`
-	Identifier        string `json:"identifier"`
-	Enable            bool   `json:"enable"`
-	CreatedAt         int64  `json:"created_at"`
-	OrderCount        int64  `json:"order_count"`
-	HasPurchased      bool   `json:"has_purchased"`
-	InviterCommission int64  `json:"inviter_commission"`
-	InviterGiftDays   int64  `json:"inviter_gift_days"`
-	InviteeGiftDays   int64  `json:"invitee_gift_days"`
+	Id         int64  `json:"id"`
+	Avatar     string `json:"avatar"`
+	Identifier string `json:"identifier"`
+	Enable     bool   `json:"enable"`
+	CreatedAt  int64  `json:"created_at"`
 }
 
 type GetAdminUserInviteListResponse struct {
@@ -3827,34 +3818,6 @@ type GetAdminUserInviteListResponse struct {
 	List  []AdminInvitedUser `json:"list"`
 }
 
-type GetInviteManageListRequest struct {
-	Page      int    `form:"page"`
-	Size      int    `form:"size"`
-	Search    string `form:"search"`
-	InviterId int64  `form:"inviter_id"`
-	InviteeId int64  `form:"invitee_id"`
-}
-
-type InviteManageRecord struct {
-	InviterId         int64  `json:"inviter_id"`
-	InviterIdentifier string `json:"inviter_identifier"`
-	InviteeId         int64  `json:"invitee_id"`
-	InviteeIdentifier string `json:"invitee_identifier"`
-	InviteeAvatar     string `json:"invitee_avatar"`
-	InviteeEnable     bool   `json:"invitee_enable"`
-	InvitedAt         int64  `json:"invited_at"`
-	OrderCount        int64  `json:"order_count"`
-	HasPurchased      bool   `json:"has_purchased"`
-	InviterCommission int64  `json:"inviter_commission"`
-	InviterGiftDays   int64  `json:"inviter_gift_days"`
-	InviteeGiftDays   int64  `json:"invitee_gift_days"`
-}
-
-type GetInviteManageListResponse struct {
-	Total int64                `json:"total"`
-	List  []InviteManageRecord `json:"list"`
-}
-
 type GetLogMessageRawRequest struct {
 	Id int64 `form:"id" validate:"required"`
 }

node.json

@@ -3680,9 +3680,6 @@
         "discount": {
           "type": "number",
           "format": "double"
-        },
-        "promo": {
-          "$ref": "#/definitions/SubscribePromo"
         }
       },
       "title": "SubscribeDiscount",

pkg/hash/hash.go

@@ -3,26 +3,15 @@ package hash
 import (
 	"crypto/md5"
 	"fmt"
-	"hash/fnv"
-	"strconv"
 
 	"github.com/spaolacci/murmur3"
 )
 
-const invitePeerHashSalt = "ppanel_invite_" + "sales_v1"
-
 // Hash returns the hash value of data.
 func Hash(data []byte) uint64 {
 	return murmur3.Sum64(data)
 }
 
-func InvitePeerHash(userId int64) string {
-	h := fnv.New64a()
-	_, _ = h.Write([]byte(invitePeerHashSalt))
-	_, _ = h.Write([]byte(strconv.FormatInt(userId, 10)))
-	return fmt.Sprintf("%010d", h.Sum64()%10000000000)
-}
-
 // Md5 returns the md5 bytes of data.
 func Md5(data []byte) []byte {
 	digest := md5.New()

queue/logic/order/activateOrderLogic.go

@@ -149,20 +149,7 @@ func (l *ActivateOrderLogic) ProcessTask(ctx context.Context, task *asynq.Task)
 		return err
 	}
 
-	if err = l.recordPromoUsage(ctx, orderInfo); err != nil {
-		if releaseErr := l.releaseClaim(ctx, orderInfo.OrderNo); releaseErr != nil {
-			logger.WithContext(ctx).Error("[ActivateOrderLogic] releaseClaim also failed, stuck recovery will handle",
-				logger.Field("order_no", orderInfo.OrderNo),
-				logger.Field("release_error", releaseErr.Error()),
-			)
-		}
-		logger.WithContext(ctx).Error("[ActivateOrderLogic] 促销使用记录写入失败，将重试",
-			logger.Field("order_no", orderInfo.OrderNo),
-			logger.Field("promo_rule_id", orderInfo.PromoRuleId),
-			logger.Field("error", err.Error()),
-		)
-		return err
-	}
+	l.recordPromoUsage(ctx, orderInfo)
 	l.finalizeCouponAndOrder(ctx, orderInfo)
 
 	commonLogic.SubscriptionTraceInfo(logger.WithContext(ctx), commonLogic.SubscriptionTraceFlowOrder, "activation_finished",
@@ -172,9 +159,9 @@ func (l *ActivateOrderLogic) ProcessTask(ctx context.Context, task *asynq.Task)
 	return nil
 }
 
-func (l *ActivateOrderLogic) recordPromoUsage(ctx context.Context, orderInfo *order.Order) error {
+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 nil
+		return
 	}
 
 	promoPrice := int64(0)
@@ -182,10 +169,10 @@ func (l *ActivateOrderLogic) recordPromoUsage(ctx context.Context, orderInfo *or
 		promoPrice = (orderInfo.Price - orderInfo.PromoDiscount) / orderInfo.Quantity
 	}
 	if promoPrice <= 0 {
-		return nil
+		return
 	}
 
-	return l.svc.DB.WithContext(ctx).Transaction(func(tx *gorm.DB) error {
+	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
@@ -201,6 +188,13 @@ func (l *ActivateOrderLogic) recordPromoUsage(ctx context.Context, orderInfo *or
 			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

user.json

@@ -1183,15 +1183,15 @@
         ]
       }
     },
-    "/v1/public/user/invite_records": {
+    "/v1/public/user/invite_sales": {
       "get": {
-        "summary": "Get Invite Records",
-        "operationId": "GetInviteRecords",
+        "summary": "Get Invite Sales",
+        "operationId": "GetInviteSales",
         "responses": {
           "200": {
             "description": "A successful response.",
             "schema": {
-              "$ref": "#/definitions/GetInviteRecordsResponse"
+              "$ref": "#/definitions/GetInviteSalesResponse"
             }
           }
         },
@@ -3166,7 +3166,7 @@
         "connection_records"
       ]
     },
-    "GetInviteRecordsRequest": {
+    "GetInviteSalesRequest": {
       "type": "object",
       "properties": {
         "page": {
@@ -3186,7 +3186,7 @@
           "format": "int64"
         }
       },
-      "title": "GetInviteRecordsRequest",
+      "title": "GetInviteSalesRequest",
       "required": [
         "page",
         "size",
@@ -3194,7 +3194,7 @@
         "end_time"
       ]
     },
-    "GetInviteRecordsResponse": {
+    "GetInviteSalesResponse": {
       "type": "object",
       "properties": {
         "total": {
@@ -3204,11 +3204,11 @@
         "list": {
           "type": "array",
           "items": {
-            "$ref": "#/definitions/InviteRecord"
+            "$ref": "#/definitions/InvitedUserSale"
           }
         }
       },
-      "title": "GetInviteRecordsResponse",
+      "title": "GetInviteSalesResponse",
       "required": [
         "total",
         "list"
@@ -3558,34 +3558,30 @@
         "gift_days"
       ]
     },
-    "InviteRecord": {
+    "InvitedUserSale": {
       "type": "object",
       "properties": {
-        "role": {
-          "type": "string"
+        "amount": {
+          "type": "number",
+          "format": "double"
         },
-        "peer_hash": {
-          "type": "string"
-        },
-        "gift_days": {
+        "updated_at": {
           "type": "integer",
           "format": "int64"
         },
-        "order_no": {
+        "user_hash": {
           "type": "string"
         },
-        "created_at": {
-          "type": "integer",
-          "format": "int64"
+        "product_name": {
+          "type": "string"
         }
       },
-      "title": "InviteRecord",
+      "title": "InvitedUserSale",
       "required": [
-        "role",
-        "peer_hash",
-        "gift_days",
-        "order_no",
-        "created_at"
+        "amount",
+        "updated_at",
+        "user_hash",
+        "product_name"
       ]
     },
     "MessageLog": {
@@ -5904,9 +5900,6 @@
         "discount": {
           "type": "number",
           "format": "double"
-        },
-        "promo": {
-          "$ref": "#/definitions/SubscribePromo"
         }
       },
       "title": "SubscribeDiscount",