csxj2026/junhong_cmp_fiber
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects 1 Releases Wiki Activity

fix: 修复平台账号无法访问我的佣金记录和提现记录接口的问题
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 7m18s
Details

Browse Source
This commit is contained in:
huang
2026-04-02 10:14:44 +08:00
parent 950c0bfb8f
commit 138f08ddd7
1 changed files with 30 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
internal/service/my_commission/service.go
View File

@@ -237,16 +237,14 @@ func (s *Service) CreateWithdrawalRequest(ctx context.Context, req *dto.CreateMy
}, nil }, nil
} }
// ListMyWithdrawalRequests 查询我的提现记录 // ListMyWithdrawalRequests 查询提现记录
// 代理账号：仅查询本店铺数据；平台账号/超级管理员：查询全部数据
func (s *Service) ListMyWithdrawalRequests(ctx context.Context, req *dto.MyWithdrawalListReq) (*dto.WithdrawalRequestPageResult, error) { func (s *Service) ListMyWithdrawalRequests(ctx context.Context, req *dto.MyWithdrawalListReq) (*dto.WithdrawalRequestPageResult, error) {
userType := middleware.GetUserTypeFromContext(ctx) userType := middleware.GetUserTypeFromContext(ctx)
if userType != constants.UserTypeAgent {
return nil, errors.New(errors.CodeForbidden, "仅代理商用户可访问")
}
shopID := middleware.GetShopIDFromContext(ctx) // 仅允许超级管理员、平台账号、代理账号访问
if shopID == 0 { if userType != constants.UserTypeSuperAdmin && userType != constants.UserTypePlatform && userType != constants.UserTypeAgent {
return nil, errors.New(errors.CodeForbidden, "无法获取店铺信息") return nil, errors.New(errors.CodeForbidden, "无权限访问提现记录")
} }
page := req.Page page := req.Page
@@ -258,8 +256,16 @@ func (s *Service) ListMyWithdrawalRequests(ctx context.Context, req *dto.MyWithd
pageSize = constants.DefaultPageSize pageSize = constants.DefaultPageSize
} }
query := s.db.WithContext(ctx).Model(&model.CommissionWithdrawalRequest{}). query := s.db.WithContext(ctx).Model(&model.CommissionWithdrawalRequest{})
Where("shop_id = ?", shopID)
// 代理账号按店铺过滤；平台账号和超级管理员查看全部
if userType == constants.UserTypeAgent {
shopID := middleware.GetShopIDFromContext(ctx)
if shopID == 0 {
return nil, errors.New(errors.CodeForbidden, "无法获取店铺信息")
}
query = query.Where("shop_id = ?", shopID)
}
if req.Status != nil { if req.Status != nil {
query = query.Where("status = ?", *req.Status) query = query.Where("status = ?", *req.Status)
@@ -312,16 +318,14 @@ func (s *Service) ListMyWithdrawalRequests(ctx context.Context, req *dto.MyWithd
}, nil }, nil
} }
// ListMyCommissionRecords 查询我的佣金明细 // ListMyCommissionRecords 查询佣金明细
// 代理账号：仅查询本店铺数据；平台账号/超级管理员：查询全部数据
func (s *Service) ListMyCommissionRecords(ctx context.Context, req *dto.MyCommissionRecordListReq) (*dto.MyCommissionRecordPageResult, error) { func (s *Service) ListMyCommissionRecords(ctx context.Context, req *dto.MyCommissionRecordListReq) (*dto.MyCommissionRecordPageResult, error) {
userType := middleware.GetUserTypeFromContext(ctx) userType := middleware.GetUserTypeFromContext(ctx)
if userType != constants.UserTypeAgent {
return nil, errors.New(errors.CodeForbidden, "仅代理商用户可访问")
}
shopID := middleware.GetShopIDFromContext(ctx) // 仅允许超级管理员、平台账号、代理账号访问
if shopID == 0 { if userType != constants.UserTypeSuperAdmin && userType != constants.UserTypePlatform && userType != constants.UserTypeAgent {
return nil, errors.New(errors.CodeForbidden, "无法获取店铺信息") return nil, errors.New(errors.CodeForbidden, "无权限访问佣金明细")
} }
page := req.Page page := req.Page
@@ -333,8 +337,16 @@ func (s *Service) ListMyCommissionRecords(ctx context.Context, req *dto.MyCommis
pageSize = constants.DefaultPageSize pageSize = constants.DefaultPageSize
} }
query := s.db.WithContext(ctx).Model(&model.CommissionRecord{}). query := s.db.WithContext(ctx).Model(&model.CommissionRecord{})
Where("shop_id = ?", shopID)
// 代理账号按店铺过滤；平台账号和超级管理员查看全部
if userType == constants.UserTypeAgent {
shopID := middleware.GetShopIDFromContext(ctx)
if shopID == 0 {
return nil, errors.New(errors.CodeForbidden, "无法获取店铺信息")
}
query = query.Where("shop_id = ?", shopID)
}
if req.CommissionSource != nil { if req.CommissionSource != nil {
query = query.Where("commission_source = ?", *req.CommissionSource) query = query.Where("commission_source = ?", *req.CommissionSource)