diff --git a/app/main/api/internal/logic/agent/getpromotionquerylistlogic.go b/app/main/api/internal/logic/agent/getpromotionquerylistlogic.go index b2347b0..ac801c7 100644 --- a/app/main/api/internal/logic/agent/getpromotionquerylistlogic.go +++ b/app/main/api/internal/logic/agent/getpromotionquerylistlogic.go @@ -6,7 +6,6 @@ import ( "encoding/json" "jnc-server/app/main/model" "jnc-server/common/ctxdata" - "jnc-server/common/globalkey" "jnc-server/common/xerr" "jnc-server/pkg/lzkit/crypto" @@ -48,7 +47,7 @@ func (l *GetPromotionQueryListLogic) GetPromotionQueryList(req *types.GetPromoti // 查询当前代理的代理订单,按创建时间倒序分页 builder := l.svcCtx.AgentOrderModel.SelectBuilder(). - Where("agent_id = ? AND del_state = ?", agent.Id, globalkey.DelStateNo) + Where("agent_id = ? AND process_status = 1", agent.Id) orders, _, err := l.svcCtx.AgentOrderModel.FindPageListByPageWithTotal(l.ctx, builder, req.Page, req.PageSize, "create_time DESC") if err != nil { @@ -92,7 +91,7 @@ func (l *GetPromotionQueryListLogic) GetPromotionQueryList(req *types.GetPromoti item.OrderNo = order.OrderNo item.ProductName = product.ProductName item.OrderAmount = order.Amount // 订单金额 - item.Amount = ao.AgentProfit // 推广收益 + item.Amount = ao.AgentProfit // 推广收益 item.CreateTime = q.CreateTime.Format("2006-01-02 15:04:05") item.QueryState = q.QueryState