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

f add

Browse Source
This commit is contained in:
18278715334
2026-01-07 16:50:42 +08:00
parent 9e42257e4e
commit ec72e47695
16 changed files with 981 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
app/main/api/internal/handler/admin_agent/admingetagentwallettransactionlisthandler.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 AdminGetAgentWalletTransactionListHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
var req types.AdminGetAgentWalletTransactionListReq
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.NewAdminGetAgentWalletTransactionListLogic(r.Context(), svcCtx)
resp, err := l.AdminGetAgentWalletTransactionList(&req)
result.HttpResult(r, w, resp, err)
}
}

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

@@ -142,6 +142,11 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) {
Path: "/system-config",
Handler: admin_agent.AdminUpdateSystemConfigHandler(serverCtx),
},
{
Method: http.MethodGet,
Path: "/wallet-transaction/list",
Handler: admin_agent.AdminGetAgentWalletTransactionListHandler(serverCtx),
},
{
Method: http.MethodGet,
Path: "/wallet/:agent_id",

84
app/main/api/internal/logic/admin_agent/admingetagentwallettransactionlistlogic.go Normal file
View File

@@ -0,0 +1,84 @@
package admin_agent
import (
"context"
"errors"
"tydata-server/app/main/api/internal/svc"
"tydata-server/app/main/api/internal/types"
"github.com/Masterminds/squirrel"
"github.com/zeromicro/go-zero/core/logx"
)
type AdminGetAgentWalletTransactionListLogic struct {
logx.Logger
ctx context.Context
svcCtx *svc.ServiceContext
}
func NewAdminGetAgentWalletTransactionListLogic(ctx context.Context, svcCtx *svc.ServiceContext) *AdminGetAgentWalletTransactionListLogic {
return &AdminGetAgentWalletTransactionListLogic{
Logger: logx.WithContext(ctx),
ctx: ctx,
svcCtx: svcCtx,
}
}
func (l *AdminGetAgentWalletTransactionListLogic) AdminGetAgentWalletTransactionList(req *types.AdminGetAgentWalletTransactionListReq) (resp *types.AdminGetAgentWalletTransactionListResp, err error) {
builder := l.svcCtx.AgentWalletTransactionModel.SelectBuilder()
// 必须传入代理ID
if req.AgentId == 0 {
return nil, errors.New("代理ID不能为空")
}
builder = builder.Where(squirrel.Eq{"agent_id": req.AgentId})
// 可选条件
if req.TransactionType != nil && *req.TransactionType != "" {
builder = builder.Where(squirrel.Eq{"transaction_type": *req.TransactionType})
}
if req.CreateTimeStart != nil && *req.CreateTimeStart != "" {
builder = builder.Where(squirrel.GtOrEq{"create_time": *req.CreateTimeStart})
}
if req.CreateTimeEnd != nil && *req.CreateTimeEnd != "" {
builder = builder.Where(squirrel.LtOrEq{"create_time": *req.CreateTimeEnd})
}
list, total, err := l.svcCtx.AgentWalletTransactionModel.FindPageListByPageWithTotal(l.ctx, builder, req.Page, req.PageSize, "create_time DESC")
if err != nil {
return nil, err
}
items := make([]types.AgentWalletTransactionListItem, 0, len(list))
for _, v := range list {
item := types.AgentWalletTransactionListItem{
Id: v.Id,
AgentId: v.AgentId,
TransactionType: v.TransactionType,
Amount: v.Amount,
BalanceBefore: v.BalanceBefore,
BalanceAfter: v.BalanceAfter,
FrozenBalanceBefore: v.FrozenBalanceBefore,
FrozenBalanceAfter: v.FrozenBalanceAfter,
CreateTime: v.CreateTime.Format("2006-01-02 15:04:05"),
}
if v.TransactionId.Valid {
item.TransactionId = &v.TransactionId.String
}
if v.RelatedUserId.Valid {
item.RelatedUserId = &v.RelatedUserId.Int64
}
if v.Remark.Valid {
item.Remark = &v.Remark.String
}
items = append(items, item)
}
resp = &types.AdminGetAgentWalletTransactionListResp{
Total: total,
Items: items,
}
return
}

94
app/main/api/internal/logic/admin_agent/adminreviewbankcardwithdrawallogic.go
View File

@@ -160,11 +160,34 @@ func (l *AdminReviewBankCardWithdrawalLogic) approveBankCardWithdrawal(ctx conte
return errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "查询钱包失败: %v", err)
}
// 记录变动前的冻结余额
frozenBalanceBefore := wallet.FrozenBalance
// 更新钱包（减少冻结余额）
wallet.FrozenBalance -= record.Amount
if err := l.svcCtx.AgentWalletModel.UpdateWithVersion(ctx, session, wallet); err != nil {
return errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "更新钱包失败: %v", err)
}
// 记录交易流水（提现成功）
err = l.svcCtx.AgentService.CreateWalletTransaction(
ctx,
session,
wallet.AgentId,
model.WalletTransactionTypeWithdraw,
-record.Amount, // 变动金额（负数表示减少）
wallet.Balance, // 变动前余额（不变）
wallet.Balance, // 变动后余额（不变）
frozenBalanceBefore, // 变动前冻结余额
wallet.FrozenBalance, // 变动后冻结余额
record.WithdrawNo, // 关联交易ID
0, // 关联用户ID
"提现审核通过", // 备注
)
if err != nil {
return err
}
// 更新扣税记录状态为成功
taxModel, err := l.svcCtx.AgentWithdrawalTaxModel.FindOneByWithdrawalId(ctx, record.Id)
if err != nil {
@@ -206,12 +229,36 @@ func (l *AdminReviewBankCardWithdrawalLogic) rejectWithdrawal(ctx context.Contex
return errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "查询钱包失败: %v", err)
}
// 记录变动前的余额
balanceBefore := wallet.Balance
frozenBalanceBefore := wallet.FrozenBalance
// 更新钱包（余额增加，冻结余额减少）
wallet.Balance += record.Amount
wallet.FrozenBalance -= record.Amount
if err := l.svcCtx.AgentWalletModel.UpdateWithVersion(ctx, session, wallet); err != nil {
return errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "更新钱包失败: %v", err)
}
// 记录交易流水（解冻）
err = l.svcCtx.AgentService.CreateWalletTransaction(
ctx,
session,
wallet.AgentId,
model.WalletTransactionTypeUnfreeze,
record.Amount, // 变动金额（正数表示增加）
balanceBefore, // 变动前余额
wallet.Balance, // 变动后余额
frozenBalanceBefore, // 变动前冻结余额
wallet.FrozenBalance, // 变动后冻结余额
record.WithdrawNo, // 关联交易ID
0, // 关联用户ID
"提现拒绝，解冻资金", // 备注
)
if err != nil {
return err
}
// 更新扣税记录状态为失败
taxModel, err := l.svcCtx.AgentWithdrawalTaxModel.FindOneByWithdrawalId(ctx, record.Id)
if err != nil {
@@ -244,11 +291,34 @@ func (l *AdminReviewBankCardWithdrawalLogic) completeWithdrawalSuccess(ctx conte
return errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "查询钱包失败: %v", err)
}
// 记录变动前的冻结余额
frozenBalanceBefore := wallet.FrozenBalance
// 更新钱包（减少冻结余额）
wallet.FrozenBalance -= record.Amount
if err := l.svcCtx.AgentWalletModel.UpdateWithVersion(ctx, session, wallet); err != nil {
return errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "更新钱包失败: %v", err)
}
// 记录交易流水（提现成功）
err = l.svcCtx.AgentService.CreateWalletTransaction(
ctx,
session,
wallet.AgentId,
model.WalletTransactionTypeWithdraw,
-record.Amount, // 变动金额（负数表示减少）
wallet.Balance, // 变动前余额（不变）
wallet.Balance, // 变动后余额（不变）
frozenBalanceBefore, // 变动前冻结余额
wallet.FrozenBalance, // 变动后冻结余额
record.WithdrawNo, // 关联交易ID
0, // 关联用户ID
"提现成功", // 备注
)
if err != nil {
return err
}
// 更新扣税记录状态为成功
taxModel, err := l.svcCtx.AgentWithdrawalTaxModel.FindOneByWithdrawalId(ctx, record.Id)
if err != nil {
@@ -290,12 +360,36 @@ func (l *AdminReviewBankCardWithdrawalLogic) completeWithdrawalFailure(ctx conte
return errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "查询钱包失败: %v", err)
}
// 记录变动前的余额
balanceBefore := wallet.Balance
frozenBalanceBefore := wallet.FrozenBalance
// 更新钱包（余额增加，冻结余额减少）
wallet.Balance += record.Amount
wallet.FrozenBalance -= record.Amount
if err := l.svcCtx.AgentWalletModel.UpdateWithVersion(ctx, session, wallet); err != nil {
return errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "更新钱包失败: %v", err)
}
// 记录交易流水（解冻）
err = l.svcCtx.AgentService.CreateWalletTransaction(
ctx,
session,
wallet.AgentId,
model.WalletTransactionTypeUnfreeze,
record.Amount, // 变动金额（正数表示增加）
balanceBefore, // 变动前余额
wallet.Balance, // 变动后余额
frozenBalanceBefore, // 变动前冻结余额
wallet.FrozenBalance, // 变动后冻结余额
record.WithdrawNo, // 关联交易ID
0, // 关联用户ID
"提现失败，解冻资金", // 备注
)
if err != nil {
return err
}
// 更新扣税记录状态为失败
taxModel, err := l.svcCtx.AgentWithdrawalTaxModel.FindOneByWithdrawalId(ctx, record.Id)
if err != nil {

28
app/main/api/internal/logic/admin_agent/adminupdateagentwalletbalancelogic.go
View File

@@ -56,6 +56,10 @@ func (l *AdminUpdateAgentWalletBalanceLogic) AdminUpdateAgentWalletBalance(req *
// 更新余额
updateErr := l.svcCtx.AgentWalletModel.Trans(l.ctx, func(transCtx context.Context, session sqlx.Session) error {
// 记录变动前的余额
balanceBefore := wallet.Balance
frozenBalanceBefore := wallet.FrozenBalance
// 使用版本号更新
wallet.Balance = newBalance
err := l.svcCtx.AgentWalletModel.UpdateWithVersion(transCtx, session, wallet)
@@ -63,9 +67,29 @@ func (l *AdminUpdateAgentWalletBalanceLogic) AdminUpdateAgentWalletBalance(req *
return err
}
// TODO: 这里可以添加记录余额变更日志的逻辑
// 创建钱包交易流水记录（手动调整）
remark := fmt.Sprintf("管理员手动调整余额，金额: %.2f", req.Amount)
transErr := l.svcCtx.AgentService.CreateWalletTransaction(
transCtx,
session,
req.AgentId,
model.WalletTransactionTypeAdjust,
req.Amount, // 变动金额（正数表示增加，负数表示减少）
balanceBefore, // 变动前余额
wallet.Balance, // 变动后余额
frozenBalanceBefore, // 变动前冻结余额
wallet.FrozenBalance, // 变动后冻结余额（保持不变）
"", // 关联交易ID（无关联）
0, // 关联用户ID（无关联）
remark, // 备注
)
if transErr != nil {
l.Logger.Errorf("创建代理钱包流水记录失败: %+v", transErr)
return transErr
}
l.Logger.Infof("代理钱包余额变更 - AgentId: %d, 原余额: %.2f, 变更金额: %.2f, 新余额: %.2f",
req.AgentId, wallet.Balance-req.Amount, req.Amount, newBalance)
req.AgentId, balanceBefore, req.Amount, wallet.Balance)
return nil
})

25
app/main/api/internal/logic/agent/bankcardwithdrawallogic.go
View File

@@ -189,11 +189,36 @@ func (l *BankCardWithdrawalLogic) createBankCardWithdrawalRecord(session sqlx.Se
// 冻结资金（事务内操作）
func (l *BankCardWithdrawalLogic) freezeFunds(session sqlx.Session, wallet *model.AgentWallet, amount float64) error {
// 记录变动前的余额
balanceBefore := wallet.Balance
frozenBalanceBefore := wallet.FrozenBalance
// 更新钱包余额
wallet.Balance -= amount
wallet.FrozenBalance += amount
err := l.svcCtx.AgentWalletModel.UpdateWithVersion(l.ctx, session, wallet)
if err != nil {
return err
}
// 记录交易流水（冻结操作）
err = l.svcCtx.AgentService.CreateWalletTransaction(
l.ctx,
session,
wallet.AgentId,
model.WalletTransactionTypeFreeze,
amount, // 变动金额
balanceBefore, // 变动前余额
wallet.Balance, // 变动后余额
frozenBalanceBefore, // 变动前冻结余额
wallet.FrozenBalance, // 变动后冻结余额
"", // 关联交易ID（暂时为空，创建提现记录后可以更新）
0, // 关联用户ID
"提现申请冻结资金", // 备注
)
if err != nil {
return err
}
return nil
}

56
app/main/api/internal/logic/pay/wechatpayrefundcallbacklogic.go
View File

@@ -32,7 +32,10 @@ func HandleCommissionAndWalletDeduction(ctx context.Context, svcCtx *svc.Service
}
for _, commission := range commissions {
// 记录更新佣金状态前的状态值，用于后续判断
oldCommissionStatus := commission.Status
commission.Status = 2 // 设置为已退款
// 更新佣金状态到数据库
var updateCommissionErr error
if session != nil {
@@ -52,17 +55,30 @@ func HandleCommissionAndWalletDeduction(ctx context.Context, svcCtx *svc.Service
continue
}
// 根据订单金额优先减少冻结金额，如果冻结金额不足则减少钱包余额
if wallet.FrozenBalance >= order.Amount {
// 冻结余额足够，优先减少冻结金额
wallet.FrozenBalance -= order.Amount
} else {
// 冻结余额不足，先扣减所有冻结金额，再扣减余额
remaining := order.Amount - wallet.FrozenBalance
wallet.FrozenBalance = 0
wallet.Balance -= remaining
}
// 记录变动前的余额
balanceBefore := wallet.Balance
frozenBalanceBefore := wallet.FrozenBalance
// 如果是已结算状态的佣金（status = 1），直接扣减钱包余额
if oldCommissionStatus == 1 {
// 冻结状态的佣金，根据订单金额优先减少冻结金额，如果冻结金额不足则减少钱包余额
if wallet.FrozenBalance >= order.Amount {
// 冻结余额足够，优先减少冻结金额
wallet.FrozenBalance -= order.Amount
} else {
// 冻结余额不足，先扣减所有冻结金额，再扣减余额
remaining := order.Amount - wallet.FrozenBalance
wallet.FrozenBalance = 0
wallet.Balance -= remaining
}
// 其他状态的佣金，比如已结算状态（status = 1），直接扣减钱包余额
} else {
wallet.Balance -= order.Amount
}
// 变动后余额和冻结余额
balanceAfter := wallet.Balance
frozenBalanceAfter := wallet.FrozenBalance
// 更新钱包
var updateWalletErr error
if session != nil {
updateWalletErr = svcCtx.AgentWalletModel.UpdateWithVersion(ctx, session, wallet)
@@ -73,6 +89,26 @@ func HandleCommissionAndWalletDeduction(ctx context.Context, svcCtx *svc.Service
logx.Errorf("更新代理钱包失败，代理ID: %d, 错误: %v", commission.AgentId, updateWalletErr)
continue
}
// 创建钱包交易流水记录（退款）
transErr := svcCtx.AgentService.CreateWalletTransaction(
ctx,
session,
commission.AgentId,
model.WalletTransactionTypeRefund,
-order.Amount,
balanceBefore,
balanceAfter,
frozenBalanceBefore,
frozenBalanceAfter,
order.OrderNo,
commission.Id,
"订单退款，佣金已扣除",
)
if transErr != nil {
logx.Errorf("创建代理钱包流水记录失败，代理ID: %d, 错误: %v", commission.AgentId, transErr)
continue
}
}
return nil
}

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

@@ -3,6 +3,7 @@ package service
import (
"context"
"database/sql"
"fmt"
"tydata-server/app/main/api/internal/config"
"tydata-server/app/main/model"
"tydata-server/common/globalkey"
@@ -32,6 +33,7 @@ type AgentService struct {
AgentPlatformDeductionModel model.AgentPlatformDeductionModel
AgentActiveStatModel model.AgentActiveStatModel
AgentWithdrawalModel model.AgentWithdrawalModel
AgentWalletTransactionModel model.AgentWalletTransactionModel
AsynqService *AsynqService
}
@@ -42,7 +44,7 @@ func NewAgentService(c config.Config, orderModel model.OrderModel, agentModel mo
agentMembershipRechargeOrderModel model.AgentMembershipRechargeOrderModel,
agentMembershipUserConfigModel model.AgentMembershipUserConfigModel,
agentProductConfigModel model.AgentProductConfigModel, agentPlatformDeductionModel model.AgentPlatformDeductionModel,
agentActiveStatModel model.AgentActiveStatModel, agentWithdrawalModel model.AgentWithdrawalModel, asynqService *AsynqService) *AgentService {
agentActiveStatModel model.AgentActiveStatModel, agentWithdrawalModel model.AgentWithdrawalModel, agentWalletTransactionModel model.AgentWalletTransactionModel, asynqService *AsynqService) *AgentService {
return &AgentService{
config: c,
@@ -63,6 +65,7 @@ func NewAgentService(c config.Config, orderModel model.OrderModel, agentModel mo
AgentPlatformDeductionModel: agentPlatformDeductionModel,
AgentActiveStatModel: agentActiveStatModel,
AgentWithdrawalModel: agentWithdrawalModel,
AgentWalletTransactionModel: agentWalletTransactionModel,
AsynqService: asynqService,
}
}
@@ -142,6 +145,11 @@ func (l *AgentService) AgentProcess(ctx context.Context, order *model.Order) err
if findAgentWalletModelErr != nil {
return findAgentWalletModelErr
}
// 记录变动前的余额
balanceBefore := ancestorWallet.Balance
frozenBalanceBefore := ancestorWallet.FrozenBalance
// 奖励不冻结，直接进入balance
ancestorWallet.Balance += ancestorCommissionReward
@@ -165,7 +173,7 @@ func (l *AgentService) AgentProcess(ctx context.Context, order *model.Order) err
ProductId: order.ProductId,
Status: commissionStatus,
}
_, insertAncestorCommissionErr := l.AgentCommissionModel.Insert(transCtx, session, &ancestorCommissionRecord)
insertResult, insertAncestorCommissionErr := l.AgentCommissionModel.Insert(transCtx, session, &ancestorCommissionRecord)
if insertAncestorCommissionErr != nil {
return insertAncestorCommissionErr
}
@@ -175,6 +183,32 @@ func (l *AgentService) AgentProcess(ctx context.Context, order *model.Order) err
if updateErr != nil {
return updateErr
}
// 获取新插入的佣金记录ID
commissionID, err := insertResult.LastInsertId()
if err != nil {
return err
}
commissionIDStr := fmt.Sprintf("%d", commissionID) // 转换为字符串
// 记录交易流水（佣金收入）
transErr := l.CreateWalletTransaction(
transCtx,
session,
AncestorId,
model.WalletTransactionTypeCommission,
ancestorCommissionAmount, // 变动金额（正数表示增加）
balanceBefore, // 变动前余额
ancestorWallet.Balance, // 变动后余额
frozenBalanceBefore, // 变动前冻结余额
ancestorWallet.FrozenBalance, // 变动后冻结余额
order.OrderNo, // 关联交易ID（订单号）
commissionID, // 关联佣金记录ID
fmt.Sprintf("订单佣金收入，佣金记录ID: %s", commissionIDStr), // 备注（包含佣金记录ID）
)
if transErr != nil {
return transErr
}
}
}
@@ -236,6 +270,10 @@ func (l *AgentService) AgentCommission(ctx context.Context, agentID int64, order
// 推广人最终获得代理佣金
finalCommission := order.Amount - deductedAmount
// 记录变动前的余额
balanceBefore := agentWalletModel.Balance
frozenBalanceBefore := agentWalletModel.FrozenBalance
// 根据安全防御模式配置决定佣金状态和钱包操作
if l.config.SystemConfig.CommissionSafeMode {
// 安全防御模式：佣金冻结在frozen_balance中
@@ -271,10 +309,31 @@ func (l *AgentService) AgentCommission(ctx context.Context, agentID int64, order
}
_ = commissionID // 暂时忽略该变量，因为我们使用其他方式获取佣金记录
// 更新钱包
updateAgentWalletErr := l.AgentWalletModel.UpdateWithVersion(ctx, session, agentWalletModel)
if updateAgentWalletErr != nil {
return updateAgentWalletErr
}
// 记录交易流水（佣金收入）
transErr := l.CreateWalletTransaction(
ctx,
session,
agentID,
model.WalletTransactionTypeCommission,
finalCommission, // 变动金额（正数表示增加）
balanceBefore, // 变动前余额
agentWalletModel.Balance, // 变动后余额
frozenBalanceBefore, // 变动前冻结余额
agentWalletModel.FrozenBalance, // 变动后冻结余额
order.OrderNo, // 关联交易ID（订单号）
0, // 关联用户ID
"订单佣金收入", // 备注
)
if transErr != nil {
return transErr
}
return nil
}
@@ -519,7 +578,7 @@ func (l *AgentService) GiveUpgradeReward(ctx context.Context, agentID int64, old
Type: rewardType,
}
_, err = l.AgentRewardsModel.Insert(ctx, session, &agentRewards)
insertResult, err := l.AgentRewardsModel.Insert(ctx, session, &agentRewards)
if err != nil {
return err
}
@@ -530,12 +589,42 @@ func (l *AgentService) GiveUpgradeReward(ctx context.Context, agentID int64, old
return err
}
// 记录变动前的余额
balanceBefore := ancestorWallet.Balance
frozenBalanceBefore := ancestorWallet.FrozenBalance
ancestorWallet.Balance += rewardAmount
ancestorWallet.TotalEarnings += rewardAmount
err = l.AgentWalletModel.UpdateWithVersion(ctx, session, ancestorWallet)
if err != nil {
return err
}
// 获取新插入的奖励记录ID
rewardID, err := insertResult.LastInsertId()
if err != nil {
return err
}
rewardIDStr := fmt.Sprintf("%d", rewardID) // 转换为字符串
// 记录交易流水（奖励收入）
transErr := l.CreateWalletTransaction(
ctx,
session,
ancestorID,
model.WalletTransactionTypeReward,
rewardAmount, // 变动金额（正数表示增加）
balanceBefore, // 变动前余额
ancestorWallet.Balance, // 变动后余额
frozenBalanceBefore, // 变动前冻结余额
ancestorWallet.FrozenBalance, // 变动后冻结余额
rewardIDStr, // 关联交易ID（奖励记录ID）
agentID, // 关联用户ID（下级代理ID）
"下级升级奖励", // 备注
)
if transErr != nil {
return transErr
}
}
return nil
@@ -599,7 +688,7 @@ func (l *AgentService) GiveWithdrawReward(ctx context.Context, agentID int64, wi
Type: model.AgentRewardsTypeDescendantWithdraw,
}
_, err = l.AgentRewardsModel.Insert(ctx, session, &agentRewards)
insertResult, err := l.AgentRewardsModel.Insert(ctx, session, &agentRewards)
if err != nil {
return err
}
@@ -610,12 +699,42 @@ func (l *AgentService) GiveWithdrawReward(ctx context.Context, agentID int64, wi
return err
}
// 记录变动前的余额
balanceBefore := ancestorWallet.Balance
frozenBalanceBefore := ancestorWallet.FrozenBalance
ancestorWallet.Balance += rewardAmount
ancestorWallet.TotalEarnings += rewardAmount
err = l.AgentWalletModel.UpdateWithVersion(ctx, session, ancestorWallet)
if err != nil {
return err
}
// 获取新插入的奖励记录ID
rewardID, err := insertResult.LastInsertId()
if err != nil {
return err
}
rewardIDStr := fmt.Sprintf("%d", rewardID) // 转换为字符串
// 记录交易流水（奖励收入）
transErr := l.CreateWalletTransaction(
ctx,
session,
ancestorID,
model.WalletTransactionTypeReward,
rewardAmount, // 变动金额（正数表示增加）
balanceBefore, // 变动前余额
ancestorWallet.Balance, // 变动后余额
frozenBalanceBefore, // 变动前冻结余额
ancestorWallet.FrozenBalance, // 变动后冻结余额
rewardIDStr, // 关联交易ID（奖励记录ID）
agentID, // 关联用户ID（下级代理ID）
"下级提现奖励", // 备注
)
if transErr != nil {
return transErr
}
}
}
@@ -675,3 +794,57 @@ func (l *AgentService) RetryAgentProcess(ctx context.Context, orderID int64) err
// 执行代理处理
return l.AgentProcess(ctx, order)
}
// CreateWalletTransaction 创建代理钱包流水记录
// ctx: 上下文
// session: 数据库会话（事务）
// agentID: 代理ID
// transactionType: 交易类型 (commission/withdraw/freeze/unfreeze/reward/refund/adjust)
// amount: 变动金额（正数为增加，负数为减少）
// balanceBefore: 变动前余额
// balanceAfter: 变动后余额
// frozenBalanceBefore: 变动前冻结余额
// frozenBalanceAfter: 变动后冻结余额
// transactionID: 关联交易ID（订单号、提现申请号等）
// relatedUserID: 关联用户ID（如佣金来源用户）
// remark: 备注说明
func (l *AgentService) CreateWalletTransaction(ctx context.Context, session sqlx.Session,
agentID int64, transactionType string, amount float64,
balanceBefore, balanceAfter, frozenBalanceBefore, frozenBalanceAfter float64,
transactionID string, relatedUserID int64, remark string) error {
// 处理可空字段
var transactionIDField sql.NullString
if transactionID != "" {
transactionIDField = sql.NullString{String: transactionID, Valid: true}
}
var relatedUserIDField sql.NullInt64
if relatedUserID > 0 {
relatedUserIDField = sql.NullInt64{Int64: relatedUserID, Valid: true}
}
var remarkField sql.NullString
if remark != "" {
remarkField = sql.NullString{String: remark, Valid: true}
}
transaction := &model.AgentWalletTransaction{
AgentId: agentID,
TransactionType: transactionType,
Amount: amount,
BalanceBefore: balanceBefore,
BalanceAfter: balanceAfter,
FrozenBalanceBefore: frozenBalanceBefore,
FrozenBalanceAfter: frozenBalanceAfter,
TransactionId: transactionIDField,
RelatedUserId: relatedUserIDField,
Remark: remarkField,
}
_, err := l.AgentWalletTransactionModel.Insert(ctx, session, transaction)
if err != nil {
return errors.Wrapf(err, "创建代理钱包流水记录失败，agentID: %d, type: %s, amount: %.2f", agentID, transactionType, amount)
}
return nil
}

18
app/main/api/internal/service/authorizationService_test.go
View File

@@ -254,7 +254,7 @@ func TestGenerateAuthorizationDocument(t *testing.T) {
assert.False(t, authDoc.ExpireTime.Valid) // 永久保留，不设置过期时间
// 验证文件路径格式（兼容Windows和Unix路径分隔符）
assert.True(t, strings.Contains(authDoc.FilePath, "data/authorization_docs") ||
assert.True(t, strings.Contains(authDoc.FilePath, "data/authorization_docs") ||
strings.Contains(authDoc.FilePath, "data\\authorization_docs"))
assert.Contains(t, authDoc.FileName, "auth_")
assert.Contains(t, authDoc.FileName, ".pdf")
@@ -372,7 +372,7 @@ func TestGeneratePDFContent(t *testing.T) {
t.Logf("📁 文件路径: %s", filePath)
t.Logf("🔗 相对路径: %s", relativePath)
t.Logf("📊 文件大小: %d 字节", len(pdfBytes))
// 获取绝对路径
absPath, _ := filepath.Abs(filePath)
t.Logf("📍 绝对路径: %s", absPath)
@@ -430,16 +430,16 @@ func TestSavePDFToLocal(t *testing.T) {
t.Logf("📁 文件路径: %s", filePath)
t.Logf("🔗 相对路径: %s", relativePath)
t.Logf("📊 文件大小: %d 字节", len(pdfBytes))
// 获取绝对路径
absPath, _ := filepath.Abs(filePath)
t.Logf("📍 绝对路径: %s", absPath)
// 验证文件内容
fileInfo, err := os.Stat(filePath)
assert.NoError(t, err)
assert.Greater(t, fileInfo.Size(), int64(1000)) // 文件应该大于1KB
t.Logf("🎉 文件保存验证通过！")
} else {
t.Errorf("❌ PDF文件保存失败: %v", err)
@@ -648,18 +648,18 @@ func TestGeneratePDFFile(t *testing.T) {
t.Logf("📁 文件路径: %s", authDoc.FilePath)
t.Logf("🔗 相对路径: %s", authDoc.FileUrl)
t.Logf("📊 文件大小: %d 字节", authDoc.FileSize)
// 验证文件内容
fileInfo, err := os.Stat(authDoc.FilePath)
assert.NoError(t, err)
assert.Greater(t, fileInfo.Size(), int64(1000)) // 文件应该大于1KB
// 验证文件名格式
assert.Regexp(t, `^auth_999_888_\d{8}_\d{6}\.pdf$`, authDoc.FileName)
// 验证路径格式
assert.Regexp(t, `^\d{4}/\d{2}/auth_999_888_\d{8}_\d{6}\.pdf$`, authDoc.FileUrl)
t.Logf("🎉 所有验证通过！")
} else {
t.Errorf("❌ PDF文件未创建: %s", authDoc.FilePath)

5
app/main/api/internal/svc/servicecontext.go
View File

@@ -63,6 +63,7 @@ type ServiceContext struct {
AgentRealNameModel model.AgentRealNameModel
AgentWithdrawalTaxModel model.AgentWithdrawalTaxModel
AgentWithdrawalTaxExemptionModel model.AgentWithdrawalTaxExemptionModel
AgentWalletTransactionModel model.AgentWalletTransactionModel
// 管理后台相关模型
AdminApiModel model.AdminApiModel
@@ -152,6 +153,7 @@ func NewServiceContext(c config.Config) *ServiceContext {
agentRealNameModel := model.NewAgentRealNameModel(db, cacheConf)
agentWithdrawalTaxModel := model.NewAgentWithdrawalTaxModel(db, cacheConf)
agentWithdrawalTaxExemptionModel := model.NewAgentWithdrawalTaxExemptionModel(db, cacheConf)
agentWalletTransactionModel := model.NewAgentWalletTransactionModel(db, cacheConf)
// ============================== 管理后台相关模型 ==============================
adminApiModel := model.NewAdminApiModel(db, cacheConf)
adminMenuModel := model.NewAdminMenuModel(db, cacheConf)
@@ -194,7 +196,7 @@ func NewServiceContext(c config.Config) *ServiceContext {
agentCommissionModel, agentCommissionDeductionModel, agentWalletModel, agentLinkModel,
agentOrderModel, agentRewardsModel, agentMembershipConfigModel, agentMembershipRechargeOrderModel,
agentMembershipUserConfigModel, agentProductConfigModel, agentPlatformDeductionModel,
agentActiveStatModel, agentWithdrawalModel, asynqService)
agentActiveStatModel, agentWithdrawalModel, agentWalletTransactionModel, asynqService)
userService := service.NewUserService(&c, userModel, userAuthModel, userTempModel, agentModel)
dictService := service.NewDictService(adminDictTypeModel, adminDictDataModel)
adminPromotionLinkStatsService := service.NewAdminPromotionLinkStatsService(adminPromotionLinkModel,
@@ -261,6 +263,7 @@ func NewServiceContext(c config.Config) *ServiceContext {
AgentRealNameModel: agentRealNameModel,
AgentWithdrawalTaxModel: agentWithdrawalTaxModel,
AgentWithdrawalTaxExemptionModel: agentWithdrawalTaxExemptionModel,
AgentWalletTransactionModel: agentWalletTransactionModel,
// 管理后台相关模型
AdminApiModel: adminApiModel,

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

@@ -363,6 +363,20 @@ type AdminGetAgentWalletResp struct {
TotalEarnings float64 `json:"total_earnings"` // 总收益
}
type AdminGetAgentWalletTransactionListReq struct {
Page int64 `form:"page"` // 页码
PageSize int64 `form:"pageSize"` // 每页数量
AgentId int64 `form:"agent_id"` // 代理ID
TransactionType *string `form:"transaction_type,optional"` // 交易类型（可选）
CreateTimeStart *string `form:"create_time_start,optional"` // 创建时间开始（可选）
CreateTimeEnd *string `form:"create_time_end,optional"` // 创建时间结束（可选）
}
type AdminGetAgentWalletTransactionListResp struct {
Total int64 `json:"total"` // 总数
Items []AgentWalletTransactionListItem `json:"items"` // 列表数据
}
type AdminGetAgentWithdrawalListReq struct {
Page int64 `form:"page"` // 页码
PageSize int64 `form:"pageSize"` // 每页数量
@@ -1261,6 +1275,21 @@ type AgentSubordinateList struct {
TotalContribution float64 `json:"total_contribution"` // 总贡献
}
type AgentWalletTransactionListItem struct {
Id int64 `json:"id"` // 主键
AgentId int64 `json:"agent_id"` // 代理ID
TransactionType string `json:"transaction_type"` // 交易类型
Amount float64 `json:"amount"` // 变动金额
BalanceBefore float64 `json:"balance_before"` // 变动前余额
BalanceAfter float64 `json:"balance_after"` // 变动后余额
FrozenBalanceBefore float64 `json:"frozen_balance_before"` // 变动前冻结余额
FrozenBalanceAfter float64 `json:"frozen_balance_after"` // 变动后冻结余额
TransactionId *string `json:"transaction_id"` // 关联交易ID
RelatedUserId *int64 `json:"related_user_id"` // 关联用户ID
Remark *string `json:"remark"` // 备注说明
CreateTime string `json:"create_time"` // 创建时间
}
type AgentWithdrawalListItem struct {
Id int64 `json:"id"` // 主键
AgentId int64 `json:"agent_id"` // 代理ID