diff --git a/app/main/api/desc/front/agent.api b/app/main/api/desc/front/agent.api index 4560a48..4944b6d 100644 --- a/app/main/api/desc/front/agent.api +++ b/app/main/api/desc/front/agent.api @@ -326,9 +326,10 @@ type ( SubWithdrawReward float64 `json:"sub_withdraw_reward"` } Commission { - ProductName string `json:"product_name"` - Amount float64 `json:"amount"` - CreateTime string `json:"create_time"` + OrderId string `json:"order_id"` // 订单号 + ProductName string `json:"product_name"` + Amount float64 `json:"amount"` + CreateTime string `json:"create_time"` QueryParams map[string]interface{} `json:"query_params,omitempty"` } GetCommissionReq { diff --git a/app/main/api/internal/logic/agent/getagentcommissionlogic.go b/app/main/api/internal/logic/agent/getagentcommissionlogic.go index aa51456..48bc8f6 100644 --- a/app/main/api/internal/logic/agent/getagentcommissionlogic.go +++ b/app/main/api/internal/logic/agent/getagentcommissionlogic.go @@ -64,6 +64,14 @@ func (l *GetAgentCommissionLogic) GetAgentCommission(req *types.GetCommissionReq } 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 { + commission.OrderId = orderModel.PlatformOrderId.String + } else { + commission.OrderId = "" + } queryModel, queryErr := l.svcCtx.QueryModel.FindOneByOrderId(l.ctx, agentCommissionModel.OrderId) if queryErr == nil && queryModel != nil { diff --git a/app/main/api/internal/types/types.go b/app/main/api/internal/types/types.go index b449a5a..e6416b9 100644 --- a/app/main/api/internal/types/types.go +++ b/app/main/api/internal/types/types.go @@ -1178,6 +1178,7 @@ type BindMobileResp struct { } type Commission struct { + OrderId string `json:"order_id"` // 订单号 ProductName string `json:"product_name"` Amount float64 `json:"amount"` CreateTime string `json:"create_time"`