暂存一下,防止丢失

internal/service/role/service.go

@@ -160,7 +160,7 @@ func (s *Service) Delete(ctx context.Context, id uint) error {
 }
 
 // List 查询角色列表
-func (s *Service) List(ctx context.Context, req *dto.RoleListRequest) ([]*model.Role, int64, error) {
+func (s *Service) List(ctx context.Context, req *dto.RoleListRequest) ([]*dto.RoleResponse, int64, error) {
 	opts := &store.QueryOptions{
 		Page:     req.Page,
 		PageSize: req.PageSize,
@@ -184,7 +184,15 @@ func (s *Service) List(ctx context.Context, req *dto.RoleListRequest) ([]*model.
 		filters["status"] = *req.Status
 	}
 
-	return s.roleStore.List(ctx, opts, filters)
+	roles, total, err := s.roleStore.List(ctx, opts, filters)
+	if err != nil {
+		return nil, 0, errors.Wrap(errors.CodeInternalError, err, "查询角色列表失败")
+	}
+	result := make([]*dto.RoleResponse, 0, len(roles))
+	for _, role := range roles {
+		result = append(result, toResponse(role))
+	}
+	return result, total, nil
 }
 
 // AssignPermissions 为角色分配权限
@@ -358,15 +366,18 @@ func (s *Service) UpdateStatus(ctx context.Context, id uint, status int) error {
 // toResponse 将 model.Role 转换为 dto.RoleResponse
 func toResponse(role *model.Role) *dto.RoleResponse {
 	return &dto.RoleResponse{
-		ID:        role.ID,
-		RoleName:  role.RoleName,
-		RoleDesc:  role.RoleDesc,
-		RoleType:  role.RoleType,
-		Status:    role.Status,
-		Creator:   role.Creator,
-		Updater:   role.Updater,
-		CreatedAt: role.CreatedAt.Format(time.RFC3339),
-		UpdatedAt: role.UpdatedAt.Format(time.RFC3339),
+		ID:                   role.ID,
+		RoleName:             role.RoleName,
+		RoleDesc:             role.RoleDesc,
+		RoleType:             role.RoleType,
+		Status:               role.Status,
+		DefaultCreditEnabled: role.DefaultCreditEnabled,
+		DefaultCreditLimit:   role.DefaultCreditLimit,
+		DefaultCreditScope:   "new_shops_only",
+		Creator:              role.Creator,
+		Updater:              role.Updater,
+		CreatedAt:            role.CreatedAt.Format(time.RFC3339),
+		UpdatedAt:            role.UpdatedAt.Format(time.RFC3339),
 	}
 }