rogee/quyun-v2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: 更新租户和订单相关功能，添加租户成员列表接口，优化数据处理和前端展示

Browse Source
This commit is contained in:
Rogee
2025-12-23 23:38:05 +08:00
parent bcb8c822f1
commit 26e4279f1e
10 changed files with 750 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

367
backend/app/services/tenant.go
View File

@@ -5,7 +5,7 @@ import (
"strings"
"time"
"quyun/v2/app/http/super/dto"
superdto "quyun/v2/app/http/super/dto"
tenantdto "quyun/v2/app/http/tenant/dto"
"quyun/v2/app/requests"
"quyun/v2/database"
@@ -16,6 +16,7 @@ import (
"github.com/samber/lo"
"github.com/sirupsen/logrus"
"go.ipao.vip/gen"
"go.ipao.vip/gen/field"
"go.ipao.vip/gen/types"
"gorm.io/gorm"
)
@@ -26,7 +27,7 @@ import (
type tenant struct{}
// SuperCreateTenant 超级管理员创建租户，并将指定用户设为租户管理员。
func (t *tenant) SuperCreateTenant(ctx context.Context, form *dto.TenantCreateForm) (*models.Tenant, error) {
func (t *tenant) SuperCreateTenant(ctx context.Context, form *superdto.TenantCreateForm) (*models.Tenant, error) {
if form == nil {
return nil, errors.New("form is nil")
}
@@ -42,7 +43,7 @@ func (t *tenant) SuperCreateTenant(ctx context.Context, form *dto.TenantCreateFo
if form.AdminUserID <= 0 {
return nil, errors.New("admin_user_id must be > 0")
}
duration, err := (&dto.TenantExpireUpdateForm{Duration: form.Duration}).ParseDuration()
duration, err := (&superdto.TenantExpireUpdateForm{Duration: form.Duration}).ParseDuration()
if err != nil {
return nil, err
}
@@ -164,6 +165,95 @@ func (t *tenant) AdminTenantUsersPage(ctx context.Context, tenantID int64, filte
}, nil
}
// SuperTenantUsersPage 超级管理员分页查询租户成员（脱敏 user 字段，避免泄露 password）。
func (t *tenant) SuperTenantUsersPage(ctx context.Context, tenantID int64, filter *tenantdto.AdminTenantUserListFilter) (*requests.Pager, error) {
if tenantID <= 0 {
return nil, errors.New("tenant_id must be > 0")
}
if filter == nil {
filter = &tenantdto.AdminTenantUserListFilter{}
}
filter.Pagination.Format()
tbl, query := models.TenantUserQuery.QueryContext(ctx)
conds := []gen.Condition{tbl.TenantID.Eq(tenantID)}
if filter.UserID != nil && *filter.UserID > 0 {
conds = append(conds, tbl.UserID.Eq(*filter.UserID))
}
if filter.Role != nil && *filter.Role != "" {
conds = append(conds, tbl.Role.Contains(types.NewArray([]consts.TenantUserRole{*filter.Role})))
}
if filter.Status != nil && *filter.Status != "" {
conds = append(conds, tbl.Status.Eq(*filter.Status))
}
if username := filter.UsernameTrimmed(); username != "" {
uTbl, _ := models.UserQuery.QueryContext(ctx)
query = query.LeftJoin(uTbl, uTbl.ID.EqCol(tbl.UserID))
conds = append(conds, uTbl.Username.Like(database.WrapLike(username)))
}
items, total, err := query.Where(conds...).Order(tbl.ID.Desc()).FindByPage(int(filter.Offset()), int(filter.Limit))
if err != nil {
return nil, err
}
userIDs := make([]int64, 0, len(items))
for _, tu := range items {
if tu == nil {
continue
}
userIDs = append(userIDs, tu.UserID)
}
var users []*models.User
if len(userIDs) > 0 {
uTbl, uQuery := models.UserQuery.QueryContext(ctx)
users, err = uQuery.Where(uTbl.ID.In(userIDs...)).Find()
if err != nil {
return nil, err
}
}
userMap := make(map[int64]*models.User, len(users))
for _, u := range users {
if u == nil {
continue
}
userMap[u.ID] = u
}
out := make([]*superdto.SuperTenantUserItem, 0, len(items))
for _, tu := range items {
if tu == nil {
continue
}
u := userMap[tu.UserID]
var lite *superdto.SuperUserLite
if u != nil {
lite = &superdto.SuperUserLite{
ID: u.ID,
Username: u.Username,
Status: u.Status,
StatusDescription: u.Status.Description(),
Roles: u.Roles,
VerifiedAt: u.VerifiedAt,
CreatedAt: u.CreatedAt,
UpdatedAt: u.UpdatedAt,
}
}
out = append(out, &superdto.SuperTenantUserItem{
TenantUser: tu,
User: lite,
})
}
return &requests.Pager{
Pagination: filter.Pagination,
Total: total,
Items: out,
}, nil
}
func (t *tenant) ContainsUserID(ctx context.Context, tenantID, userID int64) (*models.User, error) {
tbl, query := models.TenantUserQuery.QueryContext(ctx)
@@ -242,12 +332,28 @@ func (t *tenant) SetUserRole(ctx context.Context, tenantID, userID int64, role .
}
// Pager
func (t *tenant) Pager(ctx context.Context, filter *dto.TenantFilter) (*requests.Pager, error) {
func (t *tenant) Pager(ctx context.Context, filter *superdto.TenantFilter) (*requests.Pager, error) {
tbl, query := models.TenantQuery.QueryContext(ctx)
conds := []gen.Condition{}
if filter.Name != nil {
conds = append(conds, tbl.Name.Like(database.WrapLike(*filter.Name)))
if filter == nil {
filter = &superdto.TenantFilter{}
}
if filter.ID != nil && *filter.ID > 0 {
conds = append(conds, tbl.ID.Eq(*filter.ID))
}
if filter.UserID != nil && *filter.UserID > 0 {
conds = append(conds, tbl.UserID.Eq(*filter.UserID))
}
if name := filter.NameTrimmed(); name != "" {
conds = append(conds, tbl.Name.Like(database.WrapLike(name)))
}
if code := filter.CodeTrimmed(); code != "" {
// code 在库内按约定存储为 lower-case；这里统一转小写后做 like。
conds = append(conds, tbl.Code.Like(database.WrapLike(code)))
}
if filter.Status != nil {
@@ -255,7 +361,65 @@ func (t *tenant) Pager(ctx context.Context, filter *dto.TenantFilter) (*requests
}
filter.Pagination.Format()
mm, total, err := query.Where(conds...).Order(tbl.ID.Desc()).FindByPage(int(filter.Offset()), int(filter.Limit))
if filter.ExpiredAtFrom != nil {
conds = append(conds, tbl.ExpiredAt.Gte(*filter.ExpiredAtFrom))
}
if filter.ExpiredAtTo != nil {
conds = append(conds, tbl.ExpiredAt.Lte(*filter.ExpiredAtTo))
}
if filter.CreatedAtFrom != nil {
conds = append(conds, tbl.CreatedAt.Gte(*filter.CreatedAtFrom))
}
if filter.CreatedAtTo != nil {
conds = append(conds, tbl.CreatedAt.Lte(*filter.CreatedAtTo))
}
// 排序白名单：避免把任意字符串拼进 SQL 导致注入或慢查询。
orderBys := make([]field.Expr, 0, 6)
allowedAsc := map[string]field.Expr{
"id": tbl.ID.Asc(),
"code": tbl.Code.Asc(),
"name": tbl.Name.Asc(),
"status": tbl.Status.Asc(),
"expired_at": tbl.ExpiredAt.Asc(),
"created_at": tbl.CreatedAt.Asc(),
"updated_at": tbl.UpdatedAt.Asc(),
}
allowedDesc := map[string]field.Expr{
"id": tbl.ID.Desc(),
"code": tbl.Code.Desc(),
"name": tbl.Name.Desc(),
"status": tbl.Status.Desc(),
"expired_at": tbl.ExpiredAt.Desc(),
"created_at": tbl.CreatedAt.Desc(),
"updated_at": tbl.UpdatedAt.Desc(),
}
for _, f := range filter.AscFields() {
f = strings.TrimSpace(f)
if f == "" {
continue
}
if ob, ok := allowedAsc[f]; ok {
orderBys = append(orderBys, ob)
}
}
for _, f := range filter.DescFields() {
f = strings.TrimSpace(f)
if f == "" {
continue
}
if ob, ok := allowedDesc[f]; ok {
orderBys = append(orderBys, ob)
}
}
if len(orderBys) == 0 {
orderBys = append(orderBys, tbl.ID.Desc())
} else {
orderBys = append(orderBys, tbl.ID.Desc())
}
mm, total, err := query.Where(conds...).Order(orderBys...).FindByPage(int(filter.Offset()), int(filter.Limit))
if err != nil {
return nil, err
}
@@ -267,20 +431,42 @@ func (t *tenant) Pager(ctx context.Context, filter *dto.TenantFilter) (*requests
return nil, err
}
userBalanceMapping, err := t.TenantUserBalanceMapping(ctx, tenantIds)
incomeMapping, err := t.TenantIncomePaidMapping(ctx, tenantIds)
if err != nil {
return nil, err
}
items := lo.Map(mm, func(model *models.Tenant, _ int) *dto.TenantItem {
return &dto.TenantItem{
Tenant: model,
UserCount: lo.ValueOr(userCountMapping, model.ID, 0),
UserBalance: lo.ValueOr(userBalanceMapping, model.ID, 0),
StatusDescription: model.Status.Description(),
items := lo.Map(mm, func(model *models.Tenant, _ int) *superdto.TenantItem {
return &superdto.TenantItem{
Tenant: model,
UserCount: lo.ValueOr(userCountMapping, model.ID, 0),
IncomeAmountPaidSum: lo.ValueOr(incomeMapping, model.ID, 0),
StatusDescription: model.Status.Description(),
}
})
ownerMapping, err := t.TenantOwnerUserMapping(ctx, mm)
if err != nil {
return nil, err
}
for _, it := range items {
if it == nil || it.Tenant == nil {
continue
}
it.Owner = ownerMapping[it.Tenant.ID]
}
adminUsersMapping, err := t.TenantAdminUsersMapping(ctx, tenantIds)
if err != nil {
return nil, err
}
for _, it := range items {
if it == nil || it.Tenant == nil {
continue
}
it.AdminUsers = adminUsersMapping[it.Tenant.ID]
}
return &requests.Pager{
Pagination: filter.Pagination,
Total: total,
@@ -288,6 +474,124 @@ func (t *tenant) Pager(ctx context.Context, filter *dto.TenantFilter) (*requests
}, nil
}
func (t *tenant) TenantOwnerUserMapping(ctx context.Context, tenants []*models.Tenant) (map[int64]*superdto.TenantOwnerUserLite, error) {
result := make(map[int64]*superdto.TenantOwnerUserLite, len(tenants))
userIDs := make([]int64, 0, len(tenants))
tenantIDs := make([]int64, 0, len(tenants))
for _, te := range tenants {
if te == nil || te.ID <= 0 {
continue
}
tenantIDs = append(tenantIDs, te.ID)
if te.UserID > 0 {
userIDs = append(userIDs, te.UserID)
}
}
for _, tenantID := range tenantIDs {
result[tenantID] = nil
}
userIDs = lo.Uniq(userIDs)
if len(userIDs) == 0 {
return result, nil
}
uTbl, uQuery := models.UserQuery.QueryContext(ctx)
users, err := uQuery.Where(uTbl.ID.In(userIDs...)).Find()
if err != nil {
return nil, err
}
userMap := make(map[int64]*models.User, len(users))
for _, u := range users {
if u == nil {
continue
}
userMap[u.ID] = u
}
for _, te := range tenants {
if te == nil || te.ID <= 0 || te.UserID <= 0 {
continue
}
u := userMap[te.UserID]
if u == nil {
continue
}
result[te.ID] = &superdto.TenantOwnerUserLite{
ID: u.ID,
Username: u.Username,
}
}
return result, nil
}
// TenantAdminUsersMapping 返回每个租户的管理员用户（用于 superadmin 租户列表展示）。
func (t *tenant) TenantAdminUsersMapping(ctx context.Context, tenantIDs []int64) (map[int64][]*superdto.TenantAdminUserLite, error) {
result := make(map[int64][]*superdto.TenantAdminUserLite, len(tenantIDs))
for _, id := range tenantIDs {
if id <= 0 {
continue
}
result[id] = nil
}
if len(result) == 0 {
return result, nil
}
tuTbl, tuQuery := models.TenantUserQuery.QueryContext(ctx)
tus, err := tuQuery.Where(
tuTbl.TenantID.In(tenantIDs...),
tuTbl.Role.Contains(types.NewArray([]consts.TenantUserRole{consts.TenantUserRoleTenantAdmin})),
).Find()
if err != nil {
return nil, err
}
userIDs := make([]int64, 0, len(tus))
type pair struct {
tenantID int64
userID int64
}
pairs := make([]pair, 0, len(tus))
for _, tu := range tus {
if tu == nil || tu.TenantID <= 0 || tu.UserID <= 0 {
continue
}
userIDs = append(userIDs, tu.UserID)
pairs = append(pairs, pair{tenantID: tu.TenantID, userID: tu.UserID})
}
userIDs = lo.Uniq(userIDs)
userMap := map[int64]*models.User{}
if len(userIDs) > 0 {
uTbl, uQuery := models.UserQuery.QueryContext(ctx)
users, err := uQuery.Where(uTbl.ID.In(userIDs...)).Find()
if err != nil {
return nil, err
}
for _, u := range users {
if u == nil {
continue
}
userMap[u.ID] = u
}
}
for _, p := range pairs {
u := userMap[p.userID]
if u == nil {
continue
}
result[p.tenantID] = append(result[p.tenantID], &superdto.TenantAdminUserLite{
ID: u.ID,
Username: u.Username,
})
}
return result, nil
}
func (t *tenant) TenantUserCountMapping(ctx context.Context, tenantIds []int64) (map[int64]int64, error) {
// 关键语义：返回值必须包含入参中的所有 tenant_id。
// 即便该租户当前没有成员，也应返回 count=0，便于调用方直接取值而无需额外补全逻辑。
@@ -368,6 +672,41 @@ func (t *tenant) TenantUserBalanceMapping(ctx context.Context, tenantIds []int64
return result, nil
}
// TenantIncomePaidMapping 按租户维度统计“已支付订单”的累计收入（单位：分，CNY）。
// 说明：
// - 仅统计 orders.status = paid 的订单金额；
// - refunding/refunded 不计入收入（避免把已退/退款中的金额当作收入）。
func (t *tenant) TenantIncomePaidMapping(ctx context.Context, tenantIDs []int64) (map[int64]int64, error) {
result := make(map[int64]int64, len(tenantIDs))
for _, id := range tenantIDs {
if id <= 0 {
continue
}
result[id] = 0
}
if len(result) == 0 {
return result, nil
}
oTbl, oQuery := models.OrderQuery.QueryContext(ctx)
var rows []struct {
TenantID int64
Income int64
}
err := oQuery.
Select(oTbl.TenantID, oTbl.AmountPaid.Sum().As("income")).
Where(oTbl.TenantID.In(tenantIDs...), oTbl.Status.Eq(consts.OrderStatusPaid)).
Group(oTbl.TenantID).
Scan(&rows)
if err != nil {
return nil, err
}
for _, row := range rows {
result[row.TenantID] = row.Income
}
return result, nil
}
// FindByID
func (t *tenant) FindByID(ctx context.Context, id int64) (*models.Tenant, error) {
tbl, query := models.TenantQuery.QueryContext(ctx)