新增指定用户查询接口 & 接口权限细分

web/handlers/admin.go

@@ -20,7 +20,7 @@ func PageAdminByAdmin(c *fiber.Ctx) error {
 		return err
 	}
 
-	list, total, err := s.Admin.PageAdmins(req.PageReq)
+	list, total, err := s.Admin.Page(req.PageReq)
 	if err != nil {
 		return err
 	}
@@ -62,7 +62,7 @@ func CreateAdmin(c *fiber.Ctx) error {
 		return err
 	}
 
-	if err := s.Admin.CreateAdmin(&req); err != nil {
+	if err := s.Admin.Create(&req); err != nil {
 		return err
 	}
 
@@ -80,7 +80,7 @@ func UpdateAdmin(c *fiber.Ctx) error {
 		return err
 	}
 
-	if err := s.Admin.UpdateAdmin(&req); err != nil {
+	if err := s.Admin.Update(&req); err != nil {
 		return err
 	}
 
@@ -98,7 +98,7 @@ func RemoveAdmin(c *fiber.Ctx) error {
 		return err
 	}
 
-	if err := s.Admin.RemoveAdmin(req.Id); err != nil {
+	if err := s.Admin.Remove(req.Id); err != nil {
 		return err
 	}
 

web/handlers/batch.go

@@ -128,3 +128,75 @@ type PageBatchByAdminReq struct {
 	CreatedAtStart *time.Time `json:"created_at_start"`
 	CreatedAtEnd   *time.Time `json:"created_at_end"`
 }
+
+// PageBatchOfUserByAdmin 分页查询指定用户的提取记录
+func PageBatchOfUserByAdmin(ctx *fiber.Ctx) error {
+	_, err := auth.GetAuthCtx(ctx).PermitAdmin(core.ScopeBatchReadOfUser)
+	if err != nil {
+		return err
+	}
+
+	var req PageBatchOfUserByAdminReq
+	if err = g.Validator.ParseBody(ctx, &req); err != nil {
+		return err
+	}
+
+	do := q.LogsUserUsage.Where(q.LogsUserUsage.UserID.Eq(req.UserID))
+	if req.ResourceNo != nil {
+		do = do.Where(q.Resource.ResourceNo.Eq(*req.ResourceNo))
+	}
+	if req.BatchNo != nil {
+		do = do.Where(q.LogsUserUsage.BatchNo.Eq(*req.BatchNo))
+	}
+	if req.Prov != nil {
+		do = do.Where(q.LogsUserUsage.Prov.Eq(*req.Prov))
+	}
+	if req.City != nil {
+		do = do.Where(q.LogsUserUsage.City.Eq(*req.City))
+	}
+	if req.Isp != nil {
+		do = do.Where(q.LogsUserUsage.ISP.Eq(*req.Isp))
+	}
+	if req.CreatedAtStart != nil {
+		t := u.DateHead(*req.CreatedAtStart)
+		do = do.Where(q.LogsUserUsage.Time.Gte(t))
+	}
+	if req.CreatedAtEnd != nil {
+		t := u.DateTail(*req.CreatedAtEnd)
+		do = do.Where(q.LogsUserUsage.Time.Lte(t))
+	}
+
+	list, total, err := q.LogsUserUsage.
+		Joins(q.LogsUserUsage.User, q.LogsUserUsage.Resource).
+		Select(
+			q.LogsUserUsage.ALL,
+			q.User.As("User").Phone.As("User__phone"),
+			q.User.As("User").Name.As("User__name"),
+			q.Resource.As("Resource").ResourceNo.As("Resource__resource_no"),
+		).
+		Where(do).
+		Order(q.LogsUserUsage.Time.Desc()).
+		FindByPage(req.GetOffset(), req.GetLimit())
+	if err != nil {
+		return ctx.JSON(core.NewBizErr("获取数据失败", err))
+	}
+
+	return ctx.JSON(c.PageResp{
+		List:  list,
+		Total: int(total),
+		Page:  req.GetPage(),
+		Size:  req.GetSize(),
+	})
+}
+
+type PageBatchOfUserByAdminReq struct {
+	c.PageReq
+	UserID         int32      `json:"user_id" validate:"required"`
+	ResourceNo     *string    `json:"resource_no"`
+	BatchNo        *string    `json:"batch_no"`
+	Prov           *string    `json:"prov"`
+	City           *string    `json:"city"`
+	Isp            *string    `json:"isp"`
+	CreatedAtStart *time.Time `json:"created_at_start"`
+	CreatedAtEnd   *time.Time `json:"created_at_end"`
+}

web/handlers/bill.go

@@ -101,6 +101,80 @@ type PageBillByAdminReq struct {
 	SkuCode        *string    `json:"sku_code,omitempty"`
 }
 
+// PageBillOfUserByAdmin 分页查询指定用户账单
+func PageBillOfUserByAdmin(c *fiber.Ctx) error {
+	// 检查权限
+	_, err := auth.GetAuthCtx(c).PermitAdmin(core.ScopeBillReadOfUser)
+	if err != nil {
+		return err
+	}
+
+	// 解析请求参数
+	req := new(PageBillOfUserByAdminReq)
+	if err := g.Validator.ParseBody(c, req); err != nil {
+		return err
+	}
+
+	// 构造查询条件
+	do := q.Bill.Where(q.Bill.UserID.Eq(req.UserID))
+	if req.TradeInnerNo != nil {
+		do = do.Where(q.Trade.As("Trade").InnerNo.Eq(*req.TradeInnerNo))
+	}
+	if req.ResourceNo != nil {
+		do = do.Where(q.Resource.As("Resource").ResourceNo.Eq(*req.ResourceNo))
+	}
+	if req.BillNo != nil {
+		do = do.Where(q.Bill.BillNo.Eq(*req.BillNo))
+	}
+	if req.CreatedAtStart != nil {
+		time := u.DateHead(*req.CreatedAtStart)
+		do = do.Where(q.Bill.CreatedAt.Gte(time))
+	}
+	if req.CreatedAtEnd != nil {
+		time := u.DateHead(*req.CreatedAtEnd)
+		do = do.Where(q.Bill.CreatedAt.Lte(time))
+	}
+
+	// 查询账单列表
+	list, total, err := q.Bill.
+		Joins(
+			q.Bill.Resource,
+			q.Bill.Trade,
+			q.Bill.Resource.Short,
+			q.Bill.Resource.Long,
+		).
+		Select(
+			q.Bill.ALL,
+			q.Trade.As("Trade").InnerNo.As("Trade__inner_no"),
+			q.Trade.As("Trade").Acquirer.As("Trade__acquirer"),
+			q.Resource.As("Resource").ResourceNo.As("Resource__resource_no"),
+		).
+		Where(do).
+		Order(q.Bill.CreatedAt.Desc()).
+		FindByPage(req.GetOffset(), req.GetLimit())
+	if err != nil {
+		return err
+	}
+
+	// 返回结果
+	return c.JSON(core.PageResp{
+		List:  list,
+		Total: int(total),
+		Page:  req.GetPage(),
+		Size:  req.GetSize(),
+	})
+}
+
+type PageBillOfUserByAdminReq struct {
+	core.PageReq
+	UserID         int32      `json:"user_id" validate:"required"`
+	TradeInnerNo   *string    `json:"trade_inner_no,omitempty"`
+	ResourceNo     *string    `json:"resource_no,omitempty"`
+	BillNo         *string    `json:"bill_no,omitempty"`
+	CreatedAtStart *time.Time `json:"created_at_start,omitempty"`
+	CreatedAtEnd   *time.Time `json:"created_at_end,omitempty"`
+}
+
 // ListBill 获取账单列表
 func ListBill(c *fiber.Ctx) error {
 	// 检查权限

web/handlers/channel.go

@@ -271,3 +271,76 @@ func RemoveChannels(c *fiber.Ctx) error {
 type RemoveChannelsReq struct {
 	Batch string `json:"batch" validate:"required"`
 }
+
+// PageChannelOfUserByAdmin 分页查询指定用户的通道
+func PageChannelOfUserByAdmin(c *fiber.Ctx) error {
+	// 检查权限
+	_, err := auth.GetAuthCtx(c).PermitAdmin(core.ScopeChannelReadOfUser)
+	if err != nil {
+		return err
+	}
+
+	// 解析请求参数
+	var req PageChannelOfUserByAdminReq
+	if err := g.Validator.ParseBody(c, &req); err != nil {
+		return err
+	}
+
+	// 构建查询条件
+	do := q.Channel.Where(q.Channel.UserID.Eq(req.UserID))
+	if req.ResourceNo != nil {
+		do = do.Where(q.Resource.As("Resource").ResourceNo.Eq(*req.ResourceNo))
+	}
+	if req.BatchNo != nil {
+		do = do.Where(q.Channel.BatchNo.Eq(*req.BatchNo))
+	}
+	if req.ProxyHost != nil {
+		do = do.Where(q.Channel.Host.Eq(*req.ProxyHost))
+	}
+	if req.ProxyPort != nil {
+		do = do.Where(q.Channel.Port.Eq(*req.ProxyPort))
+	}
+	if req.ExpiredAtStart != nil {
+		t := u.DateHead(*req.ExpiredAtStart)
+		do = do.Where(q.Channel.ExpiredAt.Gte(t))
+	}
+	if req.ExpiredAtEnd != nil {
+		t := u.DateHead(*req.ExpiredAtEnd)
+		do = do.Where(q.Channel.ExpiredAt.Lte(t))
+	}
+
+	// 查询通道列表
+	list, total, err := q.Channel.
+		Joins(q.Channel.User, q.Channel.Resource).
+		Select(
+			q.Channel.ALL,
+			q.Resource.As("Resource").ResourceNo.As("Resource__resource_no"),
+			q.User.As("User").Phone.As("User__phone"),
+			q.User.As("User").Name.As("User__name"),
+		).
+		Where(do).
+		Order(q.Channel.CreatedAt.Desc()).
+		FindByPage(req.GetOffset(), req.GetLimit())
+	if err != nil {
+		return err
+	}
+
+	// 返回结果
+	return c.JSON(core.PageResp{
+		List:  list,
+		Total: int(total),
+		Page:  req.GetPage(),
+		Size:  req.GetSize(),
+	})
+}
+
+type PageChannelOfUserByAdminReq struct {
+	core.PageReq
+	UserID         int32      `json:"user_id" validate:"required"`
+	ResourceNo     *string    `json:"resource_no"`
+	BatchNo        *string    `json:"batch_no"`
+	ProxyHost      *string    `json:"proxy_host"`
+	ProxyPort      *uint16    `json:"proxy_port"`
+	ExpiredAtStart *time.Time `json:"expired_at_start"`
+	ExpiredAtEnd   *time.Time `json:"expired_at_end"`
+}

web/handlers/resource.go

@@ -393,6 +393,148 @@ type PageResourceLongByAdminReq struct {
 	Expired        *bool      `json:"expired" form:"expired"`
 }
 
+// PageResourceShortOfUserByAdmin 分页查询指定用户的短效套餐
+func PageResourceShortOfUserByAdmin(c *fiber.Ctx) error {
+	_, err := auth.GetAuthCtx(c).PermitAdmin(core.ScopeResourceReadShortOfUser)
+	if err != nil {
+		return err
+	}
+
+	var req PageResourceShortOfUserByAdminReq
+	if err = g.Validator.ParseBody(c, &req); err != nil {
+		return err
+	}
+
+	do := q.Resource.Where(q.Resource.UserID.Eq(req.UserID))
+	if req.ResourceNo != nil {
+		do = do.Where(q.Resource.ResourceNo.Eq(*req.ResourceNo))
+	}
+	if req.Active != nil {
+		do = do.Where(q.Resource.Active.Is(*req.Active))
+	}
+	if req.Mode != nil {
+		do = do.Where(q.ResourceShort.As("Short").Type.Eq(int(*req.Mode)))
+	}
+	if req.CreatedAtStart != nil {
+		t := u.DateHead(*req.CreatedAtStart)
+		do = do.Where(q.Resource.CreatedAt.Gte(t))
+	}
+	if req.CreatedAtEnd != nil {
+		t := u.DateTail(*req.CreatedAtEnd)
+		do = do.Where(q.Resource.CreatedAt.Lte(t))
+	}
+
+	list, total, err := q.Resource.
+		Joins(q.Resource.User, q.Resource.Short, q.Resource.Short.Sku).
+		Select(
+			q.Resource.ALL,
+			q.User.As("User").Phone.As("User__phone"),
+			q.User.As("User").Name.As("User__name"),
+			q.ResourceShort.As("Short").Type.As("Short__type"),
+			q.ResourceShort.As("Short").Live.As("Short__live"),
+			q.ResourceShort.As("Short").Quota.As("Short__quota"),
+			q.ResourceShort.As("Short").Used.As("Short__used"),
+			q.ResourceShort.As("Short").Daily.As("Short__daily"),
+			q.ResourceShort.As("Short").LastAt.As("Short__last_at"),
+			q.ResourceShort.As("Short").ExpireAt.As("Short__expire_at"),
+			q.ProductSku.As("Short__Sku").Name.As("Short__Sku__name"),
+		).
+		Where(q.Resource.Type.Eq(int(m.ResourceTypeShort)), do).
+		Order(q.Resource.CreatedAt.Desc()).
+		FindByPage(req.GetOffset(), req.GetLimit())
+	if err != nil {
+		return err
+	}
+
+	return c.JSON(core.PageResp{
+		List:  list,
+		Total: int(total),
+		Page:  req.GetPage(),
+		Size:  req.GetSize(),
+	})
+}
+
+type PageResourceShortOfUserByAdminReq struct {
+	core.PageReq
+	UserID         int32      `json:"user_id" validate:"required"`
+	ResourceNo     *string    `json:"resource_no"`
+	Active         *bool      `json:"active"`
+	Mode           *int       `json:"mode"`
+	CreatedAtStart *time.Time `json:"created_at_start"`
+	CreatedAtEnd   *time.Time `json:"created_at_end"`
+}
+
+// PageResourceLongOfUserByAdmin 分页查询指定用户的长效套餐
+func PageResourceLongOfUserByAdmin(c *fiber.Ctx) error {
+	_, err := auth.GetAuthCtx(c).PermitAdmin(core.ScopeResourceReadLongOfUser)
+	if err != nil {
+		return err
+	}
+
+	var req PageResourceLongOfUserByAdminReq
+	if err = g.Validator.ParseBody(c, &req); err != nil {
+		return err
+	}
+
+	do := q.Resource.Where(q.Resource.UserID.Eq(req.UserID))
+	if req.ResourceNo != nil {
+		do = do.Where(q.Resource.ResourceNo.Eq(*req.ResourceNo))
+	}
+	if req.Active != nil {
+		do = do.Where(q.Resource.Active.Is(*req.Active))
+	}
+	if req.Mode != nil {
+		do = do.Where(q.ResourceLong.As("Long").Type.Eq(*req.Mode))
+	}
+	if req.CreatedAtStart != nil {
+		t := u.DateHead(*req.CreatedAtStart)
+		do = do.Where(q.Resource.CreatedAt.Gte(t))
+	}
+	if req.CreatedAtEnd != nil {
+		t := u.DateTail(*req.CreatedAtEnd)
+		do = do.Where(q.Resource.CreatedAt.Lte(t))
+	}
+
+	list, total, err := q.Resource.
+		Joins(q.Resource.User, q.Resource.Long, q.Resource.Long.Sku).
+		Select(
+			q.Resource.ALL,
+			q.User.As("User").Phone.As("User__phone"),
+			q.User.As("User").Name.As("User__name"),
+			q.ResourceLong.As("Long").Type.As("Long__type"),
+			q.ResourceLong.As("Long").Live.As("Long__live"),
+			q.ResourceLong.As("Long").Quota.As("Long__quota"),
+			q.ResourceLong.As("Long").Used.As("Long__used"),
+			q.ResourceLong.As("Long").Daily.As("Long__daily"),
+			q.ResourceLong.As("Long").LastAt.As("Long__last_at"),
+			q.ResourceLong.As("Long").ExpireAt.As("Long__expire_at"),
+			q.ProductSku.As("Long__Sku").Name.As("Long__Sku__name"),
+		).
+		Where(q.Resource.Type.Eq(int(m.ResourceTypeLong)), do).
+		Order(q.Resource.CreatedAt.Desc()).
+		FindByPage(req.GetOffset(), req.GetLimit())
+	if err != nil {
+		return err
+	}
+
+	return c.JSON(core.PageResp{
+		List:  list,
+		Total: int(total),
+		Page:  req.GetPage(),
+		Size:  req.GetSize(),
+	})
+}
+
+type PageResourceLongOfUserByAdminReq struct {
+	core.PageReq
+	UserID         int32      `json:"user_id" validate:"required"`
+	ResourceNo     *string    `json:"resource_no"`
+	Active         *bool      `json:"active"`
+	Mode           *int       `json:"mode"`
+	CreatedAtStart *time.Time `json:"created_at_start"`
+	CreatedAtEnd   *time.Time `json:"created_at_end"`
+}
+
 // AllActiveResource 所有可用套餐
 func AllActiveResource(c *fiber.Ctx) error {
 	// 检查权限
@@ -449,9 +591,6 @@ func AllActiveResource(c *fiber.Ctx) error {
 	return c.JSON(resources)
 }
 
-type AllResourceReq struct {
-}
-
 func UpdateResourceByAdmin(c *fiber.Ctx) error {
 	_, err := auth.GetAuthCtx(c).PermitAdmin(core.ScopeResourceWrite)
 	if err != nil {

web/handlers/trade.go

@@ -97,6 +97,82 @@ type PageTradeByAdminReq struct {
 	CreatedAtEnd   *time.Time `json:"created_at_end,omitempty"`
 }
 
+// PageTradeOfUserByAdmin 分页查询指定用户的订单
+func PageTradeOfUserByAdmin(c *fiber.Ctx) error {
+	// 检查权限
+	_, err := auth.GetAuthCtx(c).PermitAdmin(core.ScopeTradeReadOfUser)
+	if err != nil {
+		return err
+	}
+
+	// 解析请求参数
+	req := new(PageTradeOfUserByAdminReq)
+	if err := g.Validator.ParseBody(c, req); err != nil {
+		return err
+	}
+
+	// 构建查询语句
+	do := q.Trade.Where(q.Trade.UserID.Eq(req.UserID))
+	if req.InnerNo != nil {
+		do = do.Where(q.Trade.InnerNo.Eq(*req.InnerNo))
+	}
+	if req.OuterNo != nil {
+		do = do.Where(q.Trade.OuterNo.Eq(*req.OuterNo))
+	}
+	if req.Method != nil {
+		do = do.Where(q.Trade.Method.Eq(*req.Method))
+	}
+	if req.Platform != nil {
+		do = do.Where(q.Trade.Platform.Eq(*req.Platform))
+	}
+	if req.Status != nil {
+		do = do.Where(q.Trade.Status.Eq(*req.Status))
+	}
+	if req.CreatedAtStart != nil {
+		time := u.DateHead(*req.CreatedAtStart)
+		do = do.Where(q.Trade.CreatedAt.Gte(time))
+	}
+	if req.CreatedAtEnd != nil {
+		time := u.DateTail(*req.CreatedAtEnd)
+		do = do.Where(q.Trade.CreatedAt.Lte(time))
+	}
+
+	// 查询订单列表
+	list, total, err := q.Trade.
+		Joins(q.Trade.User).
+		Select(
+			q.Trade.ALL,
+			q.User.As("User").Phone.As("User__phone"),
+			q.User.As("User").Name.As("User__name"),
+		).
+		Where(do).
+		Order(q.Trade.CreatedAt.Desc()).
+		FindByPage(req.GetOffset(), req.GetLimit())
+	if err != nil {
+		return err
+	}
+
+	// 返回结果
+	return c.JSON(core.PageResp{
+		List:  list,
+		Total: int(total),
+		Page:  req.GetPage(),
+		Size:  req.GetSize(),
+	})
+}
+
+type PageTradeOfUserByAdminReq struct {
+	core.PageReq
+	UserID         int32      `json:"user_id" validate:"required"`
+	InnerNo        *string    `json:"inner_no,omitempty"`
+	OuterNo        *string    `json:"outer_no,omitempty"`
+	Method         *int       `json:"method,omitempty"`
+	Platform       *int       `json:"platform,omitempty"`
+	Status         *int       `json:"status,omitempty"`
+	CreatedAtStart *time.Time `json:"created_at_start,omitempty"`
+	CreatedAtEnd   *time.Time `json:"created_at_end,omitempty"`
+}
+
 // 创建订单
 func TradeCreate(c *fiber.Ctx) error {
 	// 检查权限

web/handlers/user.go

@@ -405,3 +405,118 @@ type UpdatePasswordReq struct {
 	Code     string `json:"code"`
 	Password string `json:"password"`
 }
+
+// PageUserNotBindByAdmin 分页获取未绑定管理员的用户
+func PageUserNotBindByAdmin(c *fiber.Ctx) error {
+	// 检查权限
+	_, err := auth.GetAuthCtx(c).PermitAdmin(core.ScopeUserReadNotBind)
+	if err != nil {
+		return err
+	}
+
+	// 解析请求参数
+	req := new(PageUserNotBindByAdminReq)
+	if err := g.Validator.ParseBody(c, req); err != nil {
+		return err
+	}
+
+	// 构建查询条件（强制过滤未绑定管理员的用户）
+	do := q.User.Where(q.User.AdminID.IsNull())
+	if req.Phone != nil {
+		do = do.Where(q.User.Phone.Eq(*req.Phone))
+	}
+
+	// 查询用户列表
+	users, total, err := q.User.
+		Omit(q.User.Password, q.User.IDNo).
+		Where(do).
+		Order(q.User.CreatedAt.Desc()).
+		FindByPage(req.GetOffset(), req.GetLimit())
+	if err != nil {
+		return err
+	}
+
+	// 返回结果
+	return c.JSON(core.PageResp{
+		Total: int(total),
+		Page:  req.GetPage(),
+		Size:  req.GetSize(),
+		List:  users,
+	})
+}
+
+type PageUserNotBindByAdminReq struct {
+	core.PageReq
+	Phone *string `json:"phone,omitempty"`
+}
+
+// UpdateUserBalanceIncByAdmin 管理员增加用户余额
+func UpdateUserBalanceIncByAdmin(c *fiber.Ctx) error {
+	authCtx, err := auth.GetAuthCtx(c).PermitAdmin(core.ScopeUserWriteBalance)
+	if err != nil {
+		return err
+	}
+
+	var req UpdateUserBalanceChangeByAdminData
+	if err := g.Validator.ParseBody(c, &req); err != nil {
+		return err
+	}
+
+	amount, err := decimal.NewFromString(req.Amount)
+	if err != nil {
+		return err
+	}
+	if !amount.IsPositive() {
+		return core.NewBizErr("金额必须为正数")
+	}
+
+	user, err := s.User.Get(q.Q, req.UserID)
+	if err != nil {
+		return err
+	}
+
+	newBalance := user.Balance.Add(amount)
+	if err := s.User.UpdateBalanceByAdmin(user, newBalance, &authCtx.Admin.ID); err != nil {
+		return err
+	}
+
+	return c.JSON(nil)
+}
+
+// UpdateUserBalanceDecByAdmin 管理员减少用户余额
+func UpdateUserBalanceDecByAdmin(c *fiber.Ctx) error {
+	authCtx, err := auth.GetAuthCtx(c).PermitAdmin(core.ScopeUserWriteBalance)
+	if err != nil {
+		return err
+	}
+
+	var req UpdateUserBalanceChangeByAdminData
+	if err := g.Validator.ParseBody(c, &req); err != nil {
+		return err
+	}
+
+	amount, err := decimal.NewFromString(req.Amount)
+	if err != nil {
+		return err
+	}
+	if !amount.IsPositive() {
+		return core.NewBizErr("金额必须为正数")
+	}
+
+	user, err := s.User.Get(q.Q, req.UserID)
+	if err != nil {
+		return err
+	}
+
+	newBalance := user.Balance.Sub(amount)
+	if err := s.User.UpdateBalanceByAdmin(user, newBalance, &authCtx.Admin.ID); err != nil {
+		return err
+	}
+
+	return c.JSON(nil)
+}
+
+type UpdateUserBalanceChangeByAdminData struct {
+	UserID int32  `json:"user_id" validate:"required"`
+	Amount string `json:"amount" validate:"required"`
+}