v1.0

app/main/api/internal/logic/agent/getrebatelistlogic.go

@@ -6,6 +6,7 @@ import (
 	"ycc-server/common/ctxdata"
 	"ycc-server/common/globalkey"
 	"ycc-server/common/xerr"
+	"ycc-server/pkg/lzkit/crypto"
 
 	"github.com/pkg/errors"
 
@@ -46,8 +47,14 @@ func (l *GetRebateListLogic) GetRebateList(req *types.GetRebateListReq) (resp *t
 
 	// 2. 构建查询条件
 	builder := l.svcCtx.AgentRebateModel.SelectBuilder().
-		Where("agent_id = ? AND del_state = ?", agent.Id, globalkey.DelStateNo).
-		OrderBy("create_time DESC")
+		Where("agent_id = ? AND del_state = ?", agent.Id, globalkey.DelStateNo)
+
+	// 如果指定了返佣类型，则按类型筛选（1, 2, 3）
+	if req.RebateType != nil {
+		builder = builder.Where("rebate_type = ?", *req.RebateType)
+	}
+
+	builder = builder.OrderBy("create_time DESC")
 
 	// 3. 分页查询
 	page := req.Page
@@ -61,7 +68,7 @@ func (l *GetRebateListLogic) GetRebateList(req *types.GetRebateListReq) (resp *t
 	offset := (page - 1) * pageSize
 
 	// 4. 查询总数
-	total, err := l.svcCtx.AgentRebateModel.FindCount(l.ctx, builder, "")
+	total, err := l.svcCtx.AgentRebateModel.FindCount(l.ctx, builder, "id")
 	if err != nil {
 		return nil, errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "查询返佣总数失败, %v", err)
 	}
@@ -76,13 +83,41 @@ func (l *GetRebateListLogic) GetRebateList(req *types.GetRebateListReq) (resp *t
 	// 6. 组装响应
 	var list []types.RebateItem
 	for _, rebate := range rebates {
+		// 查询订单号
+		orderNo := ""
+		if rebate.OrderId > 0 {
+			order, err := l.svcCtx.OrderModel.FindOne(l.ctx, rebate.OrderId)
+			if err == nil {
+				orderNo = order.OrderNo
+			}
+		}
+
+		// 查询来源代理手机号和等级
+		sourceAgentMobile := ""
+		sourceAgentLevel := int64(0)
+		if rebate.SourceAgentId > 0 {
+			sourceAgent, err := l.svcCtx.AgentModel.FindOne(l.ctx, rebate.SourceAgentId)
+			if err == nil {
+				if sourceAgent.Mobile != "" {
+					decrypted, err := crypto.DecryptMobile(sourceAgent.Mobile, l.svcCtx.Config.Encrypt.SecretKey)
+					if err == nil {
+						sourceAgentMobile = decrypted
+					}
+				}
+				sourceAgentLevel = sourceAgent.Level
+			}
+		}
+
 		list = append(list, types.RebateItem{
-			Id:           rebate.Id,
-			SourceAgentId: rebate.SourceAgentId,
-			OrderId:      rebate.OrderId,
-			RebateType:   rebate.RebateType,
-			Amount:       rebate.RebateAmount,
-			CreateTime:   rebate.CreateTime.Format("2006-01-02 15:04:05"),
+			Id:                rebate.Id,
+			SourceAgentId:     rebate.SourceAgentId,
+			SourceAgentMobile: sourceAgentMobile,
+			SourceAgentLevel:  sourceAgentLevel,
+			OrderId:           rebate.OrderId,
+			OrderNo:           orderNo,
+			RebateType:        rebate.RebateType,
+			Amount:            rebate.RebateAmount,
+			CreateTime:        rebate.CreateTime.Format("2006-01-02 15:04:05"),
 		})
 	}