v1.0

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

@@ -61,7 +61,7 @@ func (l *GetCommissionListLogic) GetCommissionList(req *types.GetCommissionListR
 	offset := (page - 1) * pageSize
 
 	// 4. 查询总数
-	total, err := l.svcCtx.AgentCommissionModel.FindCount(l.ctx, builder, "")
+	total, err := l.svcCtx.AgentCommissionModel.FindCount(l.ctx, builder, "id")
 	if err != nil {
 		return nil, errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "查询佣金总数失败, %v", err)
 	}
@@ -85,9 +85,19 @@ func (l *GetCommissionListLogic) GetCommissionList(req *types.GetCommissionListR
 			}
 		}
 
+		// 查询订单号
+		orderNo := ""
+		if commission.OrderId > 0 {
+			order, err := l.svcCtx.OrderModel.FindOne(l.ctx, commission.OrderId)
+			if err == nil {
+				orderNo = order.OrderNo
+			}
+		}
+
 		list = append(list, types.CommissionItem{
 			Id:          commission.Id,
 			OrderId:     commission.OrderId,
+			OrderNo:     orderNo,
 			ProductName: productName,
 			Amount:      commission.Amount,
 			Status:      commission.Status,