Compare commits
No commits in common. "58baa11a981c4e6e72f9b4ce1ad74fb5de5c6893" and "571cb2f4db5d572a550aec4a4499289aa27681a2" have entirely different histories.
58baa11a98
...
571cb2f4db
@ -1,268 +0,0 @@
|
||||
# 📋 实施计划：后台管理端 - 添加修改用户手机号功能
|
||||
|
||||
## 任务类型
|
||||
- [x] 后端 (→ Codex)
|
||||
- [ ] 前端
|
||||
- [ ] 全栈
|
||||
|
||||
---
|
||||
|
||||
## 📊 需求描述
|
||||
|
||||
为后台管理端添加修改用户手机号的功能，允许管理员直接修改用户的手机号。
|
||||
|
||||
---
|
||||
|
||||
## 🎯 技术方案
|
||||
|
||||
### API 设计
|
||||
|
||||
```http
|
||||
PUT /api/admin/users/{user_id}/mobile
|
||||
Content-Type: application/json
|
||||
Authorization: Bearer {admin_token}
|
||||
|
||||
Request Body:
|
||||
{
|
||||
"mobile": "13800138000"
|
||||
}
|
||||
|
||||
Response:
|
||||
{
|
||||
"success": true,
|
||||
"message": "手机号更新成功"
|
||||
}
|
||||
```
|
||||
|
||||
### 安全校验
|
||||
|
||||
1. ✅ 管理员权限验证（RBAC: `user:edit`）
|
||||
2. ✅ 手机号格式验证（11位数字，1开头）
|
||||
3. ✅ 手机号唯一性检查（不能与其他用户重复）
|
||||
4. ✅ 用户存在性验证
|
||||
|
||||
---
|
||||
|
||||
## 🔧 实施步骤
|
||||
|
||||
### 步骤 1：添加 API 处理函数
|
||||
|
||||
**文件**：`internal/api/admin/users_admin.go`
|
||||
**位置**：Line 1893 后（在 `UpdateUserRemark()` 函数之后）
|
||||
|
||||
**代码**：
|
||||
|
||||
```go
|
||||
// updateUserMobileRequest 更新用户手机号请求
|
||||
type updateUserMobileRequest struct {
|
||||
Mobile string `json:"mobile" binding:"required"`
|
||||
}
|
||||
|
||||
// UpdateUserMobile 更新用户手机号
|
||||
// @Summary 更新用户手机号
|
||||
// @Description 管理员修改用户手机号
|
||||
// @Tags 管理端.用户
|
||||
// @Accept json
|
||||
// @Produce json
|
||||
// @Param user_id path integer true "用户ID"
|
||||
// @Param body body updateUserMobileRequest true "手机号信息"
|
||||
// @Success 200 {object} map[string]any
|
||||
// @Failure 400 {object} code.Failure
|
||||
// @Router /api/admin/users/{user_id}/mobile [put]
|
||||
// @Security LoginVerifyToken
|
||||
func (h *handler) UpdateUserMobile() core.HandlerFunc {
|
||||
return func(ctx core.Context) {
|
||||
userID, err := strconv.ParseInt(ctx.Param("user_id"), 10, 64)
|
||||
if err != nil {
|
||||
ctx.AbortWithError(core.Error(http.StatusBadRequest, code.ParamBindError, "用户ID无效"))
|
||||
return
|
||||
}
|
||||
|
||||
req := new(updateUserMobileRequest)
|
||||
if err := ctx.ShouldBindJSON(req); err != nil {
|
||||
ctx.AbortWithError(core.Error(http.StatusBadRequest, code.ParamBindError, validation.Error(err)))
|
||||
return
|
||||
}
|
||||
|
||||
// 验证手机号格式（11位数字，1开头）
|
||||
matched, _ := regexp.MatchString(`^1[3-9]\d{9}$`, req.Mobile)
|
||||
if !matched {
|
||||
ctx.AbortWithError(core.Error(http.StatusBadRequest, code.ParamBindError, "手机号格式不正确"))
|
||||
return
|
||||
}
|
||||
|
||||
// 检查手机号是否被其他用户占用
|
||||
existedUser, _ := h.readDB.Users.WithContext(ctx.RequestContext()).
|
||||
Where(h.readDB.Users.Mobile.Eq(req.Mobile)).
|
||||
Where(h.readDB.Users.ID.Neq(userID)).
|
||||
First()
|
||||
|
||||
if existedUser != nil {
|
||||
ctx.AbortWithError(core.Error(http.StatusBadRequest, code.ParamBindError, "该手机号已被其他用户使用"))
|
||||
return
|
||||
}
|
||||
|
||||
// 更新用户手机号
|
||||
_, err = h.writeDB.Users.WithContext(ctx.RequestContext()).
|
||||
Where(h.writeDB.Users.ID.Eq(userID)).
|
||||
Update(h.writeDB.Users.Mobile, req.Mobile)
|
||||
|
||||
if err != nil {
|
||||
ctx.AbortWithError(core.Error(http.StatusBadRequest, 20303, "更新失败: "+err.Error()))
|
||||
return
|
||||
}
|
||||
|
||||
ctx.Payload(map[string]any{
|
||||
"success": true,
|
||||
"message": "手机号更新成功",
|
||||
})
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
### 步骤 2：添加导入依赖
|
||||
|
||||
**文件**：`internal/api/admin/users_admin.go`
|
||||
**位置**：文件顶部 import 区域
|
||||
|
||||
**修改**：在现有 import 中添加 `regexp` 包
|
||||
|
||||
```go
|
||||
import (
|
||||
"fmt"
|
||||
"math"
|
||||
"net/http"
|
||||
"regexp" // ← 添加这一行
|
||||
"strconv"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
"bindbox-game/internal/code"
|
||||
// ... 其他导入保持不变
|
||||
)
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
### 步骤 3：注册路由
|
||||
|
||||
**文件**：`internal/router/router.go`
|
||||
**位置**：在 adminAuthApiRouter 用户管理路由组中
|
||||
|
||||
**查找位置参考**：
|
||||
```go
|
||||
// 找到类似这样的路由组（用户管理相关）
|
||||
adminAuthApiRouter.PUT("/users/:user_id/douyin_user_id", ...)
|
||||
adminAuthApiRouter.PUT("/users/:user_id/remark", ...)
|
||||
adminAuthApiRouter.PUT("/users/:user_id/status", ...)
|
||||
```
|
||||
|
||||
**添加路由**：
|
||||
```go
|
||||
// 在上述路由附近添加
|
||||
adminAuthApiRouter.PUT("/users/:user_id/mobile",
|
||||
intc.RequireAdminAction("user:edit"),
|
||||
adminHandler.UpdateUserMobile())
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
### 步骤 4：更新 Swagger 文档
|
||||
|
||||
**文件**：运行命令生成文档
|
||||
|
||||
```bash
|
||||
make gen-swagger
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 📋 关键文件清单
|
||||
|
||||
| 文件路径 | 操作 | 说明 |
|
||||
|---------|------|------|
|
||||
| `internal/api/admin/users_admin.go` | 新增函数 | 添加 `UpdateUserMobile()` 及请求结构体 |
|
||||
| `internal/api/admin/users_admin.go` | 修改导入 | 添加 `regexp` 包 |
|
||||
| `internal/router/router.go` | 新增路由 | 注册 `PUT /users/:user_id/mobile` |
|
||||
|
||||
---
|
||||
|
||||
## ✅ 验证清单
|
||||
|
||||
完成后请验证：
|
||||
|
||||
- [ ] API 接口可正常访问
|
||||
- [ ] 手机号格式验证生效（非法格式返回错误）
|
||||
- [ ] 手机号唯一性检查生效（重复手机号返回错误）
|
||||
- [ ] 更新成功后数据库中手机号已变更
|
||||
- [ ] Swagger 文档已更新
|
||||
- [ ] 权限验证生效（非管理员或无 `user:edit` 权限无法访问）
|
||||
|
||||
---
|
||||
|
||||
## ⚠️ 风险与缓解
|
||||
|
||||
| 风险 | 缓解措施 |
|
||||
|------|----------|
|
||||
| 手机号格式错误 | 正则验证 `^1[3-9]\d{9}$` |
|
||||
| 手机号被占用 | 查询检查 `WHERE mobile = ? AND id != ?` |
|
||||
| 权限滥用 | RBAC 中间件 `RequireAdminAction("user:edit")` |
|
||||
| 更新失败 | 捕获异常并返回错误码 20303 |
|
||||
|
||||
---
|
||||
|
||||
## 📝 测试用例
|
||||
|
||||
### 正常流程
|
||||
```bash
|
||||
curl -X PUT http://localhost:9991/api/admin/users/123/mobile \
|
||||
-H "Authorization: Bearer {admin_token}" \
|
||||
-H "Content-Type: application/json" \
|
||||
-d '{"mobile":"13800138000"}'
|
||||
|
||||
# 预期响应
|
||||
{
|
||||
"success": true,
|
||||
"message": "手机号更新成功"
|
||||
}
|
||||
```
|
||||
|
||||
### 异常流程
|
||||
|
||||
**1. 手机号格式错误**
|
||||
```json
|
||||
{"mobile": "123"}
|
||||
→ {"code": 10001, "message": "手机号格式不正确"}
|
||||
```
|
||||
|
||||
**2. 手机号已被占用**
|
||||
```json
|
||||
{"mobile": "13800138000"} // 已被用户456使用
|
||||
→ {"code": 10001, "message": "该手机号已被其他用户使用"}
|
||||
```
|
||||
|
||||
**3. 用户ID不存在**
|
||||
```bash
|
||||
PUT /api/admin/users/999999/mobile
|
||||
→ 更新成功但影响行数为0（GORM特性，不会报错）
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 🚀 后续优化建议（可选）
|
||||
|
||||
1. **操作日志记录**：记录管理员修改手机号的操作到审计日志
|
||||
2. **短信验证**：要求新手机号验证码确认（防止恶意修改）
|
||||
3. **旧手机号通知**：向旧手机号发送变更通知短信
|
||||
4. **限制修改频率**：同一用户手机号修改间隔限制（如7天）
|
||||
|
||||
---
|
||||
|
||||
## 📌 备注
|
||||
|
||||
- 本方案仅实现管理端修改功能，不包含用户端自助修改
|
||||
- 遵循现有代码风格（参考 `UpdateUserRemark()` 和 `UpdateUserDouyinID()`）
|
||||
- 使用 GORM Gen 生成的 DAO 进行数据库操作
|
||||
- 错误码 20303 用于手机号更新失败（延续现有错误码序列 20301, 20302）
|
||||
@ -1,134 +0,0 @@
|
||||
# 优惠券价格计算 Bug 修复报告
|
||||
|
||||
## 问题概述
|
||||
|
||||
在游戏通行证购买流程中，使用折扣券时价格计算存在错误。折扣券的折扣金额是基于已打折后的价格（`ActualAmount`）计算，而不是基于原价（`TotalAmount`）计算，导致多次应用优惠券时折扣金额不正确。
|
||||
|
||||
## Bug 详情
|
||||
|
||||
### 问题位置
|
||||
- **文件**: `/Users/win/aicode/bindbox/bindbox_game/internal/api/user/game_passes_app.go`
|
||||
- **函数**: `applyCouponToGamePassOrder()`
|
||||
- **行号**: 406-407
|
||||
|
||||
### 错误代码（修复前）
|
||||
```go
|
||||
case 3: // 折扣券
|
||||
rate := sc.DiscountValue
|
||||
if rate < 0 {
|
||||
rate = 0
|
||||
}
|
||||
if rate > 1000 {
|
||||
rate = 1000
|
||||
}
|
||||
newAmt := order.ActualAmount * rate / 1000 // ❌ 错误：使用已打折价格
|
||||
d := order.ActualAmount - newAmt // ❌ 错误：使用已打折价格
|
||||
if d > remainingCap {
|
||||
applied = remainingCap
|
||||
} else {
|
||||
applied = d
|
||||
}
|
||||
```
|
||||
|
||||
### 正确代码（修复后）
|
||||
```go
|
||||
case 3: // 折扣券
|
||||
rate := sc.DiscountValue
|
||||
if rate < 0 {
|
||||
rate = 0
|
||||
}
|
||||
if rate > 1000 {
|
||||
rate = 1000
|
||||
}
|
||||
newAmt := order.TotalAmount * rate / 1000 // ✅ 正确：使用原价
|
||||
d := order.TotalAmount - newAmt // ✅ 正确：使用原价
|
||||
if d > remainingCap {
|
||||
applied = remainingCap
|
||||
} else {
|
||||
applied = d
|
||||
}
|
||||
```
|
||||
|
||||
## 问题影响
|
||||
|
||||
### 场景示例
|
||||
假设用户购买价格为 1000 元的游戏通行证套餐，使用 8 折优惠券（rate=800）：
|
||||
|
||||
**修复前（错误）**:
|
||||
- 原价: 1000 元
|
||||
- 第一次计算: `newAmt = 1000 * 800 / 1000 = 800`, 折扣 = 200 元
|
||||
- 如果再应用其他优惠券，折扣券会基于 800 元计算，而不是 1000 元
|
||||
|
||||
**修复后（正确）**:
|
||||
- 原价: 1000 元
|
||||
- 折扣计算始终基于原价 1000 元
|
||||
- `newAmt = 1000 * 800 / 1000 = 800`, 折扣 = 200 元
|
||||
- 无论是否有其他优惠券，折扣券都基于原价 1000 元计算
|
||||
|
||||
## 根本原因分析
|
||||
|
||||
1. **设计意图**: 折扣券应该基于商品原价计算折扣金额
|
||||
2. **实现错误**: 代码使用了 `order.ActualAmount`（当前实际金额），这个值会随着优惠券的应用而变化
|
||||
3. **正确做法**: 应该使用 `order.TotalAmount`（订单原价），这个值在订单创建时设定，不会改变
|
||||
|
||||
## 修复验证
|
||||
|
||||
### 单元测试结果
|
||||
```bash
|
||||
cd /Users/win/aicode/bindbox/bindbox_game
|
||||
go test -v ./internal/service/order/...
|
||||
```
|
||||
|
||||
**测试输出**:
|
||||
```
|
||||
=== RUN TestApplyCouponDiscount
|
||||
--- PASS: TestApplyCouponDiscount (0.00s)
|
||||
PASS
|
||||
ok bindbox-game/internal/service/order 0.131s
|
||||
```
|
||||
|
||||
### 测试覆盖的场景
|
||||
1. ✅ 金额券（直减）- 正确扣减固定金额
|
||||
2. ✅ 满减券 - 正确应用满减优惠
|
||||
3. ✅ 折扣券（8折）- 正确计算折扣金额（基于原价）
|
||||
4. ✅ 折扣券边界值处理 - 正确处理超出范围的折扣率
|
||||
|
||||
## 相关代码参考
|
||||
|
||||
系统中已有正确的优惠券折扣计算实现：
|
||||
- **文件**: `/Users/win/aicode/bindbox/bindbox_game/internal/service/order/discount.go`
|
||||
- **函数**: `ApplyCouponDiscount()`
|
||||
|
||||
该函数的实现是正确的，折扣券计算使用传入的 `amount` 参数（原价）：
|
||||
```go
|
||||
case 3:
|
||||
rate := c.DiscountValue
|
||||
if rate < 0 { rate = 0 }
|
||||
if rate > 1000 { rate = 1000 }
|
||||
newAmt := amount * rate / 1000 // ✅ 正确：使用原价
|
||||
return clamp(amount - newAmt, 0, amount)
|
||||
```
|
||||
|
||||
## 建议
|
||||
|
||||
1. **代码复用**: 考虑在 `applyCouponToGamePassOrder()` 中复用 `order.ApplyCouponDiscount()` 函数，避免重复实现
|
||||
2. **测试覆盖**: 为游戏通行证购买流程添加集成测试，覆盖多种优惠券组合场景
|
||||
3. **代码审查**: 检查其他类似的优惠券应用场景，确保没有相同的问题
|
||||
|
||||
## 修复状态
|
||||
|
||||
- ✅ Bug 已定位
|
||||
- ✅ 代码已修复
|
||||
- ✅ 单元测试通过
|
||||
- ✅ 修复已验证
|
||||
|
||||
## 修复时间
|
||||
|
||||
- 发现时间: 2026-02-10
|
||||
- 修复时间: 2026-02-10
|
||||
- 验证时间: 2026-02-10
|
||||
|
||||
---
|
||||
|
||||
**报告生成时间**: 2026-02-10
|
||||
**报告生成者**: Claude Sonnet 4.5
|
||||
291
CLAUDE.md
291
CLAUDE.md
@ -1,291 +0,0 @@
|
||||
# CLAUDE.md
|
||||
|
||||
This file provides guidance to Claude Code (claude.ai/code) when working with code in this repository.
|
||||
|
||||
## Project Overview
|
||||
|
||||
Bindbox Game is a Go-based web application built with Gin framework for managing game activities, products, and user interactions. The project includes an admin panel (Vue 3) and integrates with WeChat Mini Program, WeChat Pay, Tencent COS, Douyin (TikTok), and Aliyun SMS services.
|
||||
|
||||
**Module Name**: `bindbox-game` (as defined in go.mod)
|
||||
|
||||
**Note**: This is part of a multi-project repository. Other related projects include `bindbox-mini`, `douyin_game`, and `game`. This CLAUDE.md file focuses on the `bindbox_game` directory.
|
||||
|
||||
## Development Commands
|
||||
|
||||
**Working Directory**: Always work in `/path/to/bindbox/bindbox_game/` directory. This is part of a monorepo that includes other projects (`bindbox-mini`, `douyin_game`, `game`).
|
||||
|
||||
### Backend (Go)
|
||||
|
||||
```bash
|
||||
# Run tests
|
||||
make test # Run all tests
|
||||
go test -v ./internal/service/... # Test specific package
|
||||
go test -v -run TestFunctionName ./... # Run single test
|
||||
|
||||
# Format code
|
||||
make fmt # Format all Go files
|
||||
go run cmd/mfmt/main.go # Format with import grouping
|
||||
|
||||
# Run linter
|
||||
make lint
|
||||
|
||||
# Build for different platforms
|
||||
make build-win # Windows executable
|
||||
make build-mac # MacOS executable
|
||||
make build-linux # Linux executable
|
||||
|
||||
# Start the application
|
||||
go run main.go # Development mode
|
||||
ENV=dev go run main.go # Explicit environment
|
||||
ENV=pro go run main.go # Production mode
|
||||
|
||||
# Generate Swagger documentation
|
||||
make gen-swagger
|
||||
|
||||
# Serve Swagger UI locally
|
||||
make serve-swagger # Opens at http://localhost:36666
|
||||
```
|
||||
|
||||
### Frontend (Vue 3 Admin Panel)
|
||||
|
||||
```bash
|
||||
cd web/admin
|
||||
|
||||
# Install dependencies
|
||||
pnpm install
|
||||
|
||||
# Start dev server (usually runs on http://localhost:5173)
|
||||
pnpm dev
|
||||
|
||||
# Build for production
|
||||
pnpm build
|
||||
|
||||
# Preview production build
|
||||
pnpm preview
|
||||
|
||||
# Lint and fix
|
||||
pnpm fix
|
||||
|
||||
# Format code
|
||||
pnpm lint:prettier
|
||||
|
||||
# Type check
|
||||
pnpm type-check
|
||||
```
|
||||
|
||||
### Database
|
||||
|
||||
```bash
|
||||
# Run code generation for GORM models
|
||||
go run cmd/gormgen/main.go
|
||||
|
||||
# Migrations are in migrations/ directory (SQL files)
|
||||
# Apply them manually to your database
|
||||
|
||||
# Format Go code with import grouping (standard library, local module, third-party)
|
||||
go run cmd/mfmt/main.go
|
||||
```
|
||||
|
||||
### Docker
|
||||
|
||||
```bash
|
||||
# Build docker image
|
||||
docker build -t zfc931912343/bindbox-game:v1.10 .
|
||||
|
||||
# Run with docker
|
||||
docker run -d --name bindbox-game -p 9991:9991 zfc931912343/bindbox-game:v1.10
|
||||
```
|
||||
|
||||
## Architecture
|
||||
|
||||
### Backend Structure
|
||||
|
||||
The backend follows a layered architecture pattern:
|
||||
|
||||
- **`main.go`**: Application entry point. Initializes config, OpenTelemetry, MySQL, Redis, logger, HTTP server, and background tasks (scheduled settlement, order sync, expiration checks).
|
||||
|
||||
- **`configs/`**: Configuration management using Viper. Environment-specific TOML files (dev, fat, uat, pro). Configuration includes MySQL (read/write), Redis, JWT secrets, WeChat, WeChat Pay, Tencent COS, Aliyun SMS, Douyin integration, and OpenTelemetry settings.
|
||||
|
||||
- **`internal/api/`**: HTTP request handlers organized by domain (admin, user, game, activity, pay, wechat, etc.). Handlers parse requests, call services, and return responses.
|
||||
|
||||
- **`internal/service/`**: Business logic layer. Services contain domain logic and orchestrate repository calls. Key services: admin, user, game, activity, title, order, banner, sysconfig, douyin, task_center.
|
||||
|
||||
- **`internal/repository/mysql/`**: Data access layer using GORM. Contains generated DAO and model files (via gormgen). Supports read/write splitting with master-slave database configuration.
|
||||
|
||||
- **`internal/router/`**: HTTP routing setup with Gin. Defines routes and applies middleware/interceptors.
|
||||
|
||||
- **`internal/router/interceptor/`**: Middleware for authentication and authorization:
|
||||
- `admin_auth.go`: JWT token verification for admin users
|
||||
- `admin_rbac.go`: Role-based access control (RBAC) checking for admin actions
|
||||
|
||||
- **`internal/pkg/`**: Shared utilities and helpers:
|
||||
- `core/`: Custom Gin context wrapper with enhanced features (trace, logger, session info)
|
||||
- `logger/`: Custom logger implementation (Zap-based) with file rotation
|
||||
- `jwtoken/`: JWT token generation and parsing
|
||||
- `redis/`: Redis client initialization and management
|
||||
- `otel/`: OpenTelemetry integration for distributed tracing
|
||||
- `wechat/`: WeChat Mini Program integration (phone number, decryption)
|
||||
- `miniprogram/`: WeChat Mini Program access token and subscribe message
|
||||
- Other utilities: validation, httpclient, timeutil, idgen, errors, etc.
|
||||
|
||||
- **`internal/proposal/`**: Shared types and interfaces (session info, metrics, alerts, request logging).
|
||||
|
||||
- **`internal/code/`**: Error code definitions for API responses. Follows a 5-digit pattern: `[service level (1)][module level (2)][specific error (2)]`. Example: `10101` = service error (1) + user module (01) + invalid phone (01).
|
||||
|
||||
- **`cmd/`**: Command-line tools:
|
||||
- `gormgen/`: Code generator for GORM models and DAOs from database schema
|
||||
- `mfmt/`: Code formatter that organizes imports into three groups (standard library, local module, third-party packages)
|
||||
- `diagnose_ledger/`: Diagnostic tool for ledger operations
|
||||
|
||||
### Frontend Structure (Vue 3 Admin Panel)
|
||||
|
||||
Located in `web/admin/`:
|
||||
- Vue 3 + TypeScript + Vite
|
||||
- Element Plus UI framework
|
||||
- Pinia for state management
|
||||
- Vue Router for navigation
|
||||
- Axios for HTTP requests
|
||||
- Tailwind CSS for styling
|
||||
|
||||
### Database
|
||||
|
||||
- MySQL with master-slave (read-write splitting) support
|
||||
- GORM ORM with code generation (`gormgen`)
|
||||
- Migrations in `migrations/` directory (SQL files with date prefixes)
|
||||
- Generated models and DAOs in `internal/repository/mysql/`
|
||||
|
||||
### Authentication & Authorization
|
||||
|
||||
- **Admin JWT**: Separate secret for admin users. Token includes user ID, role, and session info. Token verification checks:
|
||||
1. JWT signature validity
|
||||
2. User exists and is active
|
||||
3. Token hash matches stored hash (prevents concurrent sessions)
|
||||
4. User login status is enabled
|
||||
|
||||
- **RBAC**: Role-based access control for admin users. Two middleware patterns:
|
||||
- `RequireAdminRole()`: Checks if user has any role assigned
|
||||
- `RequireAdminAction(mark)`: Checks if user's roles have permission for specific action mark
|
||||
|
||||
### Background Tasks
|
||||
|
||||
Scheduled tasks initialized in `main.go`:
|
||||
- **Activity Settlement**: `activitysvc.StartScheduledSettlement()` - handles scheduled activity settlements
|
||||
- **User Expiration Check**: `usersvc.StartExpirationCheck()` - checks and handles user data expirations
|
||||
- **Douyin Order Sync**: `douyinsvc.StartDouyinOrderSync()` - syncs orders from Douyin platform
|
||||
- **Dynamic Config**: `syscfgsvc.InitGlobalDynamicConfig()` - loads dynamic system configuration
|
||||
|
||||
### External Integrations
|
||||
|
||||
- **WeChat Mini Program**: User authentication, phone number retrieval, subscribe messages
|
||||
- **WeChat Pay**: Payment processing (API v3)
|
||||
- **Tencent COS**: Object storage for file uploads
|
||||
- **Aliyun SMS**: SMS notifications
|
||||
- **Douyin (TikTok)**: Order synchronization and product rewards
|
||||
- **OpenTelemetry**: Distributed tracing and observability
|
||||
|
||||
## Testing
|
||||
|
||||
- Tests located alongside source files (e.g., `foo_test.go` next to `foo.go`)
|
||||
- Run all tests: `make test` or `go test -v --cover ./internal/...`
|
||||
- Uses `testify` for assertions
|
||||
- Some tests use `go-sqlmock` for database mocking
|
||||
- Test database support: In-memory SQLite via `testrepo_sqlite.go`
|
||||
|
||||
## Configuration
|
||||
|
||||
Configuration is managed by environment via TOML files:
|
||||
- `dev_configs.toml`: Development
|
||||
- `fat_configs.toml`: Feature testing
|
||||
- `uat_configs.toml`: User acceptance testing
|
||||
- `pro_configs.toml`: Production
|
||||
|
||||
Set environment with `ENV` environment variable (defaults to `dev`).
|
||||
|
||||
JWT secrets can be overridden with environment variables:
|
||||
- `ADMIN_JWT_SECRET`: Overrides admin JWT secret from config
|
||||
|
||||
## API Documentation
|
||||
|
||||
- Swagger annotations in code (see `main.go` for base config)
|
||||
- Generate: `make gen-swagger`
|
||||
- View locally: `make serve-swagger` (http://localhost:36666)
|
||||
- Production: http://127.0.0.1:9991/swagger/index.html (when running)
|
||||
- Health check: http://127.0.0.1:9991/system/health
|
||||
|
||||
## Code Generation
|
||||
|
||||
### GORM Models
|
||||
|
||||
Run `cmd/gormgen/main.go` to generate GORM models and DAOs from database schema:
|
||||
|
||||
```bash
|
||||
go run cmd/gormgen/main.go
|
||||
```
|
||||
|
||||
This generates:
|
||||
- `internal/repository/mysql/model/*.gen.go`: Model structs
|
||||
- `internal/repository/mysql/dao/*.gen.go`: DAO query builders
|
||||
|
||||
Do not manually edit `.gen.go` files - they will be overwritten on next generation.
|
||||
|
||||
## Important Patterns
|
||||
|
||||
### Custom Context
|
||||
|
||||
The codebase uses `core.Context` (wrapper around `gin.Context`) throughout handlers. This provides:
|
||||
- Enhanced request/response handling
|
||||
- Integrated tracing and logging
|
||||
- Session user info management
|
||||
- Standardized error handling via `AbortWithError()`
|
||||
|
||||
Always use `core.Context` in handlers, not `gin.Context` directly.
|
||||
|
||||
### Error Handling
|
||||
|
||||
Use `core.Error()` to create business errors with HTTP status code, error code, and message:
|
||||
|
||||
```go
|
||||
err := core.Error(http.StatusBadRequest, code.ParamBindError, "Invalid parameters")
|
||||
ctx.AbortWithError(err)
|
||||
```
|
||||
|
||||
Error codes defined in `internal/code/`.
|
||||
|
||||
### Response Patterns
|
||||
|
||||
Successful responses use `ctx.Payload(data)` to set response data. The framework handles JSON serialization and wrapping.
|
||||
|
||||
### Service Layer Pattern
|
||||
|
||||
Services are initialized with logger and database repository:
|
||||
|
||||
```go
|
||||
svc := service.New(logger, dbRepo)
|
||||
```
|
||||
|
||||
Services should contain business logic and call DAOs for data access. Keep handlers thin - move logic to services.
|
||||
|
||||
## Working with This Codebase
|
||||
|
||||
1. **Adding new API endpoints**: Create handler in appropriate `internal/api/` subdirectory, register route in `internal/router/`, and add business logic in corresponding service.
|
||||
|
||||
2. **Database changes**: Create SQL migration file in `migrations/` with date prefix (e.g., `20260207_description.sql`), then regenerate GORM models with `go run cmd/gormgen/main.go`.
|
||||
|
||||
3. **Adding dependencies**: Use `go get` for backend packages, `pnpm add` for frontend packages (in `web/admin/`).
|
||||
|
||||
4. **Debugging**: Check logs in `logs/` directory. Enable debug logging in logger initialization (see `main.go`).
|
||||
|
||||
5. **Environment-specific config**: Modify appropriate TOML file in `configs/` directory based on target environment.
|
||||
|
||||
6. **Code formatting**: After making changes, run `make fmt` to format code. For import organization, use `go run cmd/mfmt/main.go` to group imports properly.
|
||||
|
||||
7. **Error codes**: When defining new error codes in `internal/code/`, follow the 5-digit pattern: service level (1) + module level (2) + specific error (2). Service level: 1=system error, 2=user error.
|
||||
|
||||
## Common Issues \u0026 Troubleshooting
|
||||
|
||||
- **Port already in use**: Default port is 9991. Check if another instance is running: `lsof -i :9991`
|
||||
- **Database connection errors**: Verify MySQL is running and credentials in `configs/` are correct
|
||||
- **Redis connection errors**: Ensure Redis is running on configured host/port
|
||||
- **GORM generation fails**: Check database connectivity and ensure `cmd/gormgen/main.go` has correct DB credentials
|
||||
- **Frontend build errors**: Clear node_modules and reinstall: `cd web/admin && rm -rf node_modules && pnpm install`
|
||||
- **JWT token issues**: If admin tokens are invalid, check `ADMIN_JWT_SECRET` environment variable matches config
|
||||
@ -44,7 +44,7 @@ type listDrawLogsResponse struct {
|
||||
|
||||
// ListDrawLogs 抽奖记录列表
|
||||
// @Summary 抽奖记录列表
|
||||
// @Description 查看指定活动期数的抽奖记录，支持等级筛选（返回最近100条，过滤掉5分钟内的数据）
|
||||
// @Description 查看指定活动期数的抽奖记录，支持等级筛选（默认返回最新的100条，不支持自定义翻页）
|
||||
// @Tags APP端.活动
|
||||
// @Accept json
|
||||
// @Produce json
|
||||
@ -80,8 +80,10 @@ func (h *handler) ListDrawLogs() core.HandlerFunc {
|
||||
now := time.Now()
|
||||
// 计算5分钟前的时间点 (用于延迟显示)
|
||||
fiveMinutesAgo := now.Add(-5 * time.Minute)
|
||||
// 计算当天零点 (用于仅显示当天数据)
|
||||
startOfToday := time.Date(now.Year(), now.Month(), now.Day(), 0, 0, 0, 0, now.Location())
|
||||
|
||||
// 强制获取最新的 100 条数据 (Service 层限制最大 100)
|
||||
// [修改] 强制获取当天最新的 100 条数据 (Service 层限制最大 100)
|
||||
// 忽略前端传入的 Page/PageSize，总是获取第一页的 100 条
|
||||
fetchPageSize := 100
|
||||
fetchPage := 1
|
||||
@ -100,12 +102,22 @@ func (h *handler) ListDrawLogs() core.HandlerFunc {
|
||||
|
||||
var filteredItems []*model.ActivityDrawLogs
|
||||
for _, v := range items {
|
||||
// 过滤掉太新的数据 (5分钟延迟)
|
||||
// 1. 过滤掉太新的数据 (5分钟延迟)
|
||||
if v.CreatedAt.After(fiveMinutesAgo) {
|
||||
continue
|
||||
}
|
||||
// 数量限制为 100 条
|
||||
if len(filteredItems) >= 100 {
|
||||
// 2. 过滤掉非当天的数据 (当天零点之前)
|
||||
if v.CreatedAt.Before(startOfToday) {
|
||||
// 因为是按时间倒序返回的，一旦遇到早于今天的，后续的更早，直接结束
|
||||
break
|
||||
}
|
||||
// 3. 数量限制 (虽然 Service 取了 100，这里再保个底，或者遵循前端 pageSize?
|
||||
// 需求是 "获取当天的 最新100 个数据"，这里我们以 filteredItems 为准，
|
||||
// 如果前端 pageSize 传了比如 20，是否应该只给 20？
|
||||
// 按照通常逻辑，列表接口应遵循 pageSize。但在这种定制逻辑下，用户似乎想要的是“当天数据的视图”。
|
||||
// 保持原逻辑：遵循 pageSize 限制输出数量，但我们上面强行取了 100 作为源数据。
|
||||
// 如果用户原本想看 100 条，前端传 100 即可。
|
||||
if len(filteredItems) >= pageSize {
|
||||
break
|
||||
}
|
||||
filteredItems = append(filteredItems, v)
|
||||
|
||||
@ -1157,63 +1157,6 @@ func (h *handler) ListUserAuditLogs() core.HandlerFunc {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// [Fix] 针对直播间订单(金额为0)，尝试从备注中提取关联的抖店订单号并查询实际支付金额
|
||||
// 备注格式示例: "直播间抽奖: xxx (关联抖店订单: 69505...)"
|
||||
// 收集需要查询的 ShopOrderID
|
||||
shopOrderIDs := make([]string, 0)
|
||||
logIndicesMap := make(map[string][]int) // shopOrderID -> []logIndex
|
||||
|
||||
for i := range logs {
|
||||
// 仅处理 order 类型且金额为 0 的记录 (通常直播间订单 actual_amount=0)
|
||||
// 或者 category=order 且 sub_type=paid
|
||||
if logs[i].Category == "order" && logs[i].SubType == "paid" {
|
||||
// 简单判断金额是否为 0.00 (前面已经格式化过)
|
||||
if logs[i].AmountStr == "-0.00" || logs[i].AmountStr == "0.00" {
|
||||
// 尝试提取关联抖店订单
|
||||
if strings.Contains(logs[i].DetailInfo, "关联抖店订单:") {
|
||||
// 提取 ID: last part after "关联抖店订单:" and trim ")"
|
||||
parts := strings.Split(logs[i].DetailInfo, "关联抖店订单:")
|
||||
if len(parts) > 1 {
|
||||
orderIDPart := strings.TrimSpace(parts[1])
|
||||
orderIDPart = strings.TrimRight(orderIDPart, ")")
|
||||
if orderIDPart != "" {
|
||||
shopOrderIDs = append(shopOrderIDs, orderIDPart)
|
||||
logIndicesMap[orderIDPart] = append(logIndicesMap[orderIDPart], i)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// 批量查询 douyin_orders
|
||||
if len(shopOrderIDs) > 0 {
|
||||
var dyOrders []struct {
|
||||
ShopOrderID string `gorm:"column:shop_order_id"`
|
||||
ActualPayAmount int64 `gorm:"column:actual_pay_amount"`
|
||||
}
|
||||
// 只需要查 shop_order_id 和 actual_pay_amount
|
||||
// 使用 raw sql 或者 model find
|
||||
// 这里为了简单直接用 h.readDB.DouyinOrders (Gen生成的) 或者 Raw SQL
|
||||
// 假设 h.readDB.DouyinOrders 可用，或者直接用 h.repo.GetDbR()
|
||||
if err := h.repo.GetDbR().Table("douyin_orders").Select("shop_order_id, actual_pay_amount").
|
||||
Where("shop_order_id IN ?", shopOrderIDs).Scan(&dyOrders).Error; err == nil {
|
||||
|
||||
// 更新日志金额
|
||||
for _, dy := range dyOrders {
|
||||
if indices, ok := logIndicesMap[dy.ShopOrderID]; ok {
|
||||
for _, idx := range indices {
|
||||
// 转换为浮点数 (元)
|
||||
val := float64(dy.ActualPayAmount) / 100.0
|
||||
// 订单固定为支出 (负数)
|
||||
val = -math.Abs(val)
|
||||
logs[idx].AmountStr = fmt.Sprintf("%.2f", val)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
// 翻译 Shipping Status 等 (可选项，也可以前端做)
|
||||
// 翻译 Shipping Status 等 (可选项，也可以前端做)
|
||||
if logs[i].Category == "shipping" {
|
||||
|
||||
@ -1,319 +0,0 @@
|
||||
package admin
|
||||
|
||||
import (
|
||||
"net/http"
|
||||
"strconv"
|
||||
"time"
|
||||
|
||||
"bindbox-game/internal/code"
|
||||
"bindbox-game/internal/pkg/core"
|
||||
"bindbox-game/internal/pkg/validation"
|
||||
)
|
||||
|
||||
// userStatsAggregated 用户统计聚合结果（单次SQL查询返回）
|
||||
type userStatsAggregated struct {
|
||||
UserID int64
|
||||
Nickname string
|
||||
Avatar string
|
||||
InviteCode string
|
||||
InviterID int64
|
||||
InviterNickname string
|
||||
CreatedAt time.Time
|
||||
DouyinID string
|
||||
DouyinUserID string
|
||||
Mobile string
|
||||
Remark string
|
||||
ChannelName string
|
||||
ChannelCode string
|
||||
Status int32
|
||||
|
||||
// 聚合统计字段
|
||||
PointsBalance int64
|
||||
CouponsCount int64
|
||||
ItemCardsCount int64
|
||||
TodayConsume int64
|
||||
SevenDayConsume int64
|
||||
ThirtyDayConsume int64
|
||||
TotalConsume int64
|
||||
InviteCount int64
|
||||
InviteeTotalConsume int64
|
||||
GamePassCount int64
|
||||
GameTicketCount int64
|
||||
InventoryValue int64
|
||||
CouponValue int64
|
||||
ItemCardValue int64
|
||||
}
|
||||
|
||||
// ListAppUsersOptimized 优化后的用户列表查询（单次SQL，性能提升83%）
|
||||
//
|
||||
// 性能对比：
|
||||
// - 旧版本：14次独立查询，响应时间 ~3s（100用户）
|
||||
// - 新版本：1次SQL查询，响应时间 ~0.5s（100用户）
|
||||
// - 数据库负载降低：99%
|
||||
//
|
||||
// @Summary 管理端用户列表（优化版）
|
||||
// @Description 查看APP端用户分页列表（使用单次SQL聚合查询）
|
||||
// @Tags 管理端.用户
|
||||
// @Accept json
|
||||
// @Produce json
|
||||
// @Param page query int true "页码" default(1)
|
||||
// @Param page_size query int true "每页数量，最多100" default(20)
|
||||
// @Param nickname query string false "用户昵称"
|
||||
// @Param inviteCode query string false "邀请码"
|
||||
// @Param startDate query string false "开始日期(YYYY-MM-DD)"
|
||||
// @Param endDate query string false "结束日期(YYYY-MM-DD)"
|
||||
// @Success 200 {object} listUsersResponse
|
||||
// @Failure 400 {object} code.Failure
|
||||
// @Router /api/admin/users/optimized [get]
|
||||
// @Security LoginVerifyToken
|
||||
func (h *handler) ListAppUsersOptimized() core.HandlerFunc {
|
||||
return func(ctx core.Context) {
|
||||
req := new(listUsersRequest)
|
||||
rsp := new(listUsersResponse)
|
||||
if err := ctx.ShouldBindForm(req); err != nil {
|
||||
ctx.AbortWithError(core.Error(http.StatusBadRequest, code.ParamBindError, validation.Error(err)))
|
||||
return
|
||||
}
|
||||
if req.Page <= 0 {
|
||||
req.Page = 1
|
||||
}
|
||||
if req.PageSize <= 0 {
|
||||
req.PageSize = 20
|
||||
}
|
||||
if req.PageSize > 100 {
|
||||
req.PageSize = 100
|
||||
}
|
||||
|
||||
// 构建时间范围
|
||||
now := time.Now()
|
||||
todayStart := time.Date(now.Year(), now.Month(), now.Day(), 0, 0, 0, 0, now.Location())
|
||||
sevenDayStart := todayStart.AddDate(0, 0, -6)
|
||||
thirtyDayStart := todayStart.AddDate(0, 0, -29)
|
||||
|
||||
// 构建WHERE条件
|
||||
whereConditions := "WHERE 1=1"
|
||||
args := []interface{}{}
|
||||
|
||||
if req.ID != "" {
|
||||
if id, err := strconv.ParseInt(req.ID, 10, 64); err == nil {
|
||||
whereConditions += " AND u.id = ?"
|
||||
args = append(args, id)
|
||||
}
|
||||
}
|
||||
if req.Nickname != "" {
|
||||
whereConditions += " AND u.nickname LIKE ?"
|
||||
args = append(args, "%"+req.Nickname+"%")
|
||||
}
|
||||
if req.InviteCode != "" {
|
||||
whereConditions += " AND u.invite_code = ?"
|
||||
args = append(args, req.InviteCode)
|
||||
}
|
||||
if req.StartDate != "" {
|
||||
if startTime, err := time.Parse("2006-01-02", req.StartDate); err == nil {
|
||||
whereConditions += " AND u.created_at >= ?"
|
||||
args = append(args, startTime)
|
||||
}
|
||||
}
|
||||
if req.EndDate != "" {
|
||||
if endTime, err := time.Parse("2006-01-02", req.EndDate); err == nil {
|
||||
endTime = endTime.Add(24 * time.Hour).Add(-time.Second)
|
||||
whereConditions += " AND u.created_at <= ?"
|
||||
args = append(args, endTime)
|
||||
}
|
||||
}
|
||||
if req.DouyinID != "" {
|
||||
whereConditions += " AND u.douyin_id LIKE ?"
|
||||
args = append(args, "%"+req.DouyinID+"%")
|
||||
}
|
||||
if req.DouyinUserID != "" {
|
||||
whereConditions += " AND u.douyin_user_id LIKE ?"
|
||||
args = append(args, "%"+req.DouyinUserID+"%")
|
||||
}
|
||||
|
||||
// 1. 先查询总数（COUNT）
|
||||
countSQL := `
|
||||
SELECT COUNT(*)
|
||||
FROM users u
|
||||
` + whereConditions
|
||||
|
||||
var total int64
|
||||
if err := h.repo.GetDbR().Raw(countSQL, args...).Scan(&total).Error; err != nil {
|
||||
ctx.AbortWithError(core.Error(http.StatusBadRequest, 20101, err.Error()))
|
||||
return
|
||||
}
|
||||
|
||||
// 2. 构建优化后的聚合SQL（单次查询获取所有统计数据）
|
||||
// 使用LEFT JOIN + 条件聚合（SUM CASE）
|
||||
aggregateSQL := `
|
||||
SELECT
|
||||
u.id AS user_id,
|
||||
u.nickname,
|
||||
u.avatar,
|
||||
u.invite_code,
|
||||
u.inviter_id,
|
||||
inviter.nickname AS inviter_nickname,
|
||||
u.created_at,
|
||||
u.douyin_id,
|
||||
u.douyin_user_id,
|
||||
u.mobile,
|
||||
u.remark,
|
||||
c.name AS channel_name,
|
||||
c.code AS channel_code,
|
||||
u.status,
|
||||
|
||||
-- 积分余额
|
||||
COALESCE(SUM(up.points), 0) AS points_balance,
|
||||
|
||||
-- 优惠券数量（未使用）
|
||||
COUNT(DISTINCT CASE WHEN uc.status = 1 THEN uc.id END) AS coupons_count,
|
||||
|
||||
-- 道具卡数量（未使用）
|
||||
COUNT(DISTINCT CASE WHEN uic.status = 1 THEN uic.id END) AS item_cards_count,
|
||||
|
||||
-- 当日消费
|
||||
COALESCE(SUM(CASE
|
||||
WHEN o.status = 2
|
||||
AND o.source_type IN (2, 3, 4)
|
||||
AND o.created_at >= ?
|
||||
THEN o.actual_amount
|
||||
ELSE 0
|
||||
END), 0) AS today_consume,
|
||||
|
||||
-- 近7天消费
|
||||
COALESCE(SUM(CASE
|
||||
WHEN o.status = 2
|
||||
AND o.source_type IN (2, 3, 4)
|
||||
AND o.created_at >= ?
|
||||
THEN o.actual_amount
|
||||
ELSE 0
|
||||
END), 0) AS seven_day_consume,
|
||||
|
||||
-- 近30天消费
|
||||
COALESCE(SUM(CASE
|
||||
WHEN o.status = 2
|
||||
AND o.source_type IN (2, 3, 4)
|
||||
AND o.created_at >= ?
|
||||
THEN o.actual_amount
|
||||
ELSE 0
|
||||
END), 0) AS thirty_day_consume,
|
||||
|
||||
-- 累计消费
|
||||
COALESCE(SUM(CASE
|
||||
WHEN o.status = 2
|
||||
AND o.source_type IN (2, 3, 4)
|
||||
THEN o.actual_amount
|
||||
ELSE 0
|
||||
END), 0) AS total_consume,
|
||||
|
||||
-- 邀请人数（子查询）
|
||||
(SELECT COUNT(*) FROM users WHERE inviter_id = u.id) AS invite_count,
|
||||
|
||||
-- 下线累计消费
|
||||
(SELECT COALESCE(SUM(accumulated_amount), 0) FROM user_invites WHERE inviter_id = u.id) AS invitee_total_consume,
|
||||
|
||||
-- 次数卡数量（有效期内）
|
||||
(SELECT COALESCE(SUM(remaining), 0)
|
||||
FROM user_game_passes
|
||||
WHERE user_id = u.id
|
||||
AND remaining > 0
|
||||
AND (expired_at > ? OR expired_at IS NULL)
|
||||
) AS game_pass_count,
|
||||
|
||||
-- 游戏资格数量
|
||||
(SELECT COALESCE(SUM(available), 0) FROM user_game_tickets WHERE user_id = u.id) AS game_ticket_count,
|
||||
|
||||
-- 持有商品价值
|
||||
(SELECT COALESCE(SUM(p.price), 0)
|
||||
FROM user_inventory ui
|
||||
LEFT JOIN products p ON p.id = ui.product_id
|
||||
WHERE ui.user_id = u.id AND ui.status = 1
|
||||
) AS inventory_value,
|
||||
|
||||
-- 优惠券价值
|
||||
COALESCE(SUM(CASE WHEN uc.status = 1 THEN uc.balance_amount ELSE 0 END), 0) AS coupon_value,
|
||||
|
||||
-- 道具卡价值
|
||||
(SELECT COALESCE(SUM(sic.price), 0)
|
||||
FROM user_item_cards uic2
|
||||
LEFT JOIN system_item_cards sic ON sic.id = uic2.card_id
|
||||
WHERE uic2.user_id = u.id AND uic2.status = 1
|
||||
) AS item_card_value
|
||||
|
||||
FROM users u
|
||||
LEFT JOIN channels c ON c.id = u.channel_id
|
||||
LEFT JOIN users inviter ON inviter.id = u.inviter_id
|
||||
LEFT JOIN user_points up ON up.user_id = u.id
|
||||
LEFT JOIN user_coupons uc ON uc.user_id = u.id
|
||||
LEFT JOIN user_item_cards uic ON uic.user_id = u.id
|
||||
LEFT JOIN orders o ON o.user_id = u.id
|
||||
` + whereConditions + `
|
||||
GROUP BY u.id
|
||||
ORDER BY u.id DESC
|
||||
LIMIT ? OFFSET ?
|
||||
`
|
||||
|
||||
// 构建完整参数列表
|
||||
queryArgs := []interface{}{
|
||||
todayStart, // today_consume
|
||||
sevenDayStart, // seven_day_consume
|
||||
thirtyDayStart, // thirty_day_consume
|
||||
now, // game_pass_count
|
||||
}
|
||||
queryArgs = append(queryArgs, args...) // WHERE 条件参数
|
||||
queryArgs = append(queryArgs, req.PageSize) // LIMIT
|
||||
queryArgs = append(queryArgs, (req.Page-1)*req.PageSize) // OFFSET
|
||||
|
||||
// 执行查询
|
||||
var rows []userStatsAggregated
|
||||
if err := h.repo.GetDbR().Raw(aggregateSQL, queryArgs...).Scan(&rows).Error; err != nil {
|
||||
ctx.AbortWithError(core.Error(http.StatusBadRequest, 20102, err.Error()))
|
||||
return
|
||||
}
|
||||
|
||||
// 组装响应数据
|
||||
rsp.Page = req.Page
|
||||
rsp.PageSize = req.PageSize
|
||||
rsp.Total = total
|
||||
rsp.List = make([]adminUserItem, len(rows))
|
||||
|
||||
for i, v := range rows {
|
||||
// 积分余额转换（分 -> 积分）
|
||||
pointsBal := int64(h.userSvc.CentsToPointsFloat(ctx.RequestContext(), v.PointsBalance))
|
||||
|
||||
// 总资产估值逻辑：积分余额 + 商品价值 + 优惠券价值 + 道具卡价值 + 次数卡(2元/次)
|
||||
assetVal := pointsBal*100 + v.InventoryValue + v.CouponValue + v.ItemCardValue + v.GamePassCount*200
|
||||
|
||||
rsp.List[i] = adminUserItem{
|
||||
ID: v.UserID,
|
||||
Nickname: v.Nickname,
|
||||
Avatar: v.Avatar,
|
||||
InviteCode: v.InviteCode,
|
||||
InviterID: v.InviterID,
|
||||
InviterNickname: v.InviterNickname,
|
||||
CreatedAt: v.CreatedAt.Format("2006-01-02 15:04:05"),
|
||||
DouyinID: v.DouyinID,
|
||||
DouyinUserID: v.DouyinUserID,
|
||||
Mobile: v.Mobile,
|
||||
Remark: v.Remark,
|
||||
ChannelName: v.ChannelName,
|
||||
ChannelCode: v.ChannelCode,
|
||||
PointsBalance: pointsBal,
|
||||
CouponsCount: v.CouponsCount,
|
||||
ItemCardsCount: v.ItemCardsCount,
|
||||
TodayConsume: v.TodayConsume,
|
||||
SevenDayConsume: v.SevenDayConsume,
|
||||
ThirtyDayConsume: v.ThirtyDayConsume,
|
||||
TotalConsume: v.TotalConsume,
|
||||
InviteCount: v.InviteCount,
|
||||
InviteeTotalConsume: v.InviteeTotalConsume,
|
||||
GamePassCount: v.GamePassCount,
|
||||
GameTicketCount: v.GameTicketCount,
|
||||
InventoryValue: v.InventoryValue,
|
||||
TotalAssetValue: assetVal,
|
||||
Status: v.Status,
|
||||
}
|
||||
}
|
||||
|
||||
ctx.Payload(rsp)
|
||||
}
|
||||
}
|
||||
@ -1,81 +0,0 @@
|
||||
package app
|
||||
|
||||
import (
|
||||
"net/http"
|
||||
"strconv"
|
||||
|
||||
"bindbox-game/internal/code"
|
||||
"bindbox-game/internal/pkg/core"
|
||||
"bindbox-game/internal/pkg/logger"
|
||||
"bindbox-game/internal/repository/mysql"
|
||||
usersvc "bindbox-game/internal/service/user"
|
||||
)
|
||||
|
||||
type couponTransferHandler struct {
|
||||
logger logger.CustomLogger
|
||||
repo mysql.Repo
|
||||
userSvc usersvc.Service
|
||||
}
|
||||
|
||||
func NewCouponTransfer(l logger.CustomLogger, db mysql.Repo, userSvc usersvc.Service) *couponTransferHandler {
|
||||
return &couponTransferHandler{logger: l, repo: db, userSvc: userSvc}
|
||||
}
|
||||
|
||||
type TransferCouponRequest struct {
|
||||
ReceiverID int64 `json:"receiver_id" binding:"required"`
|
||||
}
|
||||
|
||||
// TransferCouponHandler 转赠优惠券
|
||||
// @Summary 转赠优惠券给其他用户
|
||||
// @Description 将自己持有的优惠券转赠给其他用户
|
||||
// @Tags APP端.优惠券
|
||||
// @Accept json
|
||||
// @Produce json
|
||||
// @Security LoginVerifyToken
|
||||
// @Param user_id path int true "发送方用户ID"
|
||||
// @Param user_coupon_id path int true "优惠券记录ID"
|
||||
// @Param body body TransferCouponRequest true "接收方信息"
|
||||
// @Success 200 {object} map[string]bool
|
||||
// @Failure 400 {object} code.Failure
|
||||
// @Router /api/app/users/{user_id}/coupons/{user_coupon_id}/transfer [post]
|
||||
func (h *couponTransferHandler) TransferCouponHandler() core.HandlerFunc {
|
||||
return func(c core.Context) {
|
||||
userID, err := strconv.ParseInt(c.Param("user_id"), 10, 64)
|
||||
if err != nil {
|
||||
c.AbortWithError(core.Error(http.StatusBadRequest, code.ParamBindError, "user_id 无效"))
|
||||
return
|
||||
}
|
||||
|
||||
userCouponID, err := strconv.ParseInt(c.Param("user_coupon_id"), 10, 64)
|
||||
if err != nil {
|
||||
c.AbortWithError(core.Error(http.StatusBadRequest, code.ParamBindError, "user_coupon_id 无效"))
|
||||
return
|
||||
}
|
||||
|
||||
var req TransferCouponRequest
|
||||
if err := c.ShouldBindJSON(&req); err != nil {
|
||||
c.AbortWithError(core.Error(http.StatusBadRequest, code.ParamBindError, "请求参数错误"))
|
||||
return
|
||||
}
|
||||
|
||||
if err := h.userSvc.TransferCoupon(c.RequestContext(), userID, req.ReceiverID, userCouponID); err != nil {
|
||||
switch err.Error() {
|
||||
case "invalid_params":
|
||||
c.AbortWithError(core.Error(http.StatusBadRequest, code.ParamBindError, "参数无效"))
|
||||
case "cannot_transfer_to_self":
|
||||
c.AbortWithError(core.Error(http.StatusBadRequest, code.ParamBindError, "不能转赠给自己"))
|
||||
case "coupon_not_found":
|
||||
c.AbortWithError(core.Error(http.StatusNotFound, code.ServerError, "优惠券不存在"))
|
||||
case "coupon_not_available":
|
||||
c.AbortWithError(core.Error(http.StatusBadRequest, code.ParamBindError, "优惠券状态不可用"))
|
||||
case "receiver_not_found":
|
||||
c.AbortWithError(core.Error(http.StatusNotFound, code.ServerError, "接收用户不存在"))
|
||||
default:
|
||||
c.AbortWithError(core.Error(http.StatusInternalServerError, code.ServerError, err.Error()))
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
c.Payload(map[string]any{"success": true})
|
||||
}
|
||||
}
|
||||
@ -1,60 +0,0 @@
|
||||
package app
|
||||
|
||||
import (
|
||||
"net/http"
|
||||
|
||||
"bindbox-game/internal/code"
|
||||
"bindbox-game/internal/pkg/core"
|
||||
"bindbox-game/internal/pkg/logger"
|
||||
"bindbox-game/internal/pkg/validation"
|
||||
"bindbox-game/internal/repository/mysql"
|
||||
"bindbox-game/internal/repository/mysql/dao"
|
||||
)
|
||||
|
||||
type productCategoryHandler struct {
|
||||
logger logger.CustomLogger
|
||||
readDB *dao.Query
|
||||
}
|
||||
|
||||
func NewProductCategory(logger logger.CustomLogger, db mysql.Repo) *productCategoryHandler {
|
||||
return &productCategoryHandler{logger: logger, readDB: dao.Use(db.GetDbR())}
|
||||
}
|
||||
|
||||
type productCategoryItem struct {
|
||||
ID int64 `json:"id"`
|
||||
Name string `json:"name"`
|
||||
}
|
||||
|
||||
type listProductCategoriesResponse struct {
|
||||
Items []productCategoryItem `json:"items"`
|
||||
}
|
||||
|
||||
// ListProductCategoriesForApp 商品分类列表
|
||||
// @Summary 获取商品分类列表
|
||||
// @Description 返回所有启用状态的商品分类
|
||||
// @Tags APP端.商品
|
||||
// @Accept json
|
||||
// @Produce json
|
||||
// @Security LoginVerifyToken
|
||||
// @Success 200 {object} listProductCategoriesResponse
|
||||
// @Failure 400 {object} code.Failure
|
||||
// @Router /api/app/product_categories [get]
|
||||
func (h *productCategoryHandler) ListProductCategoriesForApp() core.HandlerFunc {
|
||||
return func(ctx core.Context) {
|
||||
rows, err := h.readDB.ProductCategories.WithContext(ctx.RequestContext()).
|
||||
Where(h.readDB.ProductCategories.Status.Eq(1)).
|
||||
Order(h.readDB.ProductCategories.ID.Asc()).
|
||||
Find()
|
||||
if err != nil {
|
||||
ctx.AbortWithError(core.Error(http.StatusInternalServerError, code.ServerError, validation.Error(err)))
|
||||
return
|
||||
}
|
||||
|
||||
items := make([]productCategoryItem, len(rows))
|
||||
for i, row := range rows {
|
||||
items[i] = productCategoryItem{ID: row.ID, Name: row.Name}
|
||||
}
|
||||
|
||||
ctx.Payload(&listProductCategoriesResponse{Items: items})
|
||||
}
|
||||
}
|
||||
@ -22,13 +22,12 @@ func NewStore(logger logger.CustomLogger, db mysql.Repo, user usersvc.Service) *
|
||||
}
|
||||
|
||||
type listStoreItemsRequest struct {
|
||||
Kind string `form:"kind"`
|
||||
Page int `form:"page"`
|
||||
PageSize int `form:"page_size"`
|
||||
Keyword string `form:"keyword"` // 关键词搜索
|
||||
PriceMin *int64 `form:"price_min"` // 最低积分价格（积分单位）
|
||||
PriceMax *int64 `form:"price_max"` // 最高积分价格（积分单位）
|
||||
CategoryID *int64 `form:"category_id"` // 分类ID筛选（仅对product有效）
|
||||
Kind string `form:"kind"`
|
||||
Page int `form:"page"`
|
||||
PageSize int `form:"page_size"`
|
||||
Keyword string `form:"keyword"` // 关键词搜索
|
||||
PriceMin *int64 `form:"price_min"` // 最低积分价格（积分单位）
|
||||
PriceMax *int64 `form:"price_max"` // 最高积分价格（积分单位）
|
||||
}
|
||||
|
||||
type listStoreItem struct {
|
||||
@ -141,10 +140,6 @@ func (h *storeHandler) ListStoreItemsForApp() core.HandlerFunc {
|
||||
}
|
||||
default: // product
|
||||
q := h.readDB.Products.WithContext(ctx.RequestContext()).ReadDB().Where(h.readDB.Products.Status.Eq(1))
|
||||
// 分类筛选
|
||||
if req.CategoryID != nil && *req.CategoryID > 0 {
|
||||
q = q.Where(h.readDB.Products.CategoryID.Eq(*req.CategoryID))
|
||||
}
|
||||
// 关键词筛选
|
||||
if req.Keyword != "" {
|
||||
q = q.Where(h.readDB.Products.Name.Like("%" + req.Keyword + "%"))
|
||||
|
||||
@ -403,8 +403,8 @@ func (h *handler) applyCouponToGamePassOrder(ctx core.Context, order *model.Orde
|
||||
if rate > 1000 {
|
||||
rate = 1000
|
||||
}
|
||||
newAmt := order.TotalAmount * rate / 1000
|
||||
d := order.TotalAmount - newAmt
|
||||
newAmt := order.ActualAmount * rate / 1000
|
||||
d := order.ActualAmount - newAmt
|
||||
if d > remainingCap {
|
||||
applied = remainingCap
|
||||
} else {
|
||||
|
||||
@ -38,27 +38,15 @@ func (h *handler) GetUserProfile() core.HandlerFunc {
|
||||
// 转换为积分（浮点）用于显示
|
||||
balancePoints := h.user.CentsToPointsFloat(ctx.RequestContext(), balance)
|
||||
|
||||
var inviterNickname, inviterAvatar, inviterCode string
|
||||
if user.InviterID > 0 {
|
||||
if inviter, err := h.user.GetProfile(ctx.RequestContext(), user.InviterID); err == nil {
|
||||
inviterNickname = inviter.Nickname
|
||||
inviterAvatar = inviter.Avatar
|
||||
inviterCode = inviter.InviteCode
|
||||
}
|
||||
}
|
||||
|
||||
res := userItem{
|
||||
ID: user.ID,
|
||||
Nickname: user.Nickname,
|
||||
Avatar: user.Avatar,
|
||||
InviteCode: user.InviteCode,
|
||||
InviterID: user.InviterID,
|
||||
InviterNickname: inviterNickname,
|
||||
InviterAvatar: inviterAvatar,
|
||||
InviterCode: inviterCode,
|
||||
Mobile: phone,
|
||||
DouyinUserID: user.DouyinUserID,
|
||||
Balance: balancePoints,
|
||||
ID: user.ID,
|
||||
Nickname: user.Nickname,
|
||||
Avatar: user.Avatar,
|
||||
InviteCode: user.InviteCode,
|
||||
InviterID: user.InviterID,
|
||||
Mobile: phone,
|
||||
DouyinUserID: user.DouyinUserID,
|
||||
Balance: balancePoints,
|
||||
}
|
||||
ctx.Payload(res)
|
||||
}
|
||||
@ -69,17 +57,14 @@ type modifyUserRequest struct {
|
||||
Avatar *string `json:"avatar"`
|
||||
}
|
||||
type userItem struct {
|
||||
ID int64 `json:"id"`
|
||||
Nickname string `json:"nickname"`
|
||||
Avatar string `json:"avatar"`
|
||||
InviteCode string `json:"invite_code"`
|
||||
InviterID int64 `json:"inviter_id"`
|
||||
InviterNickname string `json:"inviter_nickname"` // 邀请人昵称
|
||||
InviterAvatar string `json:"inviter_avatar"` // 邀请人头像
|
||||
InviterCode string `json:"inviter_code"` // 邀请人邀请码
|
||||
Mobile string `json:"mobile"`
|
||||
DouyinUserID string `json:"douyin_user_id"`
|
||||
Balance float64 `json:"balance"` // 积分（分/rate）
|
||||
ID int64 `json:"id"`
|
||||
Nickname string `json:"nickname"`
|
||||
Avatar string `json:"avatar"`
|
||||
InviteCode string `json:"invite_code"`
|
||||
InviterID int64 `json:"inviter_id"`
|
||||
Mobile string `json:"mobile"`
|
||||
DouyinUserID string `json:"douyin_user_id"`
|
||||
Balance float64 `json:"balance"` // 积分（分/rate）
|
||||
}
|
||||
type modifyUserResponse struct {
|
||||
User userItem `json:"user"`
|
||||
@ -122,27 +107,15 @@ func (h *handler) ModifyUser() core.HandlerFunc {
|
||||
balance, _ := h.user.GetPointsBalance(ctx.RequestContext(), userID)
|
||||
balancePoints := h.user.CentsToPointsFloat(ctx.RequestContext(), balance)
|
||||
|
||||
var inviterNickname, inviterAvatar, inviterCode string
|
||||
if item.InviterID > 0 {
|
||||
if inviter, err := h.user.GetProfile(ctx.RequestContext(), item.InviterID); err == nil {
|
||||
inviterNickname = inviter.Nickname
|
||||
inviterAvatar = inviter.Avatar
|
||||
inviterCode = inviter.InviteCode
|
||||
}
|
||||
}
|
||||
|
||||
rsp.User = userItem{
|
||||
ID: item.ID,
|
||||
Nickname: item.Nickname,
|
||||
Avatar: item.Avatar,
|
||||
InviteCode: item.InviteCode,
|
||||
InviterID: item.InviterID,
|
||||
InviterNickname: inviterNickname,
|
||||
InviterAvatar: inviterAvatar,
|
||||
InviterCode: inviterCode,
|
||||
Mobile: maskedPhone,
|
||||
DouyinUserID: item.DouyinUserID,
|
||||
Balance: balancePoints,
|
||||
ID: item.ID,
|
||||
Nickname: item.Nickname,
|
||||
Avatar: item.Avatar,
|
||||
InviteCode: item.InviteCode,
|
||||
InviterID: item.InviterID,
|
||||
Mobile: maskedPhone,
|
||||
DouyinUserID: item.DouyinUserID,
|
||||
Balance: balancePoints,
|
||||
}
|
||||
ctx.Payload(rsp)
|
||||
}
|
||||
|
||||
@ -12,20 +12,18 @@ const TableNameTaskCenterTaskTiers = "task_center_task_tiers"
|
||||
|
||||
// TaskCenterTaskTiers 任务中心-档位配置
|
||||
type TaskCenterTaskTiers struct {
|
||||
ID int64 `gorm:"column:id;primaryKey;autoIncrement:true;comment:主键ID" json:"id"` // 主键ID
|
||||
TaskID int64 `gorm:"column:task_id;not null;comment:关联任务ID（task_center_tasks.id）" json:"task_id"` // 关联任务ID（task_center_tasks.id）
|
||||
Metric string `gorm:"column:metric;not null;comment:指标：first_order|order_count|invite_count" json:"metric"` // 指标：first_order|order_count|invite_count
|
||||
Operator string `gorm:"column:operator;not null;comment:比较符：>= 或 ==" json:"operator"` // 比较符：>= 或 ==
|
||||
Threshold int64 `gorm:"column:threshold;not null;comment:阈值（数量或布尔首单）" json:"threshold"` // 阈值（数量或布尔首单）
|
||||
Window string `gorm:"column:window;not null;comment:时间窗口：activity_period|since_registration" json:"window"` // 时间窗口：activity_period|since_registration
|
||||
Repeatable int32 `gorm:"column:repeatable;not null;default:1;comment:是否每档一次：0否 1是" json:"repeatable"` // 是否每档一次：0否 1是
|
||||
Priority int32 `gorm:"column:priority;not null;comment:匹配优先级（数值越小越先匹配）" json:"priority"` // 匹配优先级（数值越小越先匹配）
|
||||
CreatedAt time.Time `gorm:"column:created_at;not null;default:CURRENT_TIMESTAMP;comment:创建时间" json:"created_at"` // 创建时间
|
||||
UpdatedAt time.Time `gorm:"column:updated_at;not null;default:CURRENT_TIMESTAMP;comment:更新时间" json:"updated_at"` // 更新时间
|
||||
ExtraParams string `gorm:"column:extra_params;comment:额外参数配置(如消费门槛)" json:"extra_params"` // 额外参数配置(如消费门槛)
|
||||
ActivityID int32 `gorm:"column:activity_id;comment:活动ID" json:"activity_id"` // 活动ID
|
||||
Quota int32 `gorm:"column:quota;default:0;comment:总限额，0表示不限" json:"quota"` // 总限额，0表示不限
|
||||
ClaimedCount int32 `gorm:"column:claimed_count;default:0;comment:已领取数" json:"claimed_count"` // 已领取数
|
||||
ID int64 `gorm:"column:id;primaryKey;autoIncrement:true;comment:主键ID" json:"id"` // 主键ID
|
||||
TaskID int64 `gorm:"column:task_id;not null;comment:关联任务ID（task_center_tasks.id）" json:"task_id"` // 关联任务ID（task_center_tasks.id）
|
||||
Metric string `gorm:"column:metric;not null;comment:指标：first_order|order_count|invite_count" json:"metric"` // 指标：first_order|order_count|invite_count
|
||||
Operator string `gorm:"column:operator;not null;comment:比较符：>= 或 ==" json:"operator"` // 比较符：>= 或 ==
|
||||
Threshold int64 `gorm:"column:threshold;not null;comment:阈值（数量或布尔首单）" json:"threshold"` // 阈值（数量或布尔首单）
|
||||
Window string `gorm:"column:window;not null;comment:时间窗口：activity_period|since_registration" json:"window"` // 时间窗口：activity_period|since_registration
|
||||
Repeatable int32 `gorm:"column:repeatable;not null;default:1;comment:是否每档一次：0否 1是" json:"repeatable"` // 是否每档一次：0否 1是
|
||||
Priority int32 `gorm:"column:priority;not null;comment:匹配优先级（数值越小越先匹配）" json:"priority"` // 匹配优先级（数值越小越先匹配）
|
||||
CreatedAt time.Time `gorm:"column:created_at;not null;default:CURRENT_TIMESTAMP;comment:创建时间" json:"created_at"` // 创建时间
|
||||
UpdatedAt time.Time `gorm:"column:updated_at;not null;default:CURRENT_TIMESTAMP;comment:更新时间" json:"updated_at"` // 更新时间
|
||||
ExtraParams string `gorm:"column:extra_params;comment:额外参数配置(如消费门槛)" json:"extra_params"` // 额外参数配置(如消费门槛)
|
||||
ActivityID int32 `gorm:"column:activity_id;comment:活动ID" json:"activity_id"` // 活动ID
|
||||
}
|
||||
|
||||
// TableName TaskCenterTaskTiers's table name
|
||||
|
||||
@ -19,7 +19,7 @@ type UserInvites struct {
|
||||
InviteeID int64 `gorm:"column:invitee_id;not null;comment:被邀请用户ID" json:"invitee_id"` // 被邀请用户ID
|
||||
InviteCode string `gorm:"column:invite_code;not null;comment:邀请时使用的邀请码" json:"invite_code"` // 邀请时使用的邀请码
|
||||
RewardPoints int64 `gorm:"column:reward_points;not null;comment:发放的积分数量（用于审计）" json:"reward_points"` // 发放的积分数量（用于审计）
|
||||
RewardedAt *time.Time `gorm:"column:rewarded_at;comment:奖励发放时间" json:"rewarded_at"` // 奖励发放时间
|
||||
RewardedAt time.Time `gorm:"column:rewarded_at;comment:奖励发放时间" json:"rewarded_at"` // 奖励发放时间
|
||||
CreatedAt time.Time `gorm:"column:created_at;not null;default:CURRENT_TIMESTAMP(3);comment:创建时间" json:"created_at"` // 创建时间
|
||||
UpdatedAt time.Time `gorm:"column:updated_at;not null;default:CURRENT_TIMESTAMP(3);comment:更新时间" json:"updated_at"` // 更新时间
|
||||
DeletedAt gorm.DeletedAt `gorm:"column:deleted_at;comment:删除时间（软删）" json:"deleted_at"` // 删除时间（软删）
|
||||
|
||||
@ -25,20 +25,18 @@ type Task struct {
|
||||
func (Task) TableName() string { return "task_center_tasks" }
|
||||
|
||||
type TaskTier struct {
|
||||
ID int64 `gorm:"primaryKey;autoIncrement"`
|
||||
TaskID int64 `gorm:"index;not null"`
|
||||
Metric string `gorm:"size:32;not null"`
|
||||
Operator string `gorm:"size:8;not null"`
|
||||
Threshold int64 `gorm:"not null"`
|
||||
Window string `gorm:"size:32;not null"`
|
||||
Repeatable int32 `gorm:"not null"`
|
||||
Priority int32 `gorm:"not null"`
|
||||
ActivityID int64 `gorm:"not null;default:0;index"` // 关联活动ID，0为全局
|
||||
ExtraParams datatypes.JSON `gorm:"type:json"`
|
||||
Quota int32 `gorm:"not null;default:0"` // 总限额，0表示不限
|
||||
ClaimedCount int32 `gorm:"not null;default:0"` // 已领取数
|
||||
CreatedAt time.Time
|
||||
UpdatedAt time.Time
|
||||
ID int64 `gorm:"primaryKey;autoIncrement"`
|
||||
TaskID int64 `gorm:"index;not null"`
|
||||
Metric string `gorm:"size:32;not null"`
|
||||
Operator string `gorm:"size:8;not null"`
|
||||
Threshold int64 `gorm:"not null"`
|
||||
Window string `gorm:"size:32;not null"`
|
||||
Repeatable int32 `gorm:"not null"`
|
||||
Priority int32 `gorm:"not null"`
|
||||
ActivityID int64 `gorm:"not null;default:0;index"` // 关联活动ID，0为全局
|
||||
ExtraParams datatypes.JSON `gorm:"type:json"`
|
||||
CreatedAt time.Time
|
||||
UpdatedAt time.Time
|
||||
}
|
||||
|
||||
func (TaskTier) TableName() string { return "task_center_task_tiers" }
|
||||
|
||||
@ -257,7 +257,6 @@ func NewHTTPMux(logger logger.CustomLogger, db mysql.Repo) (core.Mux, func(), er
|
||||
|
||||
// 用户管理
|
||||
adminAuthApiRouter.GET("/users", intc.RequireAdminAction("user:view"), adminHandler.ListAppUsers())
|
||||
adminAuthApiRouter.GET("/users/optimized", intc.RequireAdminAction("user:view"), adminHandler.ListAppUsersOptimized()) // 优化版本（性能提升83%）
|
||||
adminAuthApiRouter.GET("/users/:user_id/invites", intc.RequireAdminAction("user:view"), adminHandler.ListUserInvites())
|
||||
adminAuthApiRouter.GET("/users/:user_id/orders", intc.RequireAdminAction("user:view"), adminHandler.ListUserOrders())
|
||||
adminAuthApiRouter.GET("/users/:user_id/coupons", intc.RequireAdminAction("user:view"), adminHandler.ListUserCoupons())
|
||||
@ -458,7 +457,6 @@ func NewHTTPMux(logger logger.CustomLogger, db mysql.Repo) (core.Mux, func(), er
|
||||
appAuthApiRouter.GET("/users/:user_id/coupons", userHandler.ListUserCoupons())
|
||||
appAuthApiRouter.GET("/users/:user_id/coupons/stats", userHandler.GetUserCouponStats())
|
||||
appAuthApiRouter.GET("/users/:user_id/coupons/:user_coupon_id/usage", userHandler.ListUserCouponUsage())
|
||||
appAuthApiRouter.POST("/users/:user_id/coupons/:user_coupon_id/transfer", appapi.NewCouponTransfer(logger, db, userSvc).TransferCouponHandler())
|
||||
appAuthApiRouter.GET("/users/:user_id/points", userHandler.ListUserPoints())
|
||||
appAuthApiRouter.GET("/users/:user_id/points/balance", userHandler.GetUserPointsBalance())
|
||||
appAuthApiRouter.GET("/users/:user_id/stats", userHandler.GetUserStats())
|
||||
@ -488,7 +486,6 @@ func NewHTTPMux(logger logger.CustomLogger, db mysql.Repo) (core.Mux, func(), er
|
||||
appAuthApiRouter.POST("/orders/:order_id/cancel", userHandler.CancelOrder())
|
||||
appAuthApiRouter.GET("/products", appapi.NewProduct(logger, db, userSvc).ListProductsForApp())
|
||||
appAuthApiRouter.GET("/products/:id", appapi.NewProduct(logger, db, userSvc).GetProductDetailForApp())
|
||||
appAuthApiRouter.GET("/product_categories", appapi.NewProductCategory(logger, db).ListProductCategoriesForApp())
|
||||
appAuthApiRouter.GET("/store/items", appapi.NewStore(logger, db, userSvc).ListStoreItemsForApp())
|
||||
appAuthApiRouter.GET("/lottery/result", activityHandler.LotteryResultByOrder())
|
||||
|
||||
|
||||
@ -37,34 +37,8 @@ func (s *ActivityCommitmentService) Generate(ctx context.Context, activityID int
|
||||
}
|
||||
var itemsRoot []byte
|
||||
if len(issueIDs) > 0 {
|
||||
// Safety limits to prevent memory exhaustion
|
||||
const (
|
||||
maxSingleRewardQty = int64(10000) // Single reward quantity limit
|
||||
maxTotalSlots = int64(100000) // Total slots limit
|
||||
)
|
||||
|
||||
// First pass: validate quantities and calculate total
|
||||
totalQty := int64(0)
|
||||
for _, iid := range issueIDs {
|
||||
rs, _ := s.read.ActivityRewardSettings.WithContext(ctx).ReadDB().Where(s.read.ActivityRewardSettings.IssueID.Eq(iid)).Order(
|
||||
s.read.ActivityRewardSettings.IsBoss.Desc(),
|
||||
s.read.ActivityRewardSettings.Level.Asc(),
|
||||
s.read.ActivityRewardSettings.Sort.Asc(),
|
||||
).Find()
|
||||
for _, r := range rs {
|
||||
if r.OriginalQty > maxSingleRewardQty {
|
||||
return 0, errors.New("单个奖励数量超过限制，请检查配置")
|
||||
}
|
||||
totalQty += r.OriginalQty
|
||||
}
|
||||
}
|
||||
|
||||
if totalQty > maxTotalSlots {
|
||||
return 0, errors.New("活动总槽位数超过系统限制，请调整奖励配置")
|
||||
}
|
||||
|
||||
// Second pass: build slots with pre-allocated capacity
|
||||
slots := make([]int64, 0, totalQty)
|
||||
// fetch rewards per issue and build slots
|
||||
slots := make([]int64, 0)
|
||||
for _, iid := range issueIDs {
|
||||
rs, _ := s.read.ActivityRewardSettings.WithContext(ctx).ReadDB().Where(s.read.ActivityRewardSettings.IssueID.Eq(iid)).Order(
|
||||
s.read.ActivityRewardSettings.IsBoss.Desc(),
|
||||
|
||||
@ -126,18 +126,15 @@ type TaskTierInput struct {
|
||||
}
|
||||
|
||||
type TaskTierItem struct {
|
||||
ID int64 `json:"id"`
|
||||
Metric string `json:"metric"`
|
||||
Operator string `json:"operator"`
|
||||
Threshold int64 `json:"threshold"`
|
||||
Window string `json:"window"`
|
||||
Repeatable int32 `json:"repeatable"`
|
||||
Priority int32 `json:"priority"`
|
||||
ActivityID int64 `json:"activity_id"`
|
||||
ExtraParams datatypes.JSON `json:"extra_params"`
|
||||
Quota int32 `json:"quota"` // 总限额，0表示不限
|
||||
ClaimedCount int32 `json:"claimed_count"` // 已领取数
|
||||
Remaining int32 `json:"remaining"` // 剩余可领，-1表示不限
|
||||
ID int64 `json:"id"`
|
||||
Metric string `json:"metric"`
|
||||
Operator string `json:"operator"`
|
||||
Threshold int64 `json:"threshold"`
|
||||
Window string `json:"window"`
|
||||
Repeatable int32 `json:"repeatable"`
|
||||
Priority int32 `json:"priority"`
|
||||
ActivityID int64 `json:"activity_id"`
|
||||
ExtraParams datatypes.JSON `json:"extra_params"`
|
||||
}
|
||||
|
||||
type TaskRewardInput struct {
|
||||
@ -254,14 +251,7 @@ func (s *service) ListTasks(ctx context.Context, in ListTasksInput) (items []Tas
|
||||
// 填充 Tiers
|
||||
out[i].Tiers = make([]TaskTierItem, len(v.Tiers))
|
||||
for j, t := range v.Tiers {
|
||||
remaining := int32(-1) // -1 表示不限
|
||||
if t.Quota > 0 {
|
||||
remaining = t.Quota - t.ClaimedCount
|
||||
if remaining < 0 {
|
||||
remaining = 0
|
||||
}
|
||||
}
|
||||
out[i].Tiers[j] = TaskTierItem{ID: t.ID, Metric: t.Metric, Operator: t.Operator, Threshold: t.Threshold, Window: t.Window, Repeatable: t.Repeatable, Priority: t.Priority, ActivityID: t.ActivityID, ExtraParams: t.ExtraParams, Quota: t.Quota, ClaimedCount: t.ClaimedCount, Remaining: remaining}
|
||||
out[i].Tiers[j] = TaskTierItem{ID: t.ID, Metric: t.Metric, Operator: t.Operator, Threshold: t.Threshold, Window: t.Window, Repeatable: t.Repeatable, Priority: t.Priority, ActivityID: t.ActivityID, ExtraParams: t.ExtraParams}
|
||||
}
|
||||
// 填充 Rewards
|
||||
out[i].Rewards = make([]TaskRewardItem, len(v.Rewards))
|
||||
@ -452,21 +442,7 @@ func (s *service) ClaimTier(ctx context.Context, userID int64, taskID int64, tie
|
||||
return errors.New("任务条件未达成，无法领取")
|
||||
}
|
||||
|
||||
// 2. 限额校验：如果设置了限额（quota > 0），需要原子性地增加 claimed_count
|
||||
if tier.Quota > 0 {
|
||||
result := s.repo.GetDbW().Model(&tcmodel.TaskTier{}).
|
||||
Where("id = ? AND claimed_count < quota", tierID).
|
||||
Update("claimed_count", gorm.Expr("claimed_count + 1"))
|
||||
if result.Error != nil {
|
||||
return result.Error
|
||||
}
|
||||
if result.RowsAffected == 0 {
|
||||
return errors.New("奖励已领完")
|
||||
}
|
||||
s.logger.Info("ClaimTier: Quota check passed", zap.Int64("tier_id", tierID), zap.Int32("quota", tier.Quota))
|
||||
}
|
||||
|
||||
// 3. 先尝试发放奖励 (grantTierRewards 内部有幂等校验)
|
||||
// 1. 先尝试发放奖励 (grantTierRewards 内部有幂等校验)
|
||||
// IDK logic inside grantTierRewards ensures we don't double grant.
|
||||
// We use "manual_claim" as source type.
|
||||
// IMPORTANT: Call this BEFORE updating the progress status to avoid "Claimed but not received" state if grant fails.
|
||||
@ -552,14 +528,7 @@ func (s *service) ListTaskTiers(ctx context.Context, taskID int64) ([]TaskTierIt
|
||||
}
|
||||
out := make([]TaskTierItem, len(rows))
|
||||
for i, v := range rows {
|
||||
remaining := int32(-1) // -1 表示不限
|
||||
if v.Quota > 0 {
|
||||
remaining = v.Quota - v.ClaimedCount
|
||||
if remaining < 0 {
|
||||
remaining = 0
|
||||
}
|
||||
}
|
||||
out[i] = TaskTierItem{ID: v.ID, Metric: v.Metric, Operator: v.Operator, Threshold: v.Threshold, Window: v.Window, Repeatable: v.Repeatable, Priority: v.Priority, ActivityID: v.ActivityID, ExtraParams: v.ExtraParams, Quota: v.Quota, ClaimedCount: v.ClaimedCount, Remaining: remaining}
|
||||
out[i] = TaskTierItem{ID: v.ID, Metric: v.Metric, Operator: v.Operator, Threshold: v.Threshold, Window: v.Window, Repeatable: v.Repeatable, Priority: v.Priority, ActivityID: v.ActivityID, ExtraParams: v.ExtraParams}
|
||||
}
|
||||
return out, nil
|
||||
}
|
||||
|
||||
@ -1,99 +0,0 @@
|
||||
package user
|
||||
|
||||
import (
|
||||
"context"
|
||||
"errors"
|
||||
"fmt"
|
||||
"time"
|
||||
|
||||
"bindbox-game/internal/repository/mysql/model"
|
||||
|
||||
"gorm.io/gorm"
|
||||
)
|
||||
|
||||
// TransferCoupon 转赠优惠券给另一个用户
|
||||
// fromUserID: 发送方用户ID
|
||||
// toUserID: 接收方用户ID
|
||||
// userCouponID: 用户持有的优惠券记录ID
|
||||
func (s *service) TransferCoupon(ctx context.Context, fromUserID, toUserID, userCouponID int64) error {
|
||||
if fromUserID <= 0 || toUserID <= 0 || userCouponID <= 0 {
|
||||
return fmt.Errorf("invalid_params")
|
||||
}
|
||||
if fromUserID == toUserID {
|
||||
return fmt.Errorf("cannot_transfer_to_self")
|
||||
}
|
||||
|
||||
// 1. 校验发送方持有该优惠券
|
||||
uc, err := s.readDB.UserCoupons.WithContext(ctx).
|
||||
Where(s.readDB.UserCoupons.ID.Eq(userCouponID)).
|
||||
Where(s.readDB.UserCoupons.UserID.Eq(fromUserID)).
|
||||
First()
|
||||
if err != nil {
|
||||
if errors.Is(err, gorm.ErrRecordNotFound) {
|
||||
return fmt.Errorf("coupon_not_found")
|
||||
}
|
||||
return err
|
||||
}
|
||||
|
||||
// 2. 校验优惠券状态为可用
|
||||
if uc.Status != 1 {
|
||||
return fmt.Errorf("coupon_not_available")
|
||||
}
|
||||
|
||||
// 3. 校验接收方用户存在
|
||||
_, err = s.readDB.Users.WithContext(ctx).Where(s.readDB.Users.ID.Eq(toUserID)).First()
|
||||
if err != nil {
|
||||
if errors.Is(err, gorm.ErrRecordNotFound) {
|
||||
return fmt.Errorf("receiver_not_found")
|
||||
}
|
||||
return err
|
||||
}
|
||||
|
||||
// 4. 执行转赠：更新 user_id
|
||||
db := s.repo.GetDbW()
|
||||
err = db.Transaction(func(tx *gorm.DB) error {
|
||||
// 更新优惠券归属
|
||||
if err := tx.Model(&model.UserCoupons{}).
|
||||
Where("id = ? AND user_id = ? AND status = 1", userCouponID, fromUserID).
|
||||
Update("user_id", toUserID).Error; err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
// 记录转出日志
|
||||
transferOutLog := &model.UserCouponLedger{
|
||||
UserID: fromUserID,
|
||||
UserCouponID: userCouponID,
|
||||
ChangeAmount: 0, // 转赠不涉及金额变动
|
||||
BalanceAfter: uc.BalanceAmount,
|
||||
OrderID: 0,
|
||||
Action: "transfer_out",
|
||||
CreatedAt: time.Now(),
|
||||
}
|
||||
if err := tx.Create(transferOutLog).Error; err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
// 记录转入日志
|
||||
transferInLog := &model.UserCouponLedger{
|
||||
UserID: toUserID,
|
||||
UserCouponID: userCouponID,
|
||||
ChangeAmount: 0,
|
||||
BalanceAfter: uc.BalanceAmount,
|
||||
OrderID: 0,
|
||||
Action: "transfer_in",
|
||||
CreatedAt: time.Now(),
|
||||
}
|
||||
if err := tx.Create(transferInLog).Error; err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
return nil
|
||||
})
|
||||
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
fmt.Printf("[优惠券转赠] 成功: coupon_id=%d from=%d to=%d\n", userCouponID, fromUserID, toUserID)
|
||||
return nil
|
||||
}
|
||||
@ -155,13 +155,12 @@ func (s *service) LoginWeixin(ctx context.Context, in LoginWeixinInput) (*LoginW
|
||||
if existed == nil {
|
||||
inviter, _ := tx.Users.WithContext(ctx).Where(tx.Users.InviteCode.Eq(in.InviteCode)).First()
|
||||
if inviter != nil && inviter.ID != u.ID {
|
||||
now := time.Now()
|
||||
inv := &model.UserInvites{
|
||||
InviterID: inviter.ID,
|
||||
InviteeID: u.ID,
|
||||
InviteCode: in.InviteCode,
|
||||
RewardPoints: 0,
|
||||
RewardedAt: &now,
|
||||
RewardedAt: time.Now(),
|
||||
}
|
||||
if err := tx.UserInvites.WithContext(ctx).Create(inv); err != nil {
|
||||
return err
|
||||
|
||||
@ -24,14 +24,11 @@ func (s *service) getExchangeRate(ctx context.Context) int64 {
|
||||
return rate
|
||||
}
|
||||
|
||||
// CentsToPointsFloat 分 → 积分（浮点数，用于 API 返回展示）
|
||||
// 公式：积分 = 分 * rate / 100
|
||||
// 例如：rate=1, 3580分 → 35.8积分
|
||||
// CentsToPointsFloat 分 → 积分（浮点数，用于 API 返回展示）
|
||||
// 公式：积分 = 分 * rate / 100
|
||||
// 例如：rate=1, 3580分 → 35.8积分
|
||||
func (s *service) CentsToPointsFloat(ctx context.Context, cents int64) float64 {
|
||||
if cents == 0 {
|
||||
if cents <= 0 {
|
||||
return 0
|
||||
}
|
||||
rate := s.getExchangeRate(ctx)
|
||||
|
||||
@ -241,13 +241,12 @@ func (s *service) LoginByCode(ctx context.Context, in SmsLoginInput) (*SmsLoginO
|
||||
if existed == nil {
|
||||
inviter, _ := tx.Users.WithContext(ctx).Where(tx.Users.InviteCode.Eq(in.InviteCode)).First()
|
||||
if inviter != nil && inviter.ID != user.ID {
|
||||
now := time.Now()
|
||||
inv := &model.UserInvites{
|
||||
InviterID: inviter.ID,
|
||||
InviteeID: user.ID,
|
||||
InviteCode: in.InviteCode,
|
||||
RewardPoints: 0,
|
||||
RewardedAt: &now,
|
||||
RewardedAt: time.Now(),
|
||||
}
|
||||
if txErr = tx.UserInvites.WithContext(ctx).Create(inv); txErr != nil {
|
||||
return txErr
|
||||
|
||||
@ -82,8 +82,6 @@ type Service interface {
|
||||
GrantGamePass(ctx context.Context, userID int64, packageID int64, count int32, orderNo string) error
|
||||
// 邀请人绑定
|
||||
BindInviter(ctx context.Context, userID int64, in BindInviterInput) (*BindInviterOutput, error)
|
||||
// 优惠券转赠
|
||||
TransferCoupon(ctx context.Context, fromUserID, toUserID, userCouponID int64) error
|
||||
}
|
||||
|
||||
type service struct {
|
||||
|
||||
@ -1,6 +0,0 @@
|
||||
-- 任务限量领取功能 - 数据库迁移脚本
|
||||
-- 为 task_center_task_tiers 表添加限额字段
|
||||
|
||||
ALTER TABLE task_center_task_tiers
|
||||
ADD COLUMN quota INT DEFAULT 0 COMMENT '总限额，0表示不限' AFTER activity_id,
|
||||
ADD COLUMN claimed_count INT DEFAULT 0 COMMENT '已领取数' AFTER quota;
|
||||
Loading…
x
Reference in New Issue
Block a user