fix and add

This commit is contained in:
2026-01-03 17:53:19 +08:00
parent 0211c67f86
commit 21b4069465
15 changed files with 277 additions and 24 deletions

View File

@@ -58,13 +58,15 @@ func (l *GetAgentCommissionLogic) GetAgentCommission(req *types.GetCommissionReq
if copyErr != nil {
return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "获取代理佣金列表, %v", err)
}
// 显式设置 status 字段
commission.Status = agentCommissionModel.Status
product, findProductErr := l.svcCtx.ProductModel.FindOne(l.ctx, agentCommissionModel.ProductId)
if findProductErr != nil {
return nil, errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "获取代理佣金列表, %v", err)
}
commission.CreateTime = agentCommissionModel.CreateTime.Format("2006-01-02 15:04:05")
commission.ProductName = product.ProductName
// 从 order 表获取 platform_order_id
orderModel, findOrderErr := l.svcCtx.OrderModel.FindOne(l.ctx, agentCommissionModel.OrderId)
if findOrderErr == nil && orderModel != nil && orderModel.PlatformOrderId.Valid {

View File

@@ -2,10 +2,10 @@ package agent
import (
"context"
"time"
"tydata-server/app/main/model"
"tydata-server/common/ctxdata"
"tydata-server/common/xerr"
"time"
"github.com/Masterminds/squirrel"
"github.com/pkg/errors"
@@ -126,6 +126,11 @@ func calculateDirectPushReport(commissions []*model.AgentCommission, loc *time.L
// 转换时区
createTime := c.CreateTime
// 只统计非退款的佣金status != 2
if c.Status == 2 {
continue
}
// 统计总量
report.TotalCommission += c.Amount
report.TotalReport++