修复(#73): 修正促销迁移表结构

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"`
-		Size    int64  `form:"size" validate:"required"`
-		Type    string `form:"type" validate:"omitempty,oneof=new_user inactive_user campaign"`
-		Enabled *bool  `form:"enabled"`
-		Search  string `form:"search,omitempty"`
-	}
-	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,dive"`
-	}
-	GetPromoPriceListRequest {
-		PromoRuleId int64 `form:"promo_rule_id" validate:"required,gt=0"`
-		Page        int64 `form:"page" validate:"required"`
-		Size        int64 `form:"size" validate:"required"`
-	}
-	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"`
-		Size        int64  `form:"size" validate:"required"`
-		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/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

@@ -230,41 +230,6 @@ type (
 		Discount float64 `json:"discount"`
 		MapApple string  `json:"map_apple"`
 	}
-	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"`

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
+ALTER TABLE `withdrawals`
-WHERE TABLE_SCHEMA = DATABASE() AND TABLE_NAME = 'withdrawals' AND COLUMN_NAME = 'method';
+  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`,
-SET @ddl = IF(@col_exists = 0,
+  ADD COLUMN `qr_code_url` VARCHAR(500) NOT NULL DEFAULT '' COMMENT '收款码图片URL' AFTER `account`;
-  '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;

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))
 

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,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 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 {
-		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,36 +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 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.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/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,67 +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"
-	"gorm.io/gorm"
-)
-
-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())
-	}
-	items := make([]*promomodel.SubscribePromo, 0, len(req.Items))
-	cacheKeys := make([]string, 0, len(req.Items))
-	for _, item := range req.Items {
-		sub, err := l.svcCtx.SubscribeModel.FindOne(l.ctx, item.SubscribeId)
-		if err != nil {
-			if errors.Is(err, gorm.ErrRecordNotFound) {
-				return errors.Wrapf(xerr.NewErrCode(xerr.InvalidParams), "subscribe plan not found")
-			}
-			l.Errorw("[SetPromoPrice] Find Subscribe Error", logger.Field("error", err.Error()))
-			return errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), "find subscribe error: %v", err.Error())
-		}
-		originPrice := sub.UnitPrice * item.Quantity
-		if item.PromoPrice >= originPrice {
-			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/common/promoEligibility.go

@@ -27,13 +27,13 @@ type promoRuleParams struct {
 	InactiveMonths int `json:"inactive_months"`
 }
 
-func EvaluatePromo(ctx context.Context, svcCtx *svc.ServiceContext, userID int64, subscribeID int64, quantity int64) (*PromoResult, error) {
+func EvaluatePromo(ctx context.Context, svcCtx *svc.ServiceContext, userID int64, subscribeID int64) (*PromoResult, error) {
 	result := &PromoResult{}
-	if svcCtx == nil || svcCtx.PromoModel == nil || svcCtx.DB == nil || userID <= 0 || subscribeID <= 0 || quantity <= 0 {
+	if svcCtx == nil || svcCtx.PromoModel == nil || svcCtx.DB == nil || userID <= 0 || subscribeID <= 0 {
 		return result, nil
 	}
 
-	rules, err := svcCtx.PromoModel.QueryEligibleRules(ctx, subscribeID, quantity)
+	rules, err := svcCtx.PromoModel.QueryEligibleRules(ctx, subscribeID)
 	if err != nil {
 		return nil, errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), "query promo rules failed: %v", err.Error())
 	}

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

@@ -36,7 +36,7 @@ func calculatePurchasePrice(
 	}
 
 	if allowPromo {
-		promoResult, err := commonLogic.EvaluatePromo(ctx, svcCtx, userID, subscribeID, quantity)
+		promoResult, err := commonLogic.EvaluatePromo(ctx, svcCtx, userID, subscribeID)
 		if err != nil {
 			return nil, err
 		}

internal/logic/public/order/promoPricing_test.go

@@ -14,7 +14,7 @@ type fakePromoModel struct {
 	rules []*promo.RuleWithPrice
 }
 
-func (m fakePromoModel) QueryEligibleRules(context.Context, int64, int64) ([]*promo.RuleWithPrice, error) {
+func (m fakePromoModel) QueryEligibleRules(context.Context, int64) ([]*promo.RuleWithPrice, error) {
 	return m.rules, nil
 }
 
@@ -22,50 +22,6 @@ func (m fakePromoModel) InsertUsage(context.Context, *promo.Usage, ...*gorm.DB)
 	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 TestCalculatePurchasePricePromoSkipsPercentDiscount(t *testing.T) {
 	svcCtx := &svc.ServiceContext{
 		DB: &gorm.DB{},

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 == "" {
+		if req.Account == "" && req.Content == "" {
-			return nil, errors.Wrapf(xerr.NewErrCode(xerr.InvalidParams), "account is required for other methods")
+			return nil, errors.Wrapf(xerr.NewErrCode(xerr.InvalidParams), "account or content is required for other methods")
 		}
 	}
 

internal/model/promo/model.go

@@ -2,7 +2,6 @@ package promo
 
 import (
 	"context"
-	"errors"
 
 	"github.com/redis/go-redis/v9"
 	"gorm.io/gorm"
@@ -14,28 +13,8 @@ type RuleWithPrice struct {
 }
 
 type Model interface {
-	QueryEligibleRules(ctx context.Context, subscribeId int64, quantity int64) ([]*RuleWithPrice, error)
+	QueryEligibleRules(ctx context.Context, subscribeId 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 {
@@ -46,13 +25,13 @@ 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) {
+func (m *defaultPromoModel) QueryEligibleRules(ctx context.Context, subscribeId int64) ([]*RuleWithPrice, error) {
 	var list []*RuleWithPrice
 	err := m.db.WithContext(ctx).
 		Table("promo_rule AS pr").
 		Select("pr.*, sp.promo_price").
 		Joins("JOIN subscribe_promo AS sp ON sp.promo_rule_id = pr.id").
-		Where("sp.subscribe_id = ? AND sp.quantity = ? AND sp.promo_price > 0 AND pr.enabled = ?", subscribeId, quantity, true).
+		Where("sp.subscribe_id = ? AND sp.promo_price > 0 AND pr.enabled = ?", subscribeId, true).
 		Where("pr.deleted_at IS NULL").
 		Order("pr.priority DESC").
 		Order("pr.id ASC").
@@ -67,138 +46,3 @@ func (m *defaultPromoModel) InsertUsage(ctx context.Context, data *Usage, tx ...
 	}
 	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).Save(data).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) {
-				return tx.Create(item).Error
-			}
-			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

@@ -33,7 +33,6 @@ func (Rule) TableName() string {
 type SubscribePromo struct {
 	Id          int64     `gorm:"primaryKey"`
 	SubscribeId int64     `gorm:"type:bigint unsigned;not null;comment:Subscribe ID"`
-	Quantity    int64     `gorm:"type:bigint;not null;default:1;comment:Quantity"`
 	PromoRuleId int64     `gorm:"type:bigint unsigned;not null;comment:Promo Rule ID"`
 	PromoPrice  int64     `gorm:"type:bigint;not null;default:0;comment:Promo Price"`
 	CreatedAt   time.Time `gorm:"<-:create;comment:Create Time"`

internal/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"`
@@ -828,7 +779,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 +793,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 +1107,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"`
-	Size        int64 `form:"size" validate:"required"`
-}
-
-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"`
-	Size    int64  `form:"size" validate:"required"`
-	Type    string `form:"type" validate:"omitempty,oneof=new_user inactive_user campaign"`
-	Enabled *bool  `form:"enabled"`
-	Search  string `form:"search,omitempty"`
-}
-
-type GetPromoRuleListResponse struct {
-	Total int64       `json:"total"`
-	List  []PromoRule `json:"list"`
-}
-
-type GetPromoUsageListRequest struct {
-	Page        int64  `form:"page" validate:"required"`
-	Size        int64  `form:"size" validate:"required"`
-	RuleId      int64  `form:"rule_id,omitempty"`
-	UserId      int64  `form:"user_id,omitempty"`
-	SubscribeId int64  `form:"subscribe_id,omitempty"`
-	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"`
 }
@@ -3221,30 +3141,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,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"`