diff --git a/internal/v2/controller/app/user/Income.go b/internal/v2/controller/app/user/Income.go index e4bab9c..da9e6d4 100644 --- a/internal/v2/controller/app/user/Income.go +++ b/internal/v2/controller/app/user/Income.go @@ -72,8 +72,13 @@ func (i *Income) Profit(c *gin.Context) { } func (i *Income) Team(c *gin.Context) { + args := keyword{} + if err := tools.ParseParams(&args, c); err != nil { + back.Fail(c, err.Error()) + return + } userId, _ := common.GetAppUserId(c) - res := user.IncomeLogic.Team(userId) + res := user.IncomeLogic.Team(userId, args.Keyword) back.Suc(c, "获取成功", res) } diff --git a/internal/v2/logic/app/user/income.go b/internal/v2/logic/app/user/income.go index 5991a95..1a9f10e 100644 --- a/internal/v2/logic/app/user/income.go +++ b/internal/v2/logic/app/user/income.go @@ -59,7 +59,7 @@ type Person struct { Amount decimal.Decimal } -func (i *incomeLogic) Team(userID uint) (data []Person) { +func (i *incomeLogic) Team(userID uint, key string) (data []Person) { if userID == 0 { return } @@ -69,7 +69,13 @@ func (i *incomeLogic) Team(userID uint) (data []Person) { return } var u1 []user.RecookUserInfoModel - mysql.Db.Preload("OrderList", "status = 4").Where("parent_id = ?", userID).Find(&u1) + query := mysql.Db.Where("parent_id = ?", userID) + { + if key != "" { + query = query.Where("mobile = ?", key) + } + } + query.Preload("OrderList", "status = 4").Find(&u1) for _, v := range u1 { amount := decimal.Zero for _, j := range v.OrderList {