team/hm-server
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add and fix 一键解冻

Browse Source
This commit is contained in:
18278715334
2025-12-31 12:40:41 +08:00
parent 5abfd7adbd
commit 193b47893d
14 changed files with 356 additions and 438 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
app/main/api/internal/handler/admin_agent/adminbatchunfreezeagentcommissionhandler.go Normal file
View File

@@ -0,0 +1,29 @@
package admin_agent
import (
"net/http"
"github.com/zeromicro/go-zero/rest/httpx"
"tydata-server/app/main/api/internal/logic/admin_agent"
"tydata-server/app/main/api/internal/svc"
"tydata-server/app/main/api/internal/types"
"tydata-server/common/result"
"tydata-server/pkg/lzkit/validator"
)
func AdminBatchUnfreezeAgentCommissionHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
var req types.AdminBatchUnfreezeAgentCommissionReq
if err := httpx.Parse(r, &req); err != nil {
result.ParamErrorResult(r, w, err)
return
}
if err := validator.Validate(req); err != nil {
result.ParamValidateErrorResult(r, w, err)
return
}
l := admin_agent.NewAdminBatchUnfreezeAgentCommissionLogic(r.Context(), svcCtx)
resp, err := l.AdminBatchUnfreezeAgentCommission(&req)
result.HttpResult(r, w, resp, err)
}
}

30
app/main/api/internal/handler/admin_agent/adminupdateagentcommissionstatushandler.go Normal file
View File

@@ -0,0 +1,30 @@
package admin_agent
import (
"net/http"
"tydata-server/app/main/api/internal/logic/admin_agent"
"tydata-server/app/main/api/internal/svc"
"tydata-server/app/main/api/internal/types"
"tydata-server/common/result"
"tydata-server/pkg/lzkit/validator"
"github.com/zeromicro/go-zero/rest/httpx"
)
func AdminUpdateAgentCommissionStatusHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
var req types.AdminUpdateAgentCommissionStatusReq
if err := httpx.Parse(r, &req); err != nil {
result.ParamErrorResult(r, w, err)
return
}
if err := validator.Validate(req); err != nil {
result.ParamValidateErrorResult(r, w, err)
return
}
l := admin_agent.NewAdminUpdateAgentCommissionStatusLogic(r.Context(), svcCtx)
resp, err := l.AdminUpdateAgentCommissionStatus(&req)
result.HttpResult(r, w, resp, err)
}
}

10
app/main/api/internal/handler/routes.go
View File

@@ -42,11 +42,21 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) {
Path: "/agent-commission-deduction/list",
Handler: admin_agent.AdminGetAgentCommissionDeductionListHandler(serverCtx),
},
{
Method: http.MethodPost,
Path: "/agent-commission/batch-unfreeze",
Handler: admin_agent.AdminBatchUnfreezeAgentCommissionHandler(serverCtx),
},
{
Method: http.MethodGet,
Path: "/agent-commission/list",
Handler: admin_agent.AdminGetAgentCommissionListHandler(serverCtx),
},
{
Method: http.MethodPost,
Path: "/agent-commission/update-status",
Handler: admin_agent.AdminUpdateAgentCommissionStatusHandler(serverCtx),
},
{
Method: http.MethodGet,
Path: "/agent-link/list",

112
app/main/api/internal/logic/admin_agent/adminbatchunfreezeagentcommissionlogic.go Normal file
View File

@@ -0,0 +1,112 @@
package admin_agent
import (
"context"
"tydata-server/app/main/api/internal/svc"
"tydata-server/app/main/api/internal/types"
"tydata-server/app/main/model"
"tydata-server/common/xerr"
"github.com/Masterminds/squirrel"
"github.com/zeromicro/go-zero/core/logx"
"github.com/zeromicro/go-zero/core/stores/sqlx"
)
type AdminBatchUnfreezeAgentCommissionLogic struct {
logx.Logger
ctx context.Context
svcCtx *svc.ServiceContext
}
func NewAdminBatchUnfreezeAgentCommissionLogic(ctx context.Context, svcCtx *svc.ServiceContext) *AdminBatchUnfreezeAgentCommissionLogic {
return &AdminBatchUnfreezeAgentCommissionLogic{
Logger: logx.WithContext(ctx),
ctx: ctx,
svcCtx: svcCtx,
}
}
func (l *AdminBatchUnfreezeAgentCommissionLogic) AdminBatchUnfreezeAgentCommission(req *types.AdminBatchUnfreezeAgentCommissionReq) (resp *types.AdminBatchUnfreezeAgentCommissionResp, err error) {
// 构建查询条件：状态为1（冻结中）
builder := l.svcCtx.AgentCommissionModel.SelectBuilder().Where(squirrel.Eq{"status": 1})
// 如果指定了代理商ID，则只查询该代理商的冻结佣金
if req.AgentId != nil && *req.AgentId > 0 {
builder = builder.Where(squirrel.Eq{"agent_id": *req.AgentId})
}
// 查询所有冻结中的佣金记录
commissions, err := l.svcCtx.AgentCommissionModel.FindAll(l.ctx, builder, "")
if err != nil {
return nil, err
}
// 如果没有冻结的佣金，直接返回
if len(commissions) == 0 {
resp = &types.AdminBatchUnfreezeAgentCommissionResp{
Success: true,
Count: 0,
Amount: 0,
}
return
}
// 计算总金额
var totalAmount float64
for _, commission := range commissions {
totalAmount += commission.Amount
}
// 开始事务
err = l.svcCtx.AgentCommissionModel.Trans(l.ctx, func(ctx context.Context, session sqlx.Session) error {
// 按代理商分组更新钱包余额
agentWalletMap := make(map[int64]*model.AgentWallet)
// 遍历所有冻结的佣金，更新状态
for _, commission := range commissions {
// 更新佣金状态为已结算
commission.Status = 0
err := l.svcCtx.AgentCommissionModel.UpdateWithVersion(ctx, session, commission)
if err != nil {
return err
}
// 累加到对应代理商的钱包数据
if wallet, exists := agentWalletMap[commission.AgentId]; exists {
wallet.Balance += commission.Amount
wallet.FrozenBalance -= commission.Amount
} else {
// 查询该代理商的钱包
wallet, err := l.svcCtx.AgentWalletModel.FindOneByAgentId(ctx, commission.AgentId)
if err != nil {
return err
}
wallet.Balance += commission.Amount
wallet.FrozenBalance -= commission.Amount
agentWalletMap[commission.AgentId] = wallet
}
}
// 更新所有受影响代理商的钱包
for _, wallet := range agentWalletMap {
err := l.svcCtx.AgentWalletModel.UpdateWithVersion(ctx, session, wallet)
if err != nil {
return err
}
}
return nil
})
if err != nil {
return nil, xerr.NewErrMsg("批量解冻失败: " + err.Error())
}
resp = &types.AdminBatchUnfreezeAgentCommissionResp{
Success: true,
Count: int64(len(commissions)),
Amount: totalAmount,
}
return
}

94
app/main/api/internal/logic/admin_agent/adminupdateagentcommissionstatuslogic.go Normal file
View File

@@ -0,0 +1,94 @@
package admin_agent
import (
"context"
"errors"
"tydata-server/app/main/api/internal/svc"
"tydata-server/app/main/api/internal/types"
"tydata-server/app/main/model"
"tydata-server/common/xerr"
"github.com/zeromicro/go-zero/core/logx"
"github.com/zeromicro/go-zero/core/stores/sqlx"
)
type AdminUpdateAgentCommissionStatusLogic struct {
logx.Logger
ctx context.Context
svcCtx *svc.ServiceContext
}
func NewAdminUpdateAgentCommissionStatusLogic(ctx context.Context, svcCtx *svc.ServiceContext) *AdminUpdateAgentCommissionStatusLogic {
return &AdminUpdateAgentCommissionStatusLogic{
Logger: logx.WithContext(ctx),
ctx: ctx,
svcCtx: svcCtx,
}
}
func (l *AdminUpdateAgentCommissionStatusLogic) AdminUpdateAgentCommissionStatus(req *types.AdminUpdateAgentCommissionStatusReq) (resp *types.AdminUpdateAgentCommissionStatusResp, err error) {
// 验证状态值
if req.Status != 0 && req.Status != 1 && req.Status != 2 {
return nil, xerr.NewErrMsg("无效的状态值，状态必须为0(已结算)、1(冻结中)或2(已取消)")
}
// 查询佣金记录
commission, err := l.svcCtx.AgentCommissionModel.FindOne(l.ctx, req.Id)
if err != nil {
if errors.Is(err, model.ErrNotFound) {
return nil, xerr.NewErrMsg("佣金记录不存在")
}
return nil, err
}
// 检查状态是否允许修改
if commission.Status == 0 {
return nil, xerr.NewErrMsg("已结算的佣金记录不能修改状态")
}
if commission.Status == 2 {
return nil, xerr.NewErrMsg("已取消的佣金记录不能修改状态")
}
// 开始事务
err = l.svcCtx.AgentCommissionModel.Trans(l.ctx, func(ctx context.Context, session sqlx.Session) error {
// 更新佣金状态
commission.Status = req.Status
err = l.svcCtx.AgentCommissionModel.UpdateWithVersion(ctx, session, commission)
if err != nil {
return err
}
// 查询代理钱包
wallet, err := l.svcCtx.AgentWalletModel.FindOneByAgentId(ctx, commission.AgentId)
if err != nil {
return err
}
// 根据状态更新钱包
if req.Status == 0 {
// 解冻操作(状态改为已结算)：将金额添加到代理钱包余额
wallet.Balance += commission.Amount
wallet.FrozenBalance -= commission.Amount
} else if req.Status == 2 {
// 取消操作(状态改为已取消)：只扣减冻结金额
wallet.FrozenBalance -= commission.Amount
}
err = l.svcCtx.AgentWalletModel.UpdateWithVersion(ctx, session, wallet)
if err != nil {
return err
}
return nil
})
if err != nil {
return nil, err
}
resp = &types.AdminUpdateAgentCommissionStatusResp{
Success: true,
}
return
}

32
app/main/api/internal/queue/unfreezeCommission.go
View File

@@ -20,9 +20,6 @@ const (
CommissionStatusFrozen = 1 // 冻结佣金
)
// UNFREEZE_COMMISSION_DELAY_DAYS 定义延迟解冻天数
const UNFREEZE_COMMISSION_DELAY_DAYS = 3 // 三天后解冻
type UnfreezeCommissionHandler struct {
svcCtx *svc.ServiceContext
}
@@ -63,26 +60,8 @@ func (l *UnfreezeCommissionHandler) ProcessTask(ctx context.Context, t *asynq.Ta
return nil
}
// 检查是否已到达解冻时间（3天后）
unfreezeTime := commission.UpdateTime.AddDate(0, 0, UNFREEZE_COMMISSION_DELAY_DAYS)
if now.Before(unfreezeTime) {
logx.Infof("佣金记录ID %d 尚未到达解冻时间，解冻时间: %s", commissionID, unfreezeTime.Format("2006-01-02 15:04:05"))
return nil
}
// 使用事务处理解冻操作
err = l.svcCtx.AgentCommissionModel.Trans(ctx, func(ctx context.Context, session sqlx.Session) error {
// 更新佣金状态为已发放
commission.Status = CommissionStatusReleased
commission.UpdateTime = now
// 更新佣金数据库
_, err := l.svcCtx.AgentCommissionModel.Update(ctx, session, commission)
if err != nil {
logx.Errorf("更新佣金记录ID %d 失败: %v", commissionID, err)
return err
}
// 获取代理钱包记录
agentWallet, err := l.svcCtx.AgentWalletModel.FindOneByAgentId(ctx, commission.AgentId)
if err != nil {
@@ -104,6 +83,17 @@ func (l *UnfreezeCommissionHandler) ProcessTask(ctx context.Context, t *asynq.Ta
return err
}
// 钱包更新成功后，再更新佣金状态为已发放
commission.Status = CommissionStatusReleased
commission.UpdateTime = now
// 更新佣金数据库（使用 UpdateWithVersion 保持乐观锁）
err = l.svcCtx.AgentCommissionModel.UpdateWithVersion(ctx, session, commission)
if err != nil {
logx.Errorf("更新佣金记录ID %d 失败: %v", commissionID, err)
return err
}
logx.Infof("成功解冻佣金记录ID %d，代理ID %d，佣金金额 %.2f，已将佣金金额从冻结余额转移到可用余额",
commissionID, commission.AgentId, commissionAmount)
return nil

2
app/main/api/internal/service/agentService.go
View File

@@ -200,7 +200,7 @@ func (l *AgentService) AgentProcess(ctx context.Context, order *model.Order) err
if len(commissions) > 0 {
// 为所有新创建的佣金记录触发解冻任务
for _, commission := range commissions {
// 发送解冻任务，将在3天后执行
// 发送解冻任务，将在10小时后执行
sendTaskErr := l.AsynqService.SendUnfreezeCommissionTask(commission.Id)
if sendTaskErr != nil {
logx.Errorf("发送佣金解冻任务失败，佣金ID: %d, 错误: %v", commission.Id, sendTaskErr)

5
app/main/api/internal/service/asynqService.go
View File

@@ -4,6 +4,8 @@ package service
import (
"encoding/json"
"time"
"tydata-server/app/main/api/internal/config"
"tydata-server/app/main/api/internal/types"
@@ -72,7 +74,8 @@ func (s *AsynqService) SendUnfreezeCommissionTask(commissionID int64) error {
}
options := []asynq.Option{
asynq.MaxRetry(5), // 设置最大重试次数
asynq.ProcessIn(10 * time.Hour), // 10小时后执行
asynq.MaxRetry(5), // 设置最大重试次数
}
task := asynq.NewTask(types.MsgUnfreezeCommission, payloadBytes, options...)

19
app/main/api/internal/types/types.go
View File

@@ -36,6 +36,16 @@ type AdminAssignRoleApiResp struct {
Success bool `json:"success"`
}
type AdminBatchUnfreezeAgentCommissionReq struct {
AgentId *int64 `json:"agent_id,optional"` // 代理ID，可选。如果不传则解冻所有冻结中的佣金
}
type AdminBatchUnfreezeAgentCommissionResp struct {
Success bool `json:"success"` // 是否成功
Count int64 `json:"count"` // 解冻的数量
Amount float64 `json:"amount"` // 解冻的总金额
}
type AdminBatchUpdateApiStatusReq struct {
Ids []int64 `json:"ids"`
Status int64 `json:"status"`
@@ -784,6 +794,15 @@ type AdminRoleApiInfo struct {
Description string `json:"description"`
}
type AdminUpdateAgentCommissionStatusReq struct {
Id int64 `json:"id"` // 佣金记录ID
Status int64 `json:"status"` // 状态:0-已结算,1-冻结中,2-已取消
}
type AdminUpdateAgentCommissionStatusResp struct {
Success bool `json:"success"` // 是否成功
}
type AdminUpdateAgentMembershipConfigReq struct {
Id int64 `json:"id"` // 主键
LevelName string `json:"level_name"` // 会员级别名称