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

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

apis/admin/promo.api

@@ -1,121 +0,0 @@
-syntax = "v1"
-
-info (
-	title:   "promo admin API"
-	desc:    "API for ppanel"
-	author:  "Tension"
-	email:   "tension@ppanel.com"
-	version: "0.0.1"
-)
-
-import "../types.api"
-
-type (
-	CreatePromoRuleRequest {
-		Name      string                 `json:"name" validate:"required,max=100"`
-		Type      string                 `json:"type" validate:"required,oneof=new_user inactive_user campaign"`
-		Params    map[string]interface{} `json:"params"`
-		Priority  int64                  `json:"priority" validate:"gte=0"`
-		Enabled   *bool                  `json:"enabled"`
-		StartTime *int64                 `json:"start_time"`
-		EndTime   *int64                 `json:"end_time"`
-	}
-	UpdatePromoRuleRequest {
-		Id        int64                  `uri:"id" validate:"required,gt=0"`
-		Name      string                 `json:"name" validate:"required,max=100"`
-		Type      string                 `json:"type" validate:"required,oneof=new_user inactive_user campaign"`
-		Params    map[string]interface{} `json:"params"`
-		Priority  int64                  `json:"priority" validate:"gte=0"`
-		Enabled   *bool                  `json:"enabled"`
-		StartTime *int64                 `json:"start_time"`
-		EndTime   *int64                 `json:"end_time"`
-	}
-	GetPromoRuleDetailRequest {
-		Id int64 `uri:"id" validate:"required,gt=0"`
-	}
-	DeletePromoRuleRequest {
-		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"`
-		Type    string `form:"type" validate:"omitempty,oneof=new_user inactive_user campaign"`
-		Enabled *bool  `form:"enabled"`
-		Search  string `form:"search,omitempty"`
-	}
-	GetPromoRuleListResponse {
-		Total int64       `json:"total"`
-		List  []PromoRule `json:"list"`
-	}
-	SetPromoPriceRequest {
-		PromoRuleId int64            `json:"promo_rule_id" validate:"required,gt=0"`
-		Items       []PromoPriceItem `json:"items" validate:"required,min=1,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"`
-	}
-	GetPromoPriceListResponse {
-		Total int64        `json:"total"`
-		List  []PromoPrice `json:"list"`
-	}
-	DeletePromoPriceRequest {
-		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"`
-		RuleId      int64  `form:"rule_id,omitempty"`
-		UserId      int64  `form:"user_id,omitempty"`
-		SubscribeId int64  `form:"subscribe_id,omitempty"`
-		OrderNo     string `form:"order_no,omitempty"`
-	}
-	GetPromoUsageListResponse {
-		Total int64        `json:"total"`
-		List  []PromoUsage `json:"list"`
-	}
-)
-
-@server (
-	prefix:     v1/admin/promo
-	group:      admin/promo
-	middleware: AuthMiddleware
-)
-service ppanel {
-	@doc "Create promo rule"
-	@handler CreateRule
-	post /rule (CreatePromoRuleRequest) returns (PromoRule)
-
-	@doc "Get promo rule list"
-	@handler GetRuleList
-	get /rule/list (GetPromoRuleListRequest) returns (GetPromoRuleListResponse)
-
-	@doc "Get promo rule detail"
-	@handler GetRuleDetail
-	get /rule/:id (GetPromoRuleDetailRequest) returns (PromoRule)
-
-	@doc "Update promo rule"
-	@handler UpdateRule
-	put /rule/:id (UpdatePromoRuleRequest) returns (PromoRule)
-
-	@doc "Delete promo rule"
-	@handler DeleteRule
-	delete /rule/:id (DeletePromoRuleRequest)
-
-	@doc "Set promo prices"
-	@handler SetPrice
-	post /price (SetPromoPriceRequest)
-
-	@doc "Get promo price list"
-	@handler GetPriceList
-	get /price/list (GetPromoPriceListRequest) returns (GetPromoPriceListResponse)
-
-	@doc "Delete promo price"
-	@handler DeletePrice
-	delete /price/:id (DeletePromoPriceRequest)
-
-	@doc "Get promo usage list"
-	@handler GetUsageList
-	get /usage/list (GetPromoUsageListRequest) returns (GetPromoUsageListResponse)
-}

apis/admin/user.api

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

apis/public/file.api

@@ -16,7 +16,13 @@ type (
 	}
 
 	FileUploadResponse {
-		Url string `json:"url"`
+		FileId      string `json:"file_id"`
+		FileName    string `json:"file_name"`
+		ObjectKey   string `json:"object_key"`
+		Size        int64  `json:"size"`
+		ContentType string `json:"content_type"`
+		Etag        string `json:"etag"`
+		Status      string `json:"status"`
 	}
 
 	FileUploadInitRequest {
@@ -41,7 +47,12 @@ type (
 	}
 
 	FileUploadCompleteResponse {
-		Url string `json:"url"`
+		FileId      string `json:"file_id"`
+		ObjectKey   string `json:"object_key"`
+		Size        int64  `json:"size"`
+		ContentType string `json:"content_type"`
+		Etag        string `json:"etag"`
+		Status      string `json:"status"`
 	}
 )
 

apis/types.api

@@ -171,13 +171,13 @@ type (
 		DeviceLimit             int64  `json:"device_limit"`
 	}
 	VerifyConfig {
-		CaptchaType                    string `json:"captcha_type"` // local or turnstile
-		TurnstileSiteKey               string `json:"turnstile_site_key"`
-		TurnstileSecret                string `json:"turnstile_secret"`
-		EnableUserLoginCaptcha         bool   `json:"enable_user_login_captcha"` // User login captcha
-		EnableUserRegisterCaptcha      bool   `json:"enable_user_register_captcha"` // User register captcha
-		EnableAdminLoginCaptcha        bool   `json:"enable_admin_login_captcha"` // Admin login captcha
-		EnableUserResetPasswordCaptcha bool   `json:"enable_user_reset_password_captcha"` // User reset password captcha
+		CaptchaType                   string `json:"captcha_type"`                      // local or turnstile
+		TurnstileSiteKey              string `json:"turnstile_site_key"`
+		TurnstileSecret               string `json:"turnstile_secret"`
+		EnableUserLoginCaptcha        bool   `json:"enable_user_login_captcha"`         // User login captcha
+		EnableUserRegisterCaptcha     bool   `json:"enable_user_register_captcha"`      // User register captcha
+		EnableAdminLoginCaptcha       bool   `json:"enable_admin_login_captcha"`        // Admin login captcha
+		EnableUserResetPasswordCaptcha bool  `json:"enable_user_reset_password_captcha"` // User reset password captcha
 	}
 	NodeConfig {
 		NodeSecret             string         `json:"node_secret"`
@@ -229,48 +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"`
-		SubscribeId int64 `json:"subscribe_id"`
-		PromoRuleId int64 `json:"promo_rule_id"`
-		Quantity    int64 `json:"quantity"`
-		PromoPrice  int64 `json:"promo_price"`
-		CreatedAt   int64 `json:"created_at"`
-		UpdatedAt   int64 `json:"updated_at"`
-	}
-	PromoPriceItem {
-		SubscribeId int64 `json:"subscribe_id" validate:"required,gt=0"`
-		Quantity    int64 `json:"quantity" validate:"required,gt=0,lte=1000"`
-		PromoPrice  int64 `json:"promo_price" validate:"required,gt=0"`
-	}
-	PromoRule {
-		Id        int64                  `json:"id"`
-		Name      string                 `json:"name"`
-		Type      string                 `json:"type"`
-		Params    map[string]interface{} `json:"params"`
-		Priority  int64                  `json:"priority"`
-		Enabled   bool                   `json:"enabled"`
-		StartTime *int64                 `json:"start_time"`
-		EndTime   *int64                 `json:"end_time"`
-		CreatedAt int64                  `json:"created_at"`
-		UpdatedAt int64                  `json:"updated_at"`
-	}
-	PromoUsage {
-		Id          int64  `json:"id"`
-		UserId      int64  `json:"user_id"`
-		PromoRuleId int64  `json:"promo_rule_id"`
-		SubscribeId int64  `json:"subscribe_id"`
-		OrderNo     string `json:"order_no"`
-		PromoPrice  int64  `json:"promo_price"`
-		CreatedAt   int64  `json:"created_at"`
-	}
-	SubscribePromo {
-		RuleName   string `json:"rule_name"`
-		RuleType   string `json:"rule_type"`
-		PromoPrice int64  `json:"promo_price"`
-		ExpiresAt  int64  `json:"expires_at"`
 	}
 	TrafficLimit {
 		StatType     string `json:"stat_type"`
@@ -578,35 +536,6 @@ type (
 		CreatedAt              int64     `json:"created_at"`
 		UpdatedAt              int64     `json:"updated_at"`
 	}
-	UserSubscribeDetail {
-		Id             int64          `json:"id"`
-		UserId         int64          `json:"user_id"`
-		User           User           `json:"user"`
-		OrderId        int64          `json:"order_id"`
-		SubscribeId    int64          `json:"subscribe_id"`
-		Subscribe      Subscribe      `json:"subscribe"`
-		NodeGroupId    int64          `json:"node_group_id"`
-		NodeGroupName  string         `json:"node_group_name"`
-		GroupLocked    bool           `json:"group_locked"`
-		StartTime      int64          `json:"start_time"`
-		ExpireTime     int64          `json:"expire_time"`
-		ResetTime      int64          `json:"reset_time"`
-		Traffic        int64          `json:"traffic"`
-		Download       int64          `json:"download"`
-		Upload         int64          `json:"upload"`
-		SpeedLimit     int64          `json:"speed_limit"`
-		TrafficLimit   []TrafficLimit `json:"user_traffic_limit"`
-		PlanSpeedLimit int64          `json:"plan_speed_limit"`
-		Token          string         `json:"token"`
-		Status         uint8          `json:"status"`
-		EffectiveSpeed int64          `json:"effective_speed"`
-		IsThrottled    bool           `json:"is_throttled"`
-		ThrottleRule   string         `json:"throttle_rule,omitempty"`
-		ThrottleStart  int64          `json:"throttle_start,omitempty"`
-		ThrottleEnd    int64          `json:"throttle_end,omitempty"`
-		CreatedAt      int64          `json:"created_at"`
-		UpdatedAt      int64          `json:"updated_at"`
-	}
 	UserAffiliate {
 		Avatar       string `json:"avatar"`
 		Identifier   string `json:"identifier"`
@@ -750,7 +679,6 @@ type (
 		Price          int64  `json:"price"`
 		Amount         int64  `json:"amount"`
 		Discount       int64  `json:"discount"`
-		PromoDiscount  int64  `json:"promo_discount"`
 		GiftAmount     int64  `json:"gift_amount"`
 		Coupon         string `json:"coupon"`
 		CouponDiscount int64  `json:"coupon_discount"`

common.json

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

doc/api-withdrawal-and-log.md

@@ -1,560 +0,0 @@
-# 提现 & 文件上传 & 日志上报 — 用户端 API 接口文档
-
-> 基于 ppanel-server 源码整理，所有时间戳均为**秒级 Unix**。
-
----
-
-## 目录
-
-- [一、提现接口](#一提现接口)
-  - [1.1 申请提现](#11-申请提现)
-  - [1.2 取消提现](#12-取消提现)
-  - [1.3 查询提现记录](#13-查询提现记录)
-- [二、枚举值与状态流转](#二枚举值与状态流转)
-- [三、文件上传接口](#三文件上传接口)
-  - [3.1 直传文件（小文件）](#31-直传文件小文件)
-  - [3.2 初始化上传（大文件 — 预签名）](#32-初始化上传大文件--预签名)
-  - [3.3 确认上传完成](#33-确认上传完成)
-- [四、日志查询接口 (Admin)](#四日志查询接口-admin)
-  - [4.1 错误日志列表](#41-错误日志列表)
-  - [4.2 错误日志详情](#42-错误日志详情)
-  - [4.3 日志消息原始详情](#43-日志消息原始详情)
-
----
-
-## 一、提现接口
-
-> 认证方式: JWT（用户登录态）
->
-> 路由前缀: `/v1/public/user`
-
-### 1.1 申请提现
-
-提交佣金提现申请，创建一条待审核的提现记录。
-
-```
-POST /v1/public/user/commission_withdraw
-```
-
-**Request Body**
-
-| 字段 | 类型 | 必填 | 校验 | 说明 |
-|------|------|------|------|------|
-| `amount` | int64 | 是 | — | 提现金额（分） |
-| `method` | uint8 | 是 | `oneof=0 1 2 3` | 收款方式（见枚举表） |
-| `content` | string | 否 | — | 提现备注 |
-| `account` | string | 条件必填 | — | 收款账号 |
-| `qr_code_url` | string | 条件必填 | — | 收款码图片 URL |
-
-**各收款方式的必填字段**
-
-| method | 收款方式 | 必填字段 |
-|--------|---------|---------|
-| `1` 支付宝 | `qr_code_url` | 收款码图片 |
-| `2` 微信 | `qr_code_url` | 收款码图片 |
-| `3` 银行卡 | `account` | 收款账号 |
-| `0` 其他 | `account` 必填 |
-
-**Request 示例**
-
-```json
-{
-  "amount": 5000,
-  "content": "提现到支付宝",
-  "method": 1,
-  "account": "user@example.com",
-  "qr_code_url": "https://cdn.example.com/qrcode/alipay.png"
-}
-```
-
-**Response**: [`WithdrawalLog`](#withdrawallog-对象)
-
----
-
-### 1.2 取消提现
-
-用户取消自己的待审核提现申请，佣金退回账户。
-
-```
-POST /v1/public/user/withdrawal_cancel
-```
-
-**Request Body**
-
-| 字段 | 类型 | 必填 | 校验 | 说明 |
-|------|------|------|------|------|
-| `withdrawal_id` | int64 | 是 | `required,gt=0` | 提现记录 ID |
-
-**Request 示例**
-
-```json
-{
-  "withdrawal_id": 123
-}
-```
-
-**Response**: [`WithdrawalLog`](#withdrawallog-对象)（状态已变为 `3=已取消`）
-
----
-
-### 1.3 查询提现记录
-
-分页查询当前用户的提现记录（自动按 JWT 中的 userId 过滤）。
-
-```
-GET /v1/public/user/withdrawal_log
-```
-
-**Query 参数**
-
-| 参数 | 类型 | 必填 | 说明 |
-|------|------|------|------|
-| `page` | int | 否 | 页码，默认 1 |
-| `size` | int | 否 | 每页条数，默认 10 |
-
-**Request 示例**
-
-```
-GET /v1/public/user/withdrawal_log?page=1&size=10
-```
-
-**Response**
-
-```json
-{
-  "list": [WithdrawalLog, ...],
-  "total": 25
-}
-```
-
----
-
-## 二、枚举值与状态流转
-
-### 提现状态 (`status`)
-
-| 值 | 说明 |
-|----|------|
-| 0 | 待审核 |
-| 1 | 已通过 |
-| 2 | 已拒绝 |
-| 3 | 已取消 |
-
-### 收款方式 (`method`)
-
-| 值 | 说明 |
-|----|------|
-| 0 | 其他 |
-| 1 | 支付宝 |
-| 2 | 微信 |
-| 3 | 银行卡 |
-
-### 状态流转
-
-```
-                 ┌── 管理员通过 ──▶ 已通过 (1)
-                 │
-待审核 (0) ──────┼── 管理员拒绝 ──▶ 已拒绝 (2)
-                 │
-                 └── 用户取消 ───▶ 已取消 (3)
-```
-
-### WithdrawalLog 对象
-
-所有提现接口共用的响应结构：
-
-```json
-{
-  "id": 1,
-  "user_id": 100,
-  "amount": 5000,
-  "content": "提现备注",
-  "status": 0,
-  "reason": "",
-  "method": 1,
-  "account": "user@example.com",
-  "qr_code_url": "https://cdn.example.com/qrcode/alipay.png",
-  "created_at": 1716700000,
-  "updated_at": 1716700000
-}
-```
-
-| 字段 | 类型 | 说明 |
-|------|------|------|
-| `id` | int64 | 提现记录 ID |
-| `user_id` | int64 | 用户 ID |
-| `amount` | int64 | 提现金额（分） |
-| `content` | string | 提现备注 |
-| `status` | uint8 | 状态（见枚举表） |
-| `reason` | string | 拒绝原因（仅 status=2 时有值，其余 omitempty） |
-| `method` | uint8 | 收款方式（见枚举表） |
-| `account` | string | 收款账号 |
-| `qr_code_url` | string | 收款码图片 URL |
-| `created_at` | int64 | 创建时间（秒级 Unix） |
-| `updated_at` | int64 | 更新时间（秒级 Unix） |
-
----
-
-## 三、文件上传接口
-
-> 认证方式: JWT + DeviceMiddleware（用户登录态 + 设备认证）
->
-> 路由前缀: `/v1/public/file`
->
-> 存储后端: S3 兼容（RustFS）
-
-提供两种上传方式：
-
-| 方式 | 适用场景 | 流程 |
-|------|---------|------|
-| **直传** | 小文件（收款码等） | 1 次请求，`multipart/form-data` 直接上传 |
-| **预签名** | 大文件 / 客户端直传 S3 | init → 客户端 PUT 到预签名 URL → complete 确认 |
-
----
-
-### 3.1 直传文件（小文件）
-
-通过 `multipart/form-data` 直接上传文件到服务端，服务端转存至 S3。
-
-```
-POST /v1/public/file/upload
-Content-Type: multipart/form-data
-```
-
-**Form 参数**
-
-| 字段 | 类型 | 必填 | 说明 |
-|------|------|------|------|
-| `biz_type` | string | 是 | 业务类型（如 `withdrawal_qrcode`、`avatar` 等） |
-| `file` | file | 是 | 上传的文件（multipart） |
-
-**cURL 示例**
-
-```bash
-curl -X POST /v1/public/file/upload \
-  -H "Authorization: Bearer <token>" \
-  -F "biz_type=withdrawal_qrcode" \
-  -F "file=@/path/to/alipay_qr.png"
-```
-
-**Response**
-
-```json
-{
-  "file_id": "a1b2c3d4e5f678901234",
-  "file_name": "alipay_qr.png",
-  "object_key": "app-upload/2026/05/27/100/alipay_qr.png__a1b2c3d4e5f678901234",
-  "size": 52480,
-  "content_type": "image/png",
-  "etag": "\"d41d8cd98f00b204e9800998ecf8427e\"",
-  "status": "completed"
-}
-```
-
-**FileUploadResponse 字段说明**
-
-| 字段 | 类型 | 说明 |
-|------|------|------|
-| `file_id` | string | 文件唯一 ID（24 字符 hex） |
-| `file_name` | string | 原始文件名 |
-| `object_key` | string | S3 对象路径 |
-| `size` | int64 | 文件大小（字节） |
-| `content_type` | string | MIME 类型 |
-| `etag` | string | S3 ETag |
-| `status` | string | 状态，直传成功即 `completed` |
-
----
-
-### 3.2 初始化上传（大文件 — 预签名）
-
-获取 S3 预签名 URL，客户端直接 PUT 到 S3，避免文件经过服务端。
-
-```
-POST /v1/public/file/upload/init
-```
-
-**Request Body**
-
-| 字段 | 类型 | 必填 | 校验 | 说明 |
-|------|------|------|------|------|
-| `biz_type` | string | 是 | `required` | 业务类型 |
-| `file_name` | string | 是 | `required` | 文件名 |
-| `content_type` | string | 是 | `required` | MIME 类型（如 `image/png`） |
-| `size` | int64 | 是 | `required` | 文件大小（字节） |
-| `sha256` | string | 否 | — | 文件 SHA256（可选校验） |
-
-**Request 示例**
-
-```json
-{
-  "biz_type": "withdrawal_qrcode",
-  "file_name": "wechat_qr.png",
-  "content_type": "image/png",
-  "size": 102400,
-  "sha256": "e3b0c44298fc1c149afbf4c8996fb924..."
-}
-```
-
-**Response**
-
-```json
-{
-  "file_id": "b2c3d4e5f6789012345a",
-  "object_key": "app-upload/2026/05/27/100/wechat_qr.png__b2c3d4e5f6789012345a",
-  "upload_url": "https://s3.example.com/bucket/app-upload/...?X-Amz-Signature=...",
-  "method": "PUT",
-  "headers": {
-    "Content-Type": "image/png"
-  },
-  "expired_at": 1716700300
-}
-```
-
-**FileUploadInitResponse 字段说明**
-
-| 字段 | 类型 | 说明 |
-|------|------|------|
-| `file_id` | string | 文件唯一 ID |
-| `object_key` | string | S3 对象路径 |
-| `upload_url` | string | 预签名上传 URL |
-| `method` | string | HTTP 方法（`PUT`） |
-| `headers` | map | 上传时需携带的请求头 |
-| `expired_at` | int64 | 预签名过期时间（秒级 Unix，默认 300 秒） |
-
-**客户端上传流程**
-
-```
-1. 调用 /upload/init 获取 upload_url
-2. 用返回的 method + headers 直接上传文件到 upload_url
-3. 上传成功后调用 /upload/complete 确认
-```
-
----
-
-### 3.3 确认上传完成
-
-客户端通过预签名 URL 上传完成后，调用此接口确认文件状态。
-
-```
-POST /v1/public/file/upload/complete
-```
-
-**Request Body**
-
-| 字段 | 类型 | 必填 | 校验 | 说明 |
-|------|------|------|------|------|
-| `file_id` | string | 是 | `required` | init 返回的 file_id |
-
-**Request 示例**
-
-```json
-{
-  "file_id": "b2c3d4e5f6789012345a"
-}
-```
-
-**Response**
-
-```json
-{
-  "file_id": "b2c3d4e5f6789012345a",
-  "object_key": "app-upload/2026/05/27/100/wechat_qr.png__b2c3d4e5f6789012345a",
-  "size": 102400,
-  "content_type": "image/png",
-  "etag": "\"d41d8cd98f00b204e9800998ecf8427e\"",
-  "status": "completed"
-}
-```
-
-**FileUploadCompleteResponse 字段说明**
-
-| 字段 | 类型 | 说明 |
-|------|------|------|
-| `file_id` | string | 文件唯一 ID |
-| `object_key` | string | S3 对象路径 |
-| `size` | int64 | 实际文件大小（S3 HeadObject 获取） |
-| `content_type` | string | MIME 类型 |
-| `etag` | string | S3 ETag |
-| `status` | string | `completed` |
-
-**校验规则**
-
-- 文件大小不能超过配置的 `S3.MaxUploadSize`
-- Content-Type 必须在配置的 `S3.AllowedContentTypes` 白名单内（若配置了）
-- complete 时会校验 S3 上的实际文件大小是否与 init 声明的一致
-- 只能确认自己发起的上传（userId 校验）
-
----
-
-## 四、日志查询接口 (Admin)
-
-> 认证方式: AuthMiddleware（管理员权限）
->
-> 路由前缀: `/v1/admin/log`
->
-> 数据来源: `log_message` 表（客户端上报的错误/崩溃日志）
-
----
-
-### 4.1 错误日志列表
-
-分页查询客户端上报的错误日志，支持多维度筛选。
-
-```
-GET /v1/admin/log/error_message/list
-```
-
-**Query 参数**
-
-| 参数 | 类型 | 必填 | 说明 |
-|------|------|------|------|
-| `page` | int | 是 | 页码 |
-| `size` | int | 是 | 每页条数 |
-| `platform` | string | 否 | 平台筛选（ios / android / windows / mac / harmony） |
-| `level` | uint8 | 否 | 日志级别 |
-| `user_id` | int64 | 否 | 用户 ID |
-| `device_id` | string | 否 | 设备 ID |
-| `error_code` | string | 否 | 错误码 |
-| `keyword` | string | 否 | 关键字搜索（匹配 message） |
-| `start` | int64 | 否 | 开始时间（秒级 Unix） |
-| `end` | int64 | 否 | 结束时间（秒级 Unix） |
-
-**Request 示例**
-
-```
-GET /v1/admin/log/error_message/list?page=1&size=20&platform=ios&start=1716600000&end=1716700000
-```
-
-**Response**
-
-```json
-{
-  "total": 50,
-  "list": [
-    {
-      "id": 1,
-      "platform": "ios",
-      "app_version": "2.1.0",
-      "os_name": "iOS",
-      "os_version": "17.5",
-      "device_id": "A1B2C3D4",
-      "user_id": 100,
-      "session_id": "sess_xxx",
-      "level": 3,
-      "error_code": "VPN_CONNECT_FAIL",
-      "message": "Failed to establish VPN tunnel",
-      "created_at": 1716700000
-    }
-  ]
-}
-```
-
-**ErrorLogMessage 字段说明**
-
-| 字段 | 类型 | 说明 |
-|------|------|------|
-| `id` | int64 | 日志 ID |
-| `platform` | string | 平台 |
-| `app_version` | string | 客户端版本 |
-| `os_name` | string | 操作系统名称 |
-| `os_version` | string | 操作系统版本 |
-| `device_id` | string | 设备 ID |
-| `user_id` | int64 | 用户 ID |
-| `session_id` | string | 会话 ID |
-| `level` | uint8 | 日志级别 |
-| `error_code` | string | 错误码 |
-| `message` | string | 错误消息 |
-| `created_at` | int64 | 创建时间（秒级 Unix） |
-
----
-
-### 4.2 错误日志详情
-
-获取单条错误日志的完整详情（列表字段 + 堆栈/IP/UA 等扩展信息）。
-
-```
-GET /v1/admin/log/error_message/detail
-```
-
-**Response**
-
-```json
-{
-  "id": 1,
-  "platform": "ios",
-  "app_version": "2.1.0",
-  "os_name": "iOS",
-  "os_version": "17.5",
-  "device_id": "A1B2C3D4",
-  "user_id": 100,
-  "session_id": "sess_xxx",
-  "level": 3,
-  "error_code": "VPN_CONNECT_FAIL",
-  "message": "Failed to establish VPN tunnel",
-  "stack": "at VPNManager.connect() line 42\nat ...",
-  "client_ip": "1.2.3.4",
-  "user_agent": "PPanel/2.1.0 iOS/17.5",
-  "locale": "zh-CN",
-  "occurred_at": 1716700000,
-  "created_at": 1716700000
-}
-```
-
-**相比列表额外返回的字段**
-
-| 字段 | 类型 | 说明 |
-|------|------|------|
-| `stack` | string | 堆栈信息 |
-| `client_ip` | string | 客户端 IP |
-| `user_agent` | string | User-Agent |
-| `locale` | string | 客户端语言/地区 |
-| `occurred_at` | int64 | 错误发生时间（秒级 Unix） |
-
----
-
-### 4.3 日志消息原始详情
-
-获取单条 `log_message` 的完整原始数据（含 context、digest 等全量字段）。
-
-```
-GET /v1/admin/log/message/detail
-```
-
-**Query 参数**
-
-| 参数 | 类型 | 必填 | 说明 |
-|------|------|------|------|
-| `id` | int64 | 是 | 日志消息 ID |
-
-**Response**
-
-```json
-{
-  "id": 1,
-  "platform": "ios",
-  "app_version": "2.1.0",
-  "os_name": "iOS",
-  "os_version": "17.5",
-  "device_id": "A1B2C3D4",
-  "user_id": 100,
-  "session_id": "sess_xxx",
-  "level": 3,
-  "error_code": "VPN_CONNECT_FAIL",
-  "message": "Failed to establish VPN tunnel",
-  "stack": "at VPNManager.connect() line 42\nat ...",
-  "context": { "server_id": 5, "protocol": "vmess" },
-  "client_ip": "1.2.3.4",
-  "user_agent": "PPanel/2.1.0 iOS/17.5",
-  "locale": "zh-CN",
-  "digest": "sha256_abc123...",
-  "occurred_at": 1716700000,
-  "created_at": 1716700000
-}
-```
-
-**相比详情额外返回的字段**
-
-| 字段 | 类型 | 说明 |
-|------|------|------|
-| `context` | any | 附加上下文（原始 JSON） |
-| `digest` | string | 内容摘要（用于去重） |

initialize/migrate/database/02152_withdrawal_method.up.sql

@@ -1,10 +1,4 @@
-SELECT COUNT(*) INTO @col_exists FROM INFORMATION_SCHEMA.COLUMNS
-WHERE TABLE_SCHEMA = DATABASE() AND TABLE_NAME = 'withdrawals' AND COLUMN_NAME = 'method';
-
-SET @ddl = IF(@col_exists = 0,
-  'ALTER TABLE `withdrawals` ADD COLUMN `method` TINYINT(1) NOT NULL DEFAULT 0 AFTER `content`, ADD COLUMN `account` VARCHAR(255) NOT NULL DEFAULT '''' AFTER `method`, ADD COLUMN `qr_code_url` VARCHAR(500) NOT NULL DEFAULT '''' AFTER `account`',
-  'SELECT 1');
-
-PREPARE stmt FROM @ddl;
-EXECUTE stmt;
-DEALLOCATE PREPARE stmt;
+ALTER TABLE `withdrawals`
+  ADD COLUMN `method`      TINYINT(1)   NOT NULL DEFAULT 0 COMMENT '收款方式 0:其他 1:支付宝 2:微信 3:银行卡' AFTER `content`,
+  ADD COLUMN `account`     VARCHAR(255) NOT NULL DEFAULT '' COMMENT '收款账号' AFTER `method`,
+  ADD COLUMN `qr_code_url` VARCHAR(500) NOT NULL DEFAULT '' COMMENT '收款码图片URL' AFTER `account`;

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

@@ -1,37 +0,0 @@
--- Purpose: Rollback user-level speed limit overrides from user_subscribe
-
-SET @column_exists = (
-  SELECT COUNT(*)
-  FROM INFORMATION_SCHEMA.COLUMNS
-  WHERE TABLE_SCHEMA = DATABASE()
-    AND TABLE_NAME = 'user_subscribe'
-    AND COLUMN_NAME = 'traffic_limit'
-);
-
-SET @sql = IF(
-  @column_exists = 1,
-  'ALTER TABLE `user_subscribe` DROP COLUMN `traffic_limit`',
-  'SELECT ''Column traffic_limit does not exist in user_subscribe table'''
-);
-
-PREPARE stmt FROM @sql;
-EXECUTE stmt;
-DEALLOCATE PREPARE stmt;
-
-SET @column_exists = (
-  SELECT COUNT(*)
-  FROM INFORMATION_SCHEMA.COLUMNS
-  WHERE TABLE_SCHEMA = DATABASE()
-    AND TABLE_NAME = 'user_subscribe'
-    AND COLUMN_NAME = 'speed_limit'
-);
-
-SET @sql = IF(
-  @column_exists = 1,
-  'ALTER TABLE `user_subscribe` DROP COLUMN `speed_limit`',
-  'SELECT ''Column speed_limit does not exist in user_subscribe table'''
-);
-
-PREPARE stmt FROM @sql;
-EXECUTE stmt;
-DEALLOCATE PREPARE stmt;

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

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

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

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

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

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

internal/handler/admin/promo/createRuleHandler.go

@@ -1,23 +0,0 @@
-package promo
-
-import (
-	"github.com/gin-gonic/gin"
-	"github.com/perfect-panel/server/internal/logic/admin/promo"
-	"github.com/perfect-panel/server/internal/svc"
-	"github.com/perfect-panel/server/internal/types"
-	"github.com/perfect-panel/server/pkg/result"
-)
-
-func CreateRuleHandler(svcCtx *svc.ServiceContext) func(c *gin.Context) {
-	return func(c *gin.Context) {
-		var req types.CreatePromoRuleRequest
-		_ = c.ShouldBind(&req)
-		if err := svcCtx.Validate(&req); err != nil {
-			result.ParamErrorResult(c, err)
-			return
-		}
-		l := promo.NewCreateRuleLogic(c.Request.Context(), svcCtx)
-		resp, err := l.CreateRule(&req)
-		result.HttpResult(c, resp, err)
-	}
-}

internal/handler/admin/promo/deletePriceHandler.go

@@ -1,26 +0,0 @@
-package promo
-
-import (
-	"github.com/gin-gonic/gin"
-	"github.com/perfect-panel/server/internal/logic/admin/promo"
-	"github.com/perfect-panel/server/internal/svc"
-	"github.com/perfect-panel/server/internal/types"
-	"github.com/perfect-panel/server/pkg/result"
-)
-
-func DeletePriceHandler(svcCtx *svc.ServiceContext) func(c *gin.Context) {
-	return func(c *gin.Context) {
-		var req types.DeletePromoPriceRequest
-		if err := c.ShouldBindUri(&req); err != nil {
-			result.ParamErrorResult(c, err)
-			return
-		}
-		if err := svcCtx.Validate(&req); err != nil {
-			result.ParamErrorResult(c, err)
-			return
-		}
-		l := promo.NewDeletePriceLogic(c.Request.Context(), svcCtx)
-		err := l.DeletePrice(&req)
-		result.HttpResult(c, nil, err)
-	}
-}

internal/handler/admin/promo/deleteRuleHandler.go

@@ -1,26 +0,0 @@
-package promo
-
-import (
-	"github.com/gin-gonic/gin"
-	"github.com/perfect-panel/server/internal/logic/admin/promo"
-	"github.com/perfect-panel/server/internal/svc"
-	"github.com/perfect-panel/server/internal/types"
-	"github.com/perfect-panel/server/pkg/result"
-)
-
-func DeleteRuleHandler(svcCtx *svc.ServiceContext) func(c *gin.Context) {
-	return func(c *gin.Context) {
-		var req types.DeletePromoRuleRequest
-		if err := c.ShouldBindUri(&req); err != nil {
-			result.ParamErrorResult(c, err)
-			return
-		}
-		if err := svcCtx.Validate(&req); err != nil {
-			result.ParamErrorResult(c, err)
-			return
-		}
-		l := promo.NewDeleteRuleLogic(c.Request.Context(), svcCtx)
-		err := l.DeleteRule(&req)
-		result.HttpResult(c, nil, err)
-	}
-}

internal/handler/admin/promo/getPriceListHandler.go

@@ -1,23 +0,0 @@
-package promo
-
-import (
-	"github.com/gin-gonic/gin"
-	"github.com/perfect-panel/server/internal/logic/admin/promo"
-	"github.com/perfect-panel/server/internal/svc"
-	"github.com/perfect-panel/server/internal/types"
-	"github.com/perfect-panel/server/pkg/result"
-)
-
-func GetPriceListHandler(svcCtx *svc.ServiceContext) func(c *gin.Context) {
-	return func(c *gin.Context) {
-		var req types.GetPromoPriceListRequest
-		_ = c.ShouldBind(&req)
-		if err := svcCtx.Validate(&req); err != nil {
-			result.ParamErrorResult(c, err)
-			return
-		}
-		l := promo.NewGetPriceListLogic(c.Request.Context(), svcCtx)
-		resp, err := l.GetPriceList(&req)
-		result.HttpResult(c, resp, err)
-	}
-}

internal/handler/admin/promo/getRuleDetailHandler.go

@@ -1,26 +0,0 @@
-package promo
-
-import (
-	"github.com/gin-gonic/gin"
-	"github.com/perfect-panel/server/internal/logic/admin/promo"
-	"github.com/perfect-panel/server/internal/svc"
-	"github.com/perfect-panel/server/internal/types"
-	"github.com/perfect-panel/server/pkg/result"
-)
-
-func GetRuleDetailHandler(svcCtx *svc.ServiceContext) func(c *gin.Context) {
-	return func(c *gin.Context) {
-		var req types.GetPromoRuleDetailRequest
-		if err := c.ShouldBindUri(&req); err != nil {
-			result.ParamErrorResult(c, err)
-			return
-		}
-		if err := svcCtx.Validate(&req); err != nil {
-			result.ParamErrorResult(c, err)
-			return
-		}
-		l := promo.NewGetRuleDetailLogic(c.Request.Context(), svcCtx)
-		resp, err := l.GetRuleDetail(&req)
-		result.HttpResult(c, resp, err)
-	}
-}

internal/handler/admin/promo/getRuleListHandler.go

@@ -1,23 +0,0 @@
-package promo
-
-import (
-	"github.com/gin-gonic/gin"
-	"github.com/perfect-panel/server/internal/logic/admin/promo"
-	"github.com/perfect-panel/server/internal/svc"
-	"github.com/perfect-panel/server/internal/types"
-	"github.com/perfect-panel/server/pkg/result"
-)
-
-func GetRuleListHandler(svcCtx *svc.ServiceContext) func(c *gin.Context) {
-	return func(c *gin.Context) {
-		var req types.GetPromoRuleListRequest
-		_ = c.ShouldBind(&req)
-		if err := svcCtx.Validate(&req); err != nil {
-			result.ParamErrorResult(c, err)
-			return
-		}
-		l := promo.NewGetRuleListLogic(c.Request.Context(), svcCtx)
-		resp, err := l.GetRuleList(&req)
-		result.HttpResult(c, resp, err)
-	}
-}

internal/handler/admin/promo/getUsageListHandler.go

@@ -1,23 +0,0 @@
-package promo
-
-import (
-	"github.com/gin-gonic/gin"
-	"github.com/perfect-panel/server/internal/logic/admin/promo"
-	"github.com/perfect-panel/server/internal/svc"
-	"github.com/perfect-panel/server/internal/types"
-	"github.com/perfect-panel/server/pkg/result"
-)
-
-func GetUsageListHandler(svcCtx *svc.ServiceContext) func(c *gin.Context) {
-	return func(c *gin.Context) {
-		var req types.GetPromoUsageListRequest
-		_ = c.ShouldBind(&req)
-		if err := svcCtx.Validate(&req); err != nil {
-			result.ParamErrorResult(c, err)
-			return
-		}
-		l := promo.NewGetUsageListLogic(c.Request.Context(), svcCtx)
-		resp, err := l.GetUsageList(&req)
-		result.HttpResult(c, resp, err)
-	}
-}

internal/handler/admin/promo/setPriceHandler.go

@@ -1,23 +0,0 @@
-package promo
-
-import (
-	"github.com/gin-gonic/gin"
-	"github.com/perfect-panel/server/internal/logic/admin/promo"
-	"github.com/perfect-panel/server/internal/svc"
-	"github.com/perfect-panel/server/internal/types"
-	"github.com/perfect-panel/server/pkg/result"
-)
-
-func SetPriceHandler(svcCtx *svc.ServiceContext) func(c *gin.Context) {
-	return func(c *gin.Context) {
-		var req types.SetPromoPriceRequest
-		_ = c.ShouldBind(&req)
-		if err := svcCtx.Validate(&req); err != nil {
-			result.ParamErrorResult(c, err)
-			return
-		}
-		l := promo.NewSetPriceLogic(c.Request.Context(), svcCtx)
-		err := l.SetPrice(&req)
-		result.HttpResult(c, nil, err)
-	}
-}

internal/handler/admin/promo/updateRuleHandler.go

@@ -1,27 +0,0 @@
-package promo
-
-import (
-	"github.com/gin-gonic/gin"
-	"github.com/perfect-panel/server/internal/logic/admin/promo"
-	"github.com/perfect-panel/server/internal/svc"
-	"github.com/perfect-panel/server/internal/types"
-	"github.com/perfect-panel/server/pkg/result"
-)
-
-func UpdateRuleHandler(svcCtx *svc.ServiceContext) func(c *gin.Context) {
-	return func(c *gin.Context) {
-		var req types.UpdatePromoRuleRequest
-		if err := c.ShouldBindUri(&req); err != nil {
-			result.ParamErrorResult(c, err)
-			return
-		}
-		_ = c.ShouldBind(&req)
-		if err := svcCtx.Validate(&req); err != nil {
-			result.ParamErrorResult(c, err)
-			return
-		}
-		l := promo.NewUpdateRuleLogic(c.Request.Context(), svcCtx)
-		resp, err := l.UpdateRule(&req)
-		result.HttpResult(c, resp, err)
-	}
-}

internal/handler/routes.go

@@ -17,7 +17,6 @@ import (
 	adminMarketing "github.com/perfect-panel/server/internal/handler/admin/marketing"
 	adminOrder "github.com/perfect-panel/server/internal/handler/admin/order"
 	adminPayment "github.com/perfect-panel/server/internal/handler/admin/payment"
-	adminPromo "github.com/perfect-panel/server/internal/handler/admin/promo"
 	adminRedemption "github.com/perfect-panel/server/internal/handler/admin/redemption"
 	adminServer "github.com/perfect-panel/server/internal/handler/admin/server"
 	adminSubscribe "github.com/perfect-panel/server/internal/handler/admin/subscribe"
@@ -375,38 +374,6 @@ func RegisterHandlers(router *gin.Engine, serverCtx *svc.ServiceContext) {
 		adminPaymentGroupRouter.GET("/platform", adminPayment.GetPaymentPlatformHandler(serverCtx))
 	}
 
-	adminPromoGroupRouter := router.Group("/v1/admin/promo")
-	adminPromoGroupRouter.Use(middleware.AuthMiddleware(serverCtx))
-
-	{
-		// Create promo rule
-		adminPromoGroupRouter.POST("/rule", adminPromo.CreateRuleHandler(serverCtx))
-
-		// Get promo rule list
-		adminPromoGroupRouter.GET("/rule/list", adminPromo.GetRuleListHandler(serverCtx))
-
-		// Get promo rule detail
-		adminPromoGroupRouter.GET("/rule/:id", adminPromo.GetRuleDetailHandler(serverCtx))
-
-		// Update promo rule
-		adminPromoGroupRouter.PUT("/rule/:id", adminPromo.UpdateRuleHandler(serverCtx))
-
-		// Delete promo rule
-		adminPromoGroupRouter.DELETE("/rule/:id", adminPromo.DeleteRuleHandler(serverCtx))
-
-		// Set promo prices
-		adminPromoGroupRouter.POST("/price", adminPromo.SetPriceHandler(serverCtx))
-
-		// Get promo price list
-		adminPromoGroupRouter.GET("/price/list", adminPromo.GetPriceListHandler(serverCtx))
-
-		// Delete promo price
-		adminPromoGroupRouter.DELETE("/price/:id", adminPromo.DeletePriceHandler(serverCtx))
-
-		// Get promo usage list
-		adminPromoGroupRouter.GET("/usage/list", adminPromo.GetUsageListHandler(serverCtx))
-	}
-
 	adminRedemptionGroupRouter := router.Group("/v1/admin/redemption")
 	adminRedemptionGroupRouter.Use(middleware.AuthMiddleware(serverCtx))
 
@@ -1011,16 +978,17 @@ func RegisterHandlers(router *gin.Engine, serverCtx *svc.ServiceContext) {
 	}
 
 	publicSubscribeGroupRouter := router.Group("/v1/public/subscribe")
+	publicSubscribeGroupRouter.Use(middleware.AuthMiddleware(serverCtx), middleware.DeviceMiddleware(serverCtx))
 
 	{
 		// Get subscribe list
-		publicSubscribeGroupRouter.GET("/list", middleware.OptionalAuthMiddleware(serverCtx), middleware.DeviceMiddleware(serverCtx), publicSubscribe.QuerySubscribeListHandler(serverCtx))
+		publicSubscribeGroupRouter.GET("/list", publicSubscribe.QuerySubscribeListHandler(serverCtx))
 
 		// Get user subscribe node info
-		publicSubscribeGroupRouter.GET("/node/list", middleware.AuthMiddleware(serverCtx), middleware.DeviceMiddleware(serverCtx), publicSubscribe.QueryUserSubscribeNodeListHandler(serverCtx))
+		publicSubscribeGroupRouter.GET("/node/list", publicSubscribe.QueryUserSubscribeNodeListHandler(serverCtx))
 
 		// Get subscribe group list
-		publicSubscribeGroupRouter.GET("/group/list", middleware.AuthMiddleware(serverCtx), middleware.DeviceMiddleware(serverCtx), publicSubscribe.QuerySubscribeGroupListHandler(serverCtx))
+		publicSubscribeGroupRouter.GET("/group/list", publicSubscribe.QuerySubscribeGroupListHandler(serverCtx))
 	}
 
 	publicTicketGroupRouter := router.Group("/v1/public/ticket")

internal/logic/admin/application/deleteSubscribeApplicationLogic.go

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

internal/logic/admin/promo/createRuleLogic.go

@@ -1,58 +0,0 @@
-package promo
-
-import (
-	"context"
-
-	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/logger"
-	"github.com/perfect-panel/server/pkg/xerr"
-	"github.com/pkg/errors"
-)
-
-type CreateRuleLogic struct {
-	logger.Logger
-	ctx    context.Context
-	svcCtx *svc.ServiceContext
-}
-
-func NewCreateRuleLogic(ctx context.Context, svcCtx *svc.ServiceContext) *CreateRuleLogic {
-	return &CreateRuleLogic{
-		Logger: logger.WithContext(ctx),
-		ctx:    ctx,
-		svcCtx: svcCtx,
-	}
-}
-
-func (l *CreateRuleLogic) CreateRule(req *types.CreatePromoRuleRequest) (*types.PromoRule, error) {
-	if err := validateRuleInput(req.Type, req.Params, req.Priority, req.StartTime, req.EndTime); err != nil {
-		return nil, err
-	}
-	params, err := paramsToString(req.Params)
-	if err != nil {
-		return nil, err
-	}
-	enabled := true
-	if req.Enabled != nil {
-		enabled = *req.Enabled
-	}
-	rule := &promomodel.Rule{
-		Name:      req.Name,
-		Type:      req.Type,
-		Params:    params,
-		Priority:  req.Priority,
-		Enabled:   enabled,
-		StartTime: unixPtrToTimePtr(req.StartTime),
-		EndTime:   unixPtrToTimePtr(req.EndTime),
-	}
-	if err := l.svcCtx.PromoModel.InsertRule(l.ctx, rule); err != nil {
-		l.Errorw("[CreatePromoRule] Database Error", logger.Field("error", err.Error()))
-		return nil, errors.Wrapf(xerr.NewErrCode(xerr.DatabaseInsertError), "create promo rule error: %v", err.Error())
-	}
-	if err := l.svcCtx.Redis.Del(l.ctx, ruleCacheKey).Err(); err != nil {
-		l.Errorw("[CreatePromoRule] Delete Cache Error", logger.Field("error", err.Error()))
-	}
-	resp := convertRule(rule)
-	return &resp, nil
-}

internal/logic/admin/promo/deletePriceLogic.go

@@ -1,47 +0,0 @@
-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 {
-	logger.Logger
-	ctx    context.Context
-	svcCtx *svc.ServiceContext
-}
-
-func NewDeletePriceLogic(ctx context.Context, svcCtx *svc.ServiceContext) *DeletePriceLogic {
-	return &DeletePriceLogic{
-		Logger: logger.WithContext(ctx),
-		ctx:    ctx,
-		svcCtx: svcCtx,
-	}
-}
-
-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())
-	}
-	if err := l.svcCtx.PromoModel.DeletePrice(l.ctx, req.Id); err != nil {
-		l.Errorw("[DeletePromoPrice] Database Error", logger.Field("error", err.Error()))
-		return errors.Wrapf(xerr.NewErrCode(xerr.DatabaseDeletedError), "delete promo price error: %v", err.Error())
-	}
-	if err := l.svcCtx.Redis.Del(l.ctx, subscribePromoCacheKey(price.SubscribeId)).Err(); err != nil {
-		l.Errorw("[DeletePromoPrice] Delete Cache Error", logger.Field("error", err.Error()))
-	}
-	return nil
-}

internal/logic/admin/promo/deleteRuleLogic.go

@@ -1,46 +0,0 @@
-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 {
-	logger.Logger
-	ctx    context.Context
-	svcCtx *svc.ServiceContext
-}
-
-func NewDeleteRuleLogic(ctx context.Context, svcCtx *svc.ServiceContext) *DeleteRuleLogic {
-	return &DeleteRuleLogic{
-		Logger: logger.WithContext(ctx),
-		ctx:    ctx,
-		svcCtx: svcCtx,
-	}
-}
-
-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())
-	}
-	if err := l.svcCtx.Redis.Del(l.ctx, ruleCacheKey).Err(); err != nil {
-		l.Errorw("[DeletePromoRule] Delete Cache Error", logger.Field("error", err.Error()))
-	}
-	return nil
-}

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/getPriceListLogic.go

@@ -1,41 +0,0 @@
-package promo
-
-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"
-)
-
-type GetPriceListLogic struct {
-	logger.Logger
-	ctx    context.Context
-	svcCtx *svc.ServiceContext
-}
-
-func NewGetPriceListLogic(ctx context.Context, svcCtx *svc.ServiceContext) *GetPriceListLogic {
-	return &GetPriceListLogic{
-		Logger: logger.WithContext(ctx),
-		ctx:    ctx,
-		svcCtx: svcCtx,
-	}
-}
-
-func (l *GetPriceListLogic) GetPriceList(req *types.GetPromoPriceListRequest) (*types.GetPromoPriceListResponse, error) {
-	total, list, err := l.svcCtx.PromoModel.QueryPriceList(l.ctx, req.PromoRuleId, int(req.Page), int(req.Size))
-	if err != nil {
-		l.Errorw("[GetPromoPriceList] Database Error", logger.Field("error", err.Error()))
-		return nil, errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), "get promo price list error: %v", err.Error())
-	}
-	resp := &types.GetPromoPriceListResponse{
-		Total: total,
-		List:  make([]types.PromoPrice, 0, len(list)),
-	}
-	for _, item := range list {
-		resp.List = append(resp.List, convertPrice(item))
-	}
-	return resp, nil
-}

internal/logic/admin/promo/getRuleDetailLogic.go

@@ -1,35 +0,0 @@
-package promo
-
-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"
-)
-
-type GetRuleDetailLogic struct {
-	logger.Logger
-	ctx    context.Context
-	svcCtx *svc.ServiceContext
-}
-
-func NewGetRuleDetailLogic(ctx context.Context, svcCtx *svc.ServiceContext) *GetRuleDetailLogic {
-	return &GetRuleDetailLogic{
-		Logger: logger.WithContext(ctx),
-		ctx:    ctx,
-		svcCtx: svcCtx,
-	}
-}
-
-func (l *GetRuleDetailLogic) GetRuleDetail(req *types.GetPromoRuleDetailRequest) (*types.PromoRule, error) {
-	rule, err := l.svcCtx.PromoModel.FindRule(l.ctx, req.Id)
-	if err != nil {
-		l.Errorw("[GetPromoRuleDetail] Database Error", logger.Field("error", err.Error()))
-		return nil, errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), "get promo rule detail error: %v", err.Error())
-	}
-	resp := convertRule(rule)
-	return &resp, nil
-}

internal/logic/admin/promo/getRuleListLogic.go

@@ -1,41 +0,0 @@
-package promo
-
-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"
-)
-
-type GetRuleListLogic struct {
-	logger.Logger
-	ctx    context.Context
-	svcCtx *svc.ServiceContext
-}
-
-func NewGetRuleListLogic(ctx context.Context, svcCtx *svc.ServiceContext) *GetRuleListLogic {
-	return &GetRuleListLogic{
-		Logger: logger.WithContext(ctx),
-		ctx:    ctx,
-		svcCtx: svcCtx,
-	}
-}
-
-func (l *GetRuleListLogic) GetRuleList(req *types.GetPromoRuleListRequest) (*types.GetPromoRuleListResponse, error) {
-	total, list, err := l.svcCtx.PromoModel.QueryRuleList(l.ctx, int(req.Page), int(req.Size), req.Type, req.Enabled, req.Search)
-	if err != nil {
-		l.Errorw("[GetPromoRuleList] Database Error", logger.Field("error", err.Error()))
-		return nil, errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), "get promo rule list error: %v", err.Error())
-	}
-	resp := &types.GetPromoRuleListResponse{
-		Total: total,
-		List:  make([]types.PromoRule, 0, len(list)),
-	}
-	for _, item := range list {
-		resp.List = append(resp.List, convertRule(item))
-	}
-	return resp, nil
-}

internal/logic/admin/promo/getUsageListLogic.go

@@ -1,49 +0,0 @@
-package promo
-
-import (
-	"context"
-
-	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/logger"
-	"github.com/perfect-panel/server/pkg/xerr"
-	"github.com/pkg/errors"
-)
-
-type GetUsageListLogic struct {
-	logger.Logger
-	ctx    context.Context
-	svcCtx *svc.ServiceContext
-}
-
-func NewGetUsageListLogic(ctx context.Context, svcCtx *svc.ServiceContext) *GetUsageListLogic {
-	return &GetUsageListLogic{
-		Logger: logger.WithContext(ctx),
-		ctx:    ctx,
-		svcCtx: svcCtx,
-	}
-}
-
-func (l *GetUsageListLogic) GetUsageList(req *types.GetPromoUsageListRequest) (*types.GetPromoUsageListResponse, error) {
-	total, list, err := l.svcCtx.PromoModel.QueryUsageList(l.ctx, promomodel.UsageFilter{
-		Page:        int(req.Page),
-		Size:        int(req.Size),
-		RuleId:      req.RuleId,
-		UserId:      req.UserId,
-		SubscribeId: req.SubscribeId,
-		OrderNo:     req.OrderNo,
-	})
-	if err != nil {
-		l.Errorw("[GetPromoUsageList] Database Error", logger.Field("error", err.Error()))
-		return nil, errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), "get promo usage list error: %v", err.Error())
-	}
-	resp := &types.GetPromoUsageListResponse{
-		Total: total,
-		List:  make([]types.PromoUsage, 0, len(list)),
-	}
-	for _, item := range list {
-		resp.List = append(resp.List, convertUsage(item))
-	}
-	return resp, nil
-}

internal/logic/admin/promo/setPriceLogic.go

@@ -1,81 +0,0 @@
-package promo
-
-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"
-)
-
-type SetPriceLogic struct {
-	logger.Logger
-	ctx    context.Context
-	svcCtx *svc.ServiceContext
-}
-
-func NewSetPriceLogic(ctx context.Context, svcCtx *svc.ServiceContext) *SetPriceLogic {
-	return &SetPriceLogic{
-		Logger: logger.WithContext(ctx),
-		ctx:    ctx,
-		svcCtx: svcCtx,
-	}
-}
-
-func (l *SetPriceLogic) SetPrice(req *types.SetPromoPriceRequest) error {
-	if _, err := l.svcCtx.PromoModel.FindRule(l.ctx, req.PromoRuleId); err != nil {
-		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")
-		}
-		originPrice := sub.UnitPrice * item.Quantity
-		if item.PromoPrice >= originPrice {
-			return errors.Wrapf(xerr.NewErrCode(xerr.InvalidParams), "promo_price must be less than unit_price * quantity")
-		}
-		items = append(items, &promomodel.SubscribePromo{
-			SubscribeId: item.SubscribeId,
-			PromoRuleId: req.PromoRuleId,
-			Quantity:    item.Quantity,
-			PromoPrice:  item.PromoPrice,
-		})
-		cacheKeys = append(cacheKeys, subscribePromoCacheKey(item.SubscribeId))
-	}
-	if err := l.svcCtx.PromoModel.UpsertPrices(l.ctx, req.PromoRuleId, items); err != nil {
-		l.Errorw("[SetPromoPrice] Database Error", logger.Field("error", err.Error()))
-		return errors.Wrapf(xerr.NewErrCode(xerr.DatabaseUpdateError), "set promo price error: %v", err.Error())
-	}
-	if len(cacheKeys) > 0 {
-		if err := l.svcCtx.Redis.Del(l.ctx, cacheKeys...).Err(); err != nil {
-			l.Errorw("[SetPromoPrice] Delete Cache Error", logger.Field("error", err.Error()))
-		}
-	}
-	return nil
-}

internal/logic/admin/promo/tool.go

@@ -1,162 +0,0 @@
-package promo
-
-import (
-	"encoding/json"
-	"fmt"
-	"math"
-	"time"
-
-	promomodel "github.com/perfect-panel/server/internal/model/promo"
-	"github.com/perfect-panel/server/internal/types"
-	"github.com/perfect-panel/server/pkg/xerr"
-	"github.com/pkg/errors"
-)
-
-const (
-	ruleCacheKey       = "promo:rules:enabled"
-	subscribeCachePref = "promo:subscribe:"
-)
-
-func validateRuleInput(ruleType string, params map[string]interface{}, priority int64, startTime, endTime *int64) error {
-	if priority < 0 {
-		return errors.Wrapf(xerr.NewErrCode(xerr.InvalidParams), "priority must be greater than or equal to 0")
-	}
-	if startTime != nil && endTime != nil && *startTime >= *endTime {
-		return errors.Wrapf(xerr.NewErrCode(xerr.InvalidParams), "start_time must be less than end_time")
-	}
-	switch ruleType {
-	case "new_user":
-		windowHours, ok := numberParam(params, "window_hours")
-		if !ok || windowHours <= 0 {
-			return errors.Wrapf(xerr.NewErrCode(xerr.InvalidParams), "params.window_hours must be greater than 0")
-		}
-	case "inactive_user":
-		inactiveMonths, ok := numberParam(params, "inactive_months")
-		if !ok || inactiveMonths <= 0 {
-			return errors.Wrapf(xerr.NewErrCode(xerr.InvalidParams), "params.inactive_months must be greater than 0")
-		}
-	case "campaign":
-		if params == nil {
-			return nil
-		}
-	default:
-		return errors.Wrapf(xerr.NewErrCode(xerr.InvalidParams), "unsupported promo rule type")
-	}
-	return nil
-}
-
-func numberParam(params map[string]interface{}, key string) (int64, bool) {
-	if params == nil {
-		return 0, false
-	}
-	value, ok := params[key]
-	if !ok {
-		return 0, false
-	}
-	switch v := value.(type) {
-	case float64:
-		if math.Trunc(v) != v {
-			return 0, false
-		}
-		return int64(v), true
-	case int64:
-		return v, true
-	case int:
-		return int64(v), true
-	case json.Number:
-		n, err := v.Int64()
-		return n, err == nil
-	default:
-		return 0, false
-	}
-}
-
-func paramsToString(params map[string]interface{}) (string, error) {
-	if params == nil {
-		params = map[string]interface{}{}
-	}
-	b, err := json.Marshal(params)
-	if err != nil {
-		return "", errors.Wrapf(xerr.NewErrCode(xerr.InvalidParams), "invalid params")
-	}
-	return string(b), nil
-}
-
-func parseParams(data string) map[string]interface{} {
-	if data == "" {
-		return map[string]interface{}{}
-	}
-	var params map[string]interface{}
-	if err := json.Unmarshal([]byte(data), &params); err != nil {
-		return map[string]interface{}{}
-	}
-	return params
-}
-
-func unixPtrToTimePtr(ts *int64) *time.Time {
-	if ts == nil || *ts == 0 {
-		return nil
-	}
-	t := time.Unix(*ts, 0)
-	return &t
-}
-
-func timePtrToUnixPtr(t *time.Time) *int64 {
-	if t == nil {
-		return nil
-	}
-	ts := t.Unix()
-	return &ts
-}
-
-func convertRule(item *promomodel.Rule) types.PromoRule {
-	if item == nil {
-		return types.PromoRule{}
-	}
-	return types.PromoRule{
-		Id:        item.Id,
-		Name:      item.Name,
-		Type:      item.Type,
-		Params:    parseParams(item.Params),
-		Priority:  item.Priority,
-		Enabled:   item.Enabled,
-		StartTime: timePtrToUnixPtr(item.StartTime),
-		EndTime:   timePtrToUnixPtr(item.EndTime),
-		CreatedAt: item.CreatedAt.Unix(),
-		UpdatedAt: item.UpdatedAt.Unix(),
-	}
-}
-
-func convertPrice(item *promomodel.SubscribePromo) types.PromoPrice {
-	if item == nil {
-		return types.PromoPrice{}
-	}
-	return types.PromoPrice{
-		Id:          item.Id,
-		SubscribeId: item.SubscribeId,
-		PromoRuleId: item.PromoRuleId,
-		Quantity:    item.Quantity,
-		PromoPrice:  item.PromoPrice,
-		CreatedAt:   item.CreatedAt.Unix(),
-		UpdatedAt:   item.UpdatedAt.Unix(),
-	}
-}
-
-func convertUsage(item *promomodel.Usage) types.PromoUsage {
-	if item == nil {
-		return types.PromoUsage{}
-	}
-	return types.PromoUsage{
-		Id:          item.Id,
-		UserId:      item.UserId,
-		PromoRuleId: item.PromoRuleId,
-		SubscribeId: item.SubscribeId,
-		OrderNo:     item.OrderNo,
-		PromoPrice:  item.PromoPrice,
-		CreatedAt:   item.CreatedAt.Unix(),
-	}
-}
-
-func subscribePromoCacheKey(subscribeId int64) string {
-	return fmt.Sprintf("%s%d", subscribeCachePref, subscribeId)
-}

internal/logic/admin/promo/updateRuleLogic.go

@@ -1,60 +0,0 @@
-package promo
-
-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"
-)
-
-type UpdateRuleLogic struct {
-	logger.Logger
-	ctx    context.Context
-	svcCtx *svc.ServiceContext
-}
-
-func NewUpdateRuleLogic(ctx context.Context, svcCtx *svc.ServiceContext) *UpdateRuleLogic {
-	return &UpdateRuleLogic{
-		Logger: logger.WithContext(ctx),
-		ctx:    ctx,
-		svcCtx: svcCtx,
-	}
-}
-
-func (l *UpdateRuleLogic) UpdateRule(req *types.UpdatePromoRuleRequest) (*types.PromoRule, error) {
-	if err := validateRuleInput(req.Type, req.Params, req.Priority, req.StartTime, req.EndTime); err != nil {
-		return nil, err
-	}
-	rule, err := l.svcCtx.PromoModel.FindRule(l.ctx, req.Id)
-	if err != nil {
-		l.Errorw("[UpdatePromoRule] Find Rule Error", logger.Field("error", err.Error()))
-		return nil, errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), "find promo rule error: %v", err.Error())
-	}
-	params, err := paramsToString(req.Params)
-	if err != nil {
-		return nil, err
-	}
-	enabled := rule.Enabled
-	if req.Enabled != nil {
-		enabled = *req.Enabled
-	}
-	rule.Name = req.Name
-	rule.Type = req.Type
-	rule.Params = params
-	rule.Priority = req.Priority
-	rule.Enabled = enabled
-	rule.StartTime = unixPtrToTimePtr(req.StartTime)
-	rule.EndTime = unixPtrToTimePtr(req.EndTime)
-	if err := l.svcCtx.PromoModel.UpdateRule(l.ctx, rule); err != nil {
-		l.Errorw("[UpdatePromoRule] Database Error", logger.Field("error", err.Error()))
-		return nil, errors.Wrapf(xerr.NewErrCode(xerr.DatabaseUpdateError), "update promo rule error: %v", err.Error())
-	}
-	if err := l.svcCtx.Redis.Del(l.ctx, ruleCacheKey).Err(); err != nil {
-		l.Errorw("[UpdatePromoRule] Delete Cache Error", logger.Field("error", err.Error()))
-	}
-	resp := convertRule(rule)
-	return &resp, nil
-}

internal/logic/admin/server/resetSortWithNodeLogic.go

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

internal/logic/admin/server/resetSortWithServerLogic.go

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

internal/logic/common/promoEligibility.go

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

@@ -61,6 +61,11 @@ func (l *FileUploadCompleteLogic) FileUploadComplete(req *types.FileUploadComple
 	}
 
 	return &types.FileUploadCompleteResponse{
-		Url: l.svcCtx.S3Store.BuildObjectURL(meta.ObjectKey),
+		FileId:      meta.FileID,
+		ObjectKey:   meta.ObjectKey,
+		Size:        head.ContentLength,
+		ContentType: head.ContentType,
+		Etag:        head.ETag,
+		Status:      meta.Status,
 	}, nil
 }

internal/logic/public/file/fileuploadlogic.go

@@ -52,13 +52,20 @@ func (l *FileUploadLogic) FileUpload(req *types.FileUploadRequest, fileHeader *m
 	fileID := buildFileID(u.Id, req.BizType, fileHeader.Filename)
 	objectKey := buildObjectKey(l.svcCtx.Config.S3.Prefix, u.Id, req.BizType, fileID, fileHeader.Filename, now)
 
-	if _, err := l.svcCtx.S3Store.PutObject(l.ctx, objectKey, file, fileHeader.Size, contentType); err != nil {
+	putResult, err := l.svcCtx.S3Store.PutObject(l.ctx, objectKey, file, fileHeader.Size, contentType)
+	if err != nil {
 		l.Errorw("put object failed", logger.Field("error", err.Error()), logger.Field("user_id", u.Id), logger.Field("file_id", fileID))
 		return nil, err
 	}
 
 	return &types.FileUploadResponse{
-		Url: l.svcCtx.S3Store.BuildObjectURL(objectKey),
+		FileId:      fileID,
+		FileName:    fileHeader.Filename,
+		ObjectKey:   objectKey,
+		Size:        fileHeader.Size,
+		ContentType: contentType,
+		Etag:        putResult.ETag,
+		Status:      fileUploadCompleteStatus,
 	}, nil
 }
 

internal/logic/public/order/preCreateOrderLogic.go

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

internal/logic/public/order/promoPricing.go

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

internal/logic/public/order/promoPricing_test.go

@@ -1,223 +0,0 @@
-package order
-
-import (
-	"context"
-	"testing"
-
-	"github.com/perfect-panel/server/internal/model/promo"
-	"github.com/perfect-panel/server/internal/svc"
-	"github.com/perfect-panel/server/internal/types"
-	"gorm.io/gorm"
-)
-
-type fakePromoModel struct {
-	rules            []*promo.RuleWithPrice
-	lastSubscribeID  int64
-	lastQuantity     int64
-	requireQuantity  int64
-	quantityMismatch []*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
-	}
-	return m.rules, nil
-}
-
-func (m *fakePromoModel) InsertUsage(context.Context, *promo.Usage, ...*gorm.DB) error {
-	return nil
-}
-
-func (m *fakePromoModel) InsertRule(context.Context, *promo.Rule) error {
-	return nil
-}
-
-func (m *fakePromoModel) FindRule(context.Context, int64) (*promo.Rule, error) {
-	return nil, gorm.ErrRecordNotFound
-}
-
-func (m *fakePromoModel) UpdateRule(context.Context, *promo.Rule) error {
-	return nil
-}
-
-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) {
-	return 0, nil, nil
-}
-
-func (m *fakePromoModel) UpsertPrices(context.Context, int64, []*promo.SubscribePromo) error {
-	return nil
-}
-
-func (m *fakePromoModel) FindPrice(context.Context, int64) (*promo.SubscribePromo, error) {
-	return nil, gorm.ErrRecordNotFound
-}
-
-func (m *fakePromoModel) DeletePrice(context.Context, int64) error {
-	return nil
-}
-
-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) {
-	return 0, nil, nil
-}
-
-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,
-		},
-	}}
-	svcCtx := &svc.ServiceContext{
-		DB:         &gorm.DB{},
-		PromoModel: model,
-	}
-
-	result, err := calculatePurchasePrice(
-		context.Background(),
-		svcCtx,
-		1,
-		2,
-		100,
-		7,
-		[]types.SubscribeDiscount{{Quantity: 7, Discount: 50}},
-		true,
-		true,
-	)
-	if err != nil {
-		t.Fatalf("calculatePurchasePrice returned error: %v", err)
-	}
-
-	if result.OriginalPrice != 700 {
-		t.Fatalf("OriginalPrice = %d, want 700", result.OriginalPrice)
-	}
-	if result.PayableBase != 279 {
-		t.Fatalf("PayableBase = %d, want 279", result.PayableBase)
-	}
-	if result.DiscountAmount != 0 {
-		t.Fatalf("DiscountAmount = %d, want 0", result.DiscountAmount)
-	}
-	if result.PromoRuleId != 9 {
-		t.Fatalf("PromoRuleId = %d, want 9", result.PromoRuleId)
-	}
-	if result.PromoDiscount != 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)
-	}
-}
-
-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,
-	}
-
-	result, err := calculatePurchasePrice(
-		context.Background(),
-		svcCtx,
-		1,
-		2,
-		1000,
-		3,
-		[]types.SubscribeDiscount{{Quantity: 3, Discount: 50}},
-		true,
-		true,
-	)
-	if err != nil {
-		t.Fatalf("calculatePurchasePrice returned error: %v", err)
-	}
-
-	if result.PayableBase != 1500 {
-		t.Fatalf("PayableBase = %d, want 1500", result.PayableBase)
-	}
-	if result.DiscountAmount != 1500 {
-		t.Fatalf("DiscountAmount = %d, want 1500", result.DiscountAmount)
-	}
-	if result.PromoRuleId != 0 || result.PromoDiscount != 0 {
-		t.Fatalf("promo fields = (%d, %d), want (0, 0)", result.PromoRuleId, result.PromoDiscount)
-	}
-}
-
-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/order/purchaseLogic.go

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

internal/logic/public/subscribe/promo.go

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

internal/logic/public/subscribe/promo_test.go

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

@@ -47,28 +47,18 @@ func (l *QuerySubscribeListLogic) QuerySubscribeList(req *types.QuerySubscribeLi
 		Total: total,
 	}
 	list := make([]types.Subscribe, len(data))
-	subscribeIDs := make([]int64, 0, len(data))
 	for i, item := range data {
 		var sub types.Subscribe
 		tool.DeepCopy(&sub, item)
-		subscribeIDs = append(subscribeIDs, sub.Id)
 		if item.Discount != "" {
 			var discount []types.SubscribeDiscount
 			_ = json.Unmarshal([]byte(item.Discount), &discount)
 			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 {
@@ -83,9 +73,3 @@ func (l *QuerySubscribeListLogic) QuerySubscribeList(req *types.QuerySubscribeLi
 	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/commissionWithdrawLogic.go

@@ -46,8 +46,8 @@ func (l *CommissionWithdrawLogic) CommissionWithdraw(req *types.CommissionWithdr
 			return nil, errors.Wrapf(xerr.NewErrCode(xerr.InvalidParams), "account is required for bank transfer")
 		}
 	default: // WithdrawalMethodOther
-		if req.Account == "" {
-			return nil, errors.Wrapf(xerr.NewErrCode(xerr.InvalidParams), "account is required for other methods")
+		if req.Account == "" && req.Content == "" {
+			return nil, errors.Wrapf(xerr.NewErrCode(xerr.InvalidParams), "account or content is required for other methods")
 		}
 	}
 

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

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

internal/middleware/authMiddleware.go

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

internal/model/order/model.go

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

internal/model/order/order.go

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

internal/model/promo/model.go

@@ -1,215 +0,0 @@
-package promo
-
-import (
-	"context"
-	"errors"
-
-	"github.com/redis/go-redis/v9"
-	"gorm.io/gorm"
-)
-
-type RuleWithPrice struct {
-	Rule
-	PromoPrice int64 `gorm:"column:promo_price"`
-}
-
-type Model interface {
-	QueryEligibleRules(ctx context.Context, subscribeId int64, quantity int64) ([]*RuleWithPrice, error)
-	InsertUsage(ctx context.Context, data *Usage, tx ...*gorm.DB) error
-	InsertRule(ctx context.Context, data *Rule) error
-	FindRule(ctx context.Context, id int64) (*Rule, error)
-	UpdateRule(ctx context.Context, data *Rule) error
-	DeleteRule(ctx context.Context, id int64) error
-	QueryRuleList(ctx context.Context, page, size int, ruleType string, enabled *bool, search string) (int64, []*Rule, error)
-	UpsertPrices(ctx context.Context, ruleId int64, items []*SubscribePromo) error
-	FindPrice(ctx context.Context, id int64) (*SubscribePromo, error)
-	DeletePrice(ctx context.Context, id int64) error
-	QueryPriceList(ctx context.Context, ruleId int64, page, size int) (int64, []*SubscribePromo, error)
-	QueryUsageList(ctx context.Context, params UsageFilter) (int64, []*Usage, error)
-	Transaction(ctx context.Context, fn func(db *gorm.DB) error) error
-}
-
-type UsageFilter struct {
-	Page        int
-	Size        int
-	RuleId      int64
-	UserId      int64
-	SubscribeId int64
-	OrderNo     string
-}
-
-type defaultPromoModel struct {
-	db *gorm.DB
-}
-
-func NewModel(db *gorm.DB, _ *redis.Client) Model {
-	return &defaultPromoModel{db: db}
-}
-
-func (m *defaultPromoModel) QueryEligibleRules(ctx context.Context, subscribeId int64, quantity int64) ([]*RuleWithPrice, error) {
-	var list []*RuleWithPrice
-	err := m.db.WithContext(ctx).
-		Table("promo_rule AS pr").
-		Select("pr.*, sp.promo_price").
-		Joins("JOIN subscribe_promo AS sp ON sp.promo_rule_id = pr.id").
-		Where("sp.subscribe_id = ? AND sp.quantity = ? AND sp.promo_price > 0 AND pr.enabled = ?", subscribeId, quantity, true).
-		Where("pr.deleted_at IS NULL").
-		Order("pr.priority DESC").
-		Order("pr.id ASC").
-		Find(&list).Error
-	return list, err
-}
-
-func (m *defaultPromoModel) InsertUsage(ctx context.Context, data *Usage, tx ...*gorm.DB) error {
-	db := m.db.WithContext(ctx)
-	if len(tx) > 0 {
-		db = tx[0].WithContext(ctx)
-	}
-	return db.Model(&Usage{}).Create(data).Error
-}
-
-func (m *defaultPromoModel) InsertRule(ctx context.Context, data *Rule) error {
-	return m.db.WithContext(ctx).Create(data).Error
-}
-
-func (m *defaultPromoModel) FindRule(ctx context.Context, id int64) (*Rule, error) {
-	var resp Rule
-	if err := m.db.WithContext(ctx).Model(&Rule{}).Where("id = ?", id).First(&resp).Error; err != nil {
-		return nil, err
-	}
-	return &resp, nil
-}
-
-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
-}
-
-func (m *defaultPromoModel) DeleteRule(ctx context.Context, id int64) error {
-	return m.db.WithContext(ctx).Delete(&Rule{}, id).Error
-}
-
-func (m *defaultPromoModel) QueryRuleList(ctx context.Context, page, size int, ruleType string, enabled *bool, search string) (int64, []*Rule, error) {
-	if page <= 0 {
-		page = 1
-	}
-	if size <= 0 {
-		size = 10
-	}
-	var total int64
-	var list []*Rule
-	db := m.db.WithContext(ctx).Model(&Rule{})
-	if ruleType != "" {
-		db = db.Where("type = ?", ruleType)
-	}
-	if enabled != nil {
-		db = db.Where("enabled = ?", *enabled)
-	}
-	if search != "" {
-		db = db.Where("name LIKE ?", "%"+search+"%")
-	}
-	if err := db.Count(&total).Error; err != nil {
-		return 0, nil, err
-	}
-	err := db.Order("priority DESC").Order("id DESC").Limit(size).Offset((page - 1) * size).Find(&list).Error
-	return total, list, err
-}
-
-func (m *defaultPromoModel) UpsertPrices(ctx context.Context, ruleId int64, items []*SubscribePromo) error {
-	return m.db.WithContext(ctx).Transaction(func(tx *gorm.DB) error {
-		for _, item := range items {
-			if item == nil {
-				continue
-			}
-			item.PromoRuleId = ruleId
-			var existing SubscribePromo
-			err := tx.Model(&SubscribePromo{}).
-				Where("subscribe_id = ? AND quantity = ? AND promo_rule_id = ?", item.SubscribeId, item.Quantity, ruleId).
-				First(&existing).Error
-			if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
-				return err
-			}
-			if errors.Is(err, gorm.ErrRecordNotFound) {
-				if err := tx.Create(item).Error; err != nil {
-					return err
-				}
-				continue
-			}
-			existing.Quantity = item.Quantity
-			existing.PromoPrice = item.PromoPrice
-			if err := tx.Save(&existing).Error; err != nil {
-				return err
-			}
-		}
-		return nil
-	})
-}
-
-func (m *defaultPromoModel) FindPrice(ctx context.Context, id int64) (*SubscribePromo, error) {
-	var resp SubscribePromo
-	if err := m.db.WithContext(ctx).Model(&SubscribePromo{}).Where("id = ?", id).First(&resp).Error; err != nil {
-		return nil, err
-	}
-	return &resp, nil
-}
-
-func (m *defaultPromoModel) DeletePrice(ctx context.Context, id int64) error {
-	return m.db.WithContext(ctx).Delete(&SubscribePromo{}, id).Error
-}
-
-func (m *defaultPromoModel) QueryPriceList(ctx context.Context, ruleId int64, page, size int) (int64, []*SubscribePromo, error) {
-	if page <= 0 {
-		page = 1
-	}
-	if size <= 0 {
-		size = 10
-	}
-	var total int64
-	var list []*SubscribePromo
-	db := m.db.WithContext(ctx).Model(&SubscribePromo{}).Where("promo_rule_id = ?", ruleId)
-	if err := db.Count(&total).Error; err != nil {
-		return 0, nil, err
-	}
-	err := db.Order("id DESC").Limit(size).Offset((page - 1) * size).Find(&list).Error
-	return total, list, err
-}
-
-func (m *defaultPromoModel) QueryUsageList(ctx context.Context, params UsageFilter) (int64, []*Usage, error) {
-	if params.Page <= 0 {
-		params.Page = 1
-	}
-	if params.Size <= 0 {
-		params.Size = 10
-	}
-	var total int64
-	var list []*Usage
-	db := m.db.WithContext(ctx).Model(&Usage{})
-	if params.RuleId > 0 {
-		db = db.Where("promo_rule_id = ?", params.RuleId)
-	}
-	if params.UserId > 0 {
-		db = db.Where("user_id = ?", params.UserId)
-	}
-	if params.SubscribeId > 0 {
-		db = db.Where("subscribe_id = ?", params.SubscribeId)
-	}
-	if params.OrderNo != "" {
-		db = db.Where("order_no = ?", params.OrderNo)
-	}
-	if err := db.Count(&total).Error; err != nil {
-		return 0, nil, err
-	}
-	err := db.Order("id DESC").Limit(params.Size).Offset((params.Page - 1) * params.Size).Find(&list).Error
-	return total, list, err
-}
-
-func (m *defaultPromoModel) Transaction(ctx context.Context, fn func(db *gorm.DB) error) error {
-	return m.db.WithContext(ctx).Transaction(fn)
-}

internal/model/promo/promo.go

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

internal/model/user/user.go

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

internal/svc/serviceContext.go

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

internal/types/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

@@ -316,45 +316,6 @@ type ContactRequest struct {
 	Notes        string `json:"notes" validate:"max=2000"`
 }
 
-type PromoPrice struct {
-	Id          int64 `json:"id"`
-	SubscribeId int64 `json:"subscribe_id"`
-	PromoRuleId int64 `json:"promo_rule_id"`
-	Quantity    int64 `json:"quantity"`
-	PromoPrice  int64 `json:"promo_price"`
-	CreatedAt   int64 `json:"created_at"`
-	UpdatedAt   int64 `json:"updated_at"`
-}
-
-type PromoPriceItem struct {
-	SubscribeId int64 `json:"subscribe_id" validate:"required,gt=0"`
-	Quantity    int64 `json:"quantity" validate:"required,gt=0,lte=1000"`
-	PromoPrice  int64 `json:"promo_price" validate:"required,gt=0"`
-}
-
-type PromoRule struct {
-	Id        int64                  `json:"id"`
-	Name      string                 `json:"name"`
-	Type      string                 `json:"type"`
-	Params    map[string]interface{} `json:"params"`
-	Priority  int64                  `json:"priority"`
-	Enabled   bool                   `json:"enabled"`
-	StartTime *int64                 `json:"start_time"`
-	EndTime   *int64                 `json:"end_time"`
-	CreatedAt int64                  `json:"created_at"`
-	UpdatedAt int64                  `json:"updated_at"`
-}
-
-type PromoUsage struct {
-	Id          int64  `json:"id"`
-	UserId      int64  `json:"user_id"`
-	PromoRuleId int64  `json:"promo_rule_id"`
-	SubscribeId int64  `json:"subscribe_id"`
-	OrderNo     string `json:"order_no"`
-	PromoPrice  int64  `json:"promo_price"`
-	CreatedAt   int64  `json:"created_at"`
-}
-
 type Coupon struct {
 	Id         int64   `json:"id"`
 	Name       string  `json:"name"`
@@ -414,16 +375,6 @@ type CreateCouponRequest struct {
 	Enable     *bool   `json:"enable,omitempty"`
 }
 
-type CreatePromoRuleRequest struct {
-	Name      string                 `json:"name" validate:"required,max=100"`
-	Type      string                 `json:"type" validate:"required,oneof=new_user inactive_user campaign"`
-	Params    map[string]interface{} `json:"params"`
-	Priority  int64                  `json:"priority" validate:"gte=0"`
-	Enabled   *bool                  `json:"enabled"`
-	StartTime *int64                 `json:"start_time"`
-	EndTime   *int64                 `json:"end_time"`
-}
-
 type CreateDocumentRequest struct {
 	Title   string   `json:"title" validate:"required"`
 	Content string   `json:"content" validate:"required"`
@@ -590,12 +541,10 @@ type CreateUserRequest struct {
 }
 
 type CreateUserSubscribeRequest struct {
-	UserId       int64  `json:"user_id"`
-	ExpiredAt    int64  `json:"expired_at"`
-	Traffic      int64  `json:"traffic"`
-	SubscribeId  int64  `json:"subscribe_id"`
-	SpeedLimit   int64  `json:"speed_limit,optional"`
-	TrafficLimit string `json:"traffic_limit,optional"`
+	UserId      int64 `json:"user_id"`
+	ExpiredAt   int64 `json:"expired_at"`
+	Traffic     int64 `json:"traffic"`
+	SubscribeId int64 `json:"subscribe_id"`
 }
 
 type CreateUserTicketFollowRequest struct {
@@ -828,7 +777,13 @@ type FileUploadRequest struct {
 }
 
 type FileUploadResponse struct {
-	Url string `json:"url"`
+	FileId      string `json:"file_id"`
+	FileName    string `json:"file_name"`
+	ObjectKey   string `json:"object_key"`
+	Size        int64  `json:"size"`
+	ContentType string `json:"content_type"`
+	Etag        string `json:"etag"`
+	Status      string `json:"status"`
 }
 
 type FileUploadCompleteRequest struct {
@@ -836,7 +791,12 @@ type FileUploadCompleteRequest struct {
 }
 
 type FileUploadCompleteResponse struct {
-	Url string `json:"url"`
+	FileId      string `json:"file_id"`
+	ObjectKey   string `json:"object_key"`
+	Size        int64  `json:"size"`
+	ContentType string `json:"content_type"`
+	Etag        string `json:"etag"`
+	Status      string `json:"status"`
 }
 
 type FileUploadInitRequest struct {
@@ -1145,48 +1105,6 @@ type GetCouponListResponse struct {
 	List  []Coupon `json:"list"`
 }
 
-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"`
-}
-
-type GetPromoPriceListResponse struct {
-	Total int64        `json:"total"`
-	List  []PromoPrice `json:"list"`
-}
-
-type GetPromoRuleDetailRequest struct {
-	Id int64 `uri:"id" validate:"required,gt=0"`
-}
-
-type GetPromoRuleListRequest struct {
-	Page    int64  `form:"page" validate:"required,gt=0"`
-	Size    int64  `form:"size" validate:"required,gt=0,lte=200"`
-	Type    string `form:"type" validate:"omitempty,oneof=new_user inactive_user campaign"`
-	Enabled *bool  `form:"enabled"`
-	Search  string `form:"search,omitempty"`
-}
-
-type GetPromoRuleListResponse struct {
-	Total int64       `json:"total"`
-	List  []PromoRule `json:"list"`
-}
-
-type GetPromoUsageListRequest struct {
-	Page        int64  `form:"page" validate:"required,gt=0"`
-	Size        int64  `form:"size" validate:"required,gt=0,lte=200"`
-	RuleId      int64  `form:"rule_id,omitempty"`
-	UserId      int64  `form:"user_id,omitempty"`
-	SubscribeId int64  `form:"subscribe_id,omitempty"`
-	OrderNo     string `form:"order_no,omitempty"`
-}
-
-type GetPromoUsageListResponse struct {
-	Total int64        `json:"total"`
-	List  []PromoUsage `json:"list"`
-}
-
 type GetDetailRequest struct {
 	Id int64 `form:"id" validate:"required"`
 }
@@ -1948,8 +1866,6 @@ type Order struct {
 	Amount         int64         `json:"amount"`
 	GiftAmount     int64         `json:"gift_amount"`
 	Discount       int64         `json:"discount"`
-	PromoRuleId    int64         `json:"promo_rule_id"`
-	PromoDiscount  int64         `json:"promo_discount"`
 	Coupon         string        `json:"coupon"`
 	CouponDiscount int64         `json:"coupon_discount"`
 	Commission     int64         `json:"commission,omitempty"`
@@ -1973,8 +1889,6 @@ type OrderDetail struct {
 	Amount         int64         `json:"amount"`
 	GiftAmount     int64         `json:"gift_amount"`
 	Discount       int64         `json:"discount"`
-	PromoRuleId    int64         `json:"promo_rule_id"`
-	PromoDiscount  int64         `json:"promo_discount"`
 	Coupon         string        `json:"coupon"`
 	CouponDiscount int64         `json:"coupon_discount"`
 	Commission     int64         `json:"commission,omitempty"`
@@ -2096,7 +2010,6 @@ type PreOrderResponse struct {
 	Price          int64  `json:"price"`
 	Amount         int64  `json:"amount"`
 	Discount       int64  `json:"discount"`
-	PromoDiscount  int64  `json:"promo_discount"`
 	GiftAmount     int64  `json:"gift_amount"`
 	Coupon         string `json:"coupon"`
 	CouponDiscount int64  `json:"coupon_discount"`
@@ -2865,13 +2778,6 @@ type StripePayment struct {
 	PublishableKey string `json:"publishable_key"`
 }
 
-type SubscribePromo struct {
-	RuleName   string `json:"rule_name"`
-	RuleType   string `json:"rule_type"`
-	PromoPrice int64  `json:"promo_price"`
-	ExpiresAt  int64  `json:"expires_at"`
-}
-
 type Subscribe struct {
 	Id                int64               `json:"id"`
 	Name              string              `json:"name"`
@@ -2940,11 +2846,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 {
@@ -3221,30 +3126,6 @@ type UpdateCouponRequest struct {
 	Enable     *bool   `json:"enable,omitempty"`
 }
 
-type SetPromoPriceRequest struct {
-	PromoRuleId int64            `json:"promo_rule_id" validate:"required,gt=0"`
-	Items       []PromoPriceItem `json:"items" validate:"required,min=1,dive"`
-}
-
-type DeletePromoPriceRequest struct {
-	Id int64 `uri:"id" validate:"required,gt=0"`
-}
-
-type DeletePromoRuleRequest struct {
-	Id int64 `uri:"id" validate:"required,gt=0"`
-}
-
-type UpdatePromoRuleRequest struct {
-	Id        int64                  `uri:"id" validate:"required,gt=0"`
-	Name      string                 `json:"name" validate:"required,max=100"`
-	Type      string                 `json:"type" validate:"required,oneof=new_user inactive_user campaign"`
-	Params    map[string]interface{} `json:"params"`
-	Priority  int64                  `json:"priority" validate:"gte=0"`
-	Enabled   *bool                  `json:"enabled"`
-	StartTime *int64                 `json:"start_time"`
-	EndTime   *int64                 `json:"end_time"`
-}
-
 type UpdateDocumentRequest struct {
 	Id      int64    `json:"id" validate:"required"`
 	Title   string   `json:"title" validate:"required"`
@@ -3436,14 +3317,12 @@ type UpdateUserSubscribeNoteRequest struct {
 }
 
 type UpdateUserSubscribeRequest struct {
-	UserSubscribeId int64   `json:"user_subscribe_id"`
-	SubscribeId     int64   `json:"subscribe_id"`
-	Traffic         int64   `json:"traffic"`
-	ExpiredAt       int64   `json:"expired_at"`
-	Upload          int64   `json:"upload"`
-	Download        int64   `json:"download"`
-	SpeedLimit      *int64  `json:"speed_limit,omitempty"`
-	TrafficLimit    *string `json:"traffic_limit,omitempty"`
+	UserSubscribeId int64 `json:"user_subscribe_id"`
+	SubscribeId     int64 `json:"subscribe_id"`
+	Traffic         int64 `json:"traffic"`
+	ExpiredAt       int64 `json:"expired_at"`
+	Upload          int64 `json:"upload"`
+	Download        int64 `json:"download"`
 }
 
 type UpdateUserTicketStatusRequest struct {
@@ -3595,33 +3474,30 @@ type UserSubscribe struct {
 }
 
 type UserSubscribeDetail struct {
-	Id             int64          `json:"id"`
-	UserId         int64          `json:"user_id"`
-	User           User           `json:"user"`
-	OrderId        int64          `json:"order_id"`
-	SubscribeId    int64          `json:"subscribe_id"`
-	Subscribe      Subscribe      `json:"subscribe"`
-	NodeGroupId    int64          `json:"node_group_id"`
-	NodeGroupName  string         `json:"node_group_name"`
-	GroupLocked    bool           `json:"group_locked"`
-	StartTime      int64          `json:"start_time"`
-	ExpireTime     int64          `json:"expire_time"`
-	ResetTime      int64          `json:"reset_time"`
-	Traffic        int64          `json:"traffic"`
-	Download       int64          `json:"download"`
-	Upload         int64          `json:"upload"`
-	SpeedLimit     int64          `json:"speed_limit"`
-	TrafficLimit   []TrafficLimit `json:"user_traffic_limit"`
-	PlanSpeedLimit int64          `json:"plan_speed_limit"`
-	Token          string         `json:"token"`
-	Status         uint8          `json:"status"`
-	EffectiveSpeed int64          `json:"effective_speed"`
-	IsThrottled    bool           `json:"is_throttled"`
-	ThrottleRule   string         `json:"throttle_rule,omitempty"`
-	ThrottleStart  int64          `json:"throttle_start,omitempty"`
-	ThrottleEnd    int64          `json:"throttle_end,omitempty"`
-	CreatedAt      int64          `json:"created_at"`
-	UpdatedAt      int64          `json:"updated_at"`
+	Id             int64     `json:"id"`
+	UserId         int64     `json:"user_id"`
+	User           User      `json:"user"`
+	OrderId        int64     `json:"order_id"`
+	SubscribeId    int64     `json:"subscribe_id"`
+	Subscribe      Subscribe `json:"subscribe"`
+	NodeGroupId    int64     `json:"node_group_id"`
+	NodeGroupName  string    `json:"node_group_name"`
+	GroupLocked    bool      `json:"group_locked"`
+	StartTime      int64     `json:"start_time"`
+	ExpireTime     int64     `json:"expire_time"`
+	ResetTime      int64     `json:"reset_time"`
+	Traffic        int64     `json:"traffic"`
+	Download       int64     `json:"download"`
+	Upload         int64     `json:"upload"`
+	Token          string    `json:"token"`
+	Status         uint8     `json:"status"`
+	EffectiveSpeed int64     `json:"effective_speed"`
+	IsThrottled    bool      `json:"is_throttled"`
+	ThrottleRule   string    `json:"throttle_rule,omitempty"`
+	ThrottleStart  int64     `json:"throttle_start,omitempty"`
+	ThrottleEnd    int64     `json:"throttle_end,omitempty"`
+	CreatedAt      int64     `json:"created_at"`
+	UpdatedAt      int64     `json:"updated_at"`
 }
 
 type UserSubscribeInfo struct {

node.json

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

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

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

queue/logic/order/activateOrderLogic.go

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

scripts/convert_recovery_orders/main.go

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

scripts/doc.go

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

scripts/reconcile_mihapay_orders/main.go

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

user.json

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