版本预发布

server/internal/controller/backend/admin/dept.go

@@ -21,122 +21,102 @@ var (
 type cDept struct{}
 
 // NameUnique 名称是否唯一
-func (c *cDept) NameUnique(ctx context.Context, req *dept.NameUniqueReq) (*dept.NameUniqueRes, error) {
-
+func (c *cDept) NameUnique(ctx context.Context, req *dept.NameUniqueReq) (res *dept.NameUniqueRes, err error) {
 	data, err := service.AdminDept().NameUnique(ctx, adminin.DeptNameUniqueInp{Id: req.Id, Name: req.Name})
 	if err != nil {
-		return nil, err
+		return
 	}
 
-	var res dept.NameUniqueRes
+	res = new(dept.NameUniqueRes)
 	res.IsUnique = data.IsUnique
-	return &res, nil
+	return
 }
 
 // Delete 删除
 func (c *cDept) Delete(ctx context.Context, req *dept.DeleteReq) (res *dept.DeleteRes, err error) {
 	var in adminin.DeptDeleteInp
 	if err = gconv.Scan(req, &in); err != nil {
-		return nil, err
+		return
 	}
-	if err = service.AdminDept().Delete(ctx, in); err != nil {
-		return nil, err
-	}
-	return res, nil
+
+	err = service.AdminDept().Delete(ctx, in)
+	return
 }
 
 // Edit 更新
 func (c *cDept) Edit(ctx context.Context, req *dept.EditReq) (res *dept.EditRes, err error) {
-
 	var in adminin.DeptEditInp
 	if err = gconv.Scan(req, &in); err != nil {
 		return nil, err
 	}
-	if err = service.AdminDept().Edit(ctx, in); err != nil {
-		return nil, err
-	}
 
-	return res, nil
+	err = service.AdminDept().Edit(ctx, in)
+	return
 }
 
 // MaxSort 最大排序
-func (c *cDept) MaxSort(ctx context.Context, req *dept.MaxSortReq) (*dept.MaxSortRes, error) {
-
+func (c *cDept) MaxSort(ctx context.Context, req *dept.MaxSortReq) (res *dept.MaxSortRes, err error) {
 	data, err := service.AdminDept().MaxSort(ctx, adminin.DeptMaxSortInp{Id: req.Id})
 	if err != nil {
-		return nil, err
+		return
 	}
 
-	var res dept.MaxSortRes
+	res = new(dept.MaxSortRes)
 	res.Sort = data.Sort
-	return &res, nil
+	return
 }
 
 // View 获取指定信息
-func (c *cDept) View(ctx context.Context, req *dept.ViewReq) (*dept.ViewRes, error) {
-
+func (c *cDept) View(ctx context.Context, req *dept.ViewReq) (res *dept.ViewRes, err error) {
 	data, err := service.AdminDept().View(ctx, adminin.DeptViewInp{Id: req.Id})
 	if err != nil {
-		return nil, err
+		return
 	}
 
-	var res dept.ViewRes
+	res = new(dept.ViewRes)
 	res.DeptViewModel = data
-	return &res, nil
+	return
 }
 
 // List 查看列表
-func (c *cDept) List(ctx context.Context, req *dept.ListReq) (*dept.ListRes, error) {
-
-	var (
-		in  adminin.DeptListInp
-		res dept.ListRes
-	)
-
-	if err := gconv.Scan(req, &in); err != nil {
-		return nil, err
+func (c *cDept) List(ctx context.Context, req *dept.ListReq) (res *dept.ListRes, err error) {
+	var in adminin.DeptListInp
+	if err = gconv.Scan(req, &in); err != nil {
+		return
 	}
+
 	data, err := service.AdminDept().List(ctx, in)
 	if err != nil {
-		return nil, err
+		return
 	}
 
-	_ = gconv.Structs(data, &res)
-
-	return &res, nil
+	res = (*dept.ListRes)(&data)
+	return
 }
 
 // ListTree 查看列表树
-func (c *cDept) ListTree(ctx context.Context, req *dept.ListTreeReq) (*dept.ListTreeRes, error) {
-
-	var (
-		in  adminin.DeptListTreeInp
-		res dept.ListTreeRes
-	)
-
-	if err := gconv.Scan(req, &in); err != nil {
-		return nil, err
+func (c *cDept) ListTree(ctx context.Context, req *dept.ListTreeReq) (res *dept.ListTreeRes, err error) {
+	var in adminin.DeptListTreeInp
+	if err = gconv.Scan(req, &in); err != nil {
+		return
 	}
+
 	data, err := service.AdminDept().ListTree(ctx, in)
 	if err != nil {
-		return nil, err
+		return
 	}
 
-	_ = gconv.Structs(data, &res)
-
-	return &res, nil
+	res = (*dept.ListTreeRes)(&data)
+	return
 }
 
 // Status 更新部门状态
 func (c *cDept) Status(ctx context.Context, req *dept.StatusReq) (res *dept.StatusRes, err error) {
-
 	var in adminin.DeptStatusInp
 	if err = gconv.Scan(req, &in); err != nil {
-		return nil, err
-	}
-	if err = service.AdminDept().Status(ctx, in); err != nil {
-		return nil, err
+		return
 	}
 
-	return res, nil
+	err = service.AdminDept().Status(ctx, in)
+	return
 }

server/internal/controller/backend/admin/member.go

@@ -23,269 +23,228 @@ var (
 
 type cMember struct{}
 
-// UpdateProfile 修改登录密码
-func (c *cMember) UpdateProfile(ctx context.Context, req *member.UpdateProfileReq) (res *member.UpdateProfileRes, err error) {
+// UpdateCash 修改代理商提现信息
+func (c *cMember) UpdateCash(ctx context.Context, req *member.UpdateCashReq) (res *member.UpdateCashRes, err error) {
+	var in adminin.MemberUpdateCashInp
+	if err = gconv.Scan(req, &in); err != nil {
+		return
+	}
 
+	err = service.AdminMember().UpdateCash(ctx, in)
+	return
+}
+
+// UpdateEmail 换绑邮箱
+func (c *cMember) UpdateEmail(ctx context.Context, req *member.UpdateEmailReq) (res *member.UpdateEmailRes, err error) {
+	var in adminin.MemberUpdateEmailInp
+	if err = gconv.Scan(req, &in); err != nil {
+		return
+	}
+
+	err = service.AdminMember().UpdateEmail(ctx, in)
+	return
+}
+
+// UpdateMobile 换绑手机号
+func (c *cMember) UpdateMobile(ctx context.Context, req *member.UpdateMobileReq) (res *member.UpdateMobileRes, err error) {
+	var in adminin.MemberUpdateMobileInp
+	if err = gconv.Scan(req, &in); err != nil {
+		return
+	}
+
+	err = service.AdminMember().UpdateMobile(ctx, in)
+	return
+}
+
+// UpdateProfile 更新用户资料
+func (c *cMember) UpdateProfile(ctx context.Context, req *member.UpdateProfileReq) (res *member.UpdateProfileRes, err error) {
 	var in adminin.MemberUpdateProfileInp
 	if err = gconv.Scan(req, &in); err != nil {
-		return nil, err
-	}
-
-	if err = service.AdminMember().UpdateProfile(ctx, in); err != nil {
-		return nil, err
+		return
 	}
 
+	err = service.AdminMember().UpdateProfile(ctx, in)
 	return
 }
 
 // UpdatePwd 修改登录密码
 func (c *cMember) UpdatePwd(ctx context.Context, req *member.UpdatePwdReq) (res *member.UpdatePwdRes, err error) {
-
-	memberId := contexts.Get(ctx).User.Id
+	var memberId = contexts.Get(ctx).User.Id
 	if memberId <= 0 {
-		err := gerror.New("获取用户信息失败！")
+		err = gerror.New("获取用户信息失败！")
 		return nil, err
 	}
 
-	if err = service.AdminMember().
-		UpdatePwd(ctx, adminin.MemberUpdatePwdInp{Id: memberId, OldPassword: req.OldPassword, NewPassword: req.NewPassword}); err != nil {
-		return nil, err
+	var in = adminin.MemberUpdatePwdInp{
+		Id:          memberId,
+		OldPassword: req.OldPassword,
+		NewPassword: req.NewPassword,
 	}
 
+	err = service.AdminMember().UpdatePwd(ctx, in)
 	return
 }
 
-// Profile 获取登录用户的基本信息
-func (c *cMember) Profile(ctx context.Context, req *member.ProfileReq) (*member.ProfileRes, error) {
-
-	var res member.ProfileRes
-
-	memberId := contexts.Get(ctx).User.Id
-	if memberId <= 0 {
-		err := gerror.New("获取用户信息失败！")
-		return nil, err
-	}
-
-	// 用户基本信息
-	memberInfo, err := service.AdminMember().View(ctx, adminin.MemberViewInp{Id: memberId})
-	if err != nil {
-		return nil, err
-	}
-	res.User = memberInfo
-
-	// 所在部门
-	sysDept, err := service.AdminDept().View(ctx, adminin.DeptViewInp{Id: memberInfo.DeptId})
-	if err != nil {
-		return nil, err
-	}
-	res.SysDept = sysDept
-
-	// 角色列表
-	sysRoles, err := service.AdminRole().GetMemberList(ctx, memberInfo.RoleId)
-	if err != nil {
-		return nil, err
-	}
-	res.SysRoles = sysRoles
-
-	// 获取角色名称
-	roleGroup, err := service.AdminRole().GetName(ctx, memberInfo.RoleId)
-	if err != nil {
-		return nil, err
-	}
-	res.RoleGroup = roleGroup
-
-	// 获取第一岗位名称
-	postGroup, err := service.AdminPost().GetMemberByStartName(ctx, memberInfo.Id)
-	if err != nil {
-		return nil, err
-	}
-	res.PostGroup = postGroup
-
-	return &res, nil
-}
-
 // ResetPwd 重置密码
 func (c *cMember) ResetPwd(ctx context.Context, req *member.ResetPwdReq) (res *member.ResetPwdRes, err error) {
-
-	if err = service.AdminMember().
-		ResetPwd(ctx, adminin.MemberResetPwdInp{Id: req.Id, Password: req.Password}); err != nil {
-		return nil, err
+	var in = adminin.MemberResetPwdInp{
+		Id:       req.Id,
+		Password: req.Password,
 	}
 
+	err = service.AdminMember().ResetPwd(ctx, in)
 	return
 }
 
 // EmailUnique 邮箱是否唯一
-func (c *cMember) EmailUnique(ctx context.Context, req *member.EmailUniqueReq) (*member.EmailUniqueRes, error) {
-
-	data, err := service.AdminMember().EmailUnique(ctx, adminin.MemberEmailUniqueInp{Id: req.Id, Email: req.Email})
-	if err != nil {
-		return nil, err
+func (c *cMember) EmailUnique(ctx context.Context, req *member.EmailUniqueReq) (res *member.EmailUniqueRes, err error) {
+	var in = adminin.MemberEmailUniqueInp{
+		Id:    req.Id,
+		Email: req.Email,
 	}
 
-	var res member.EmailUniqueRes
+	data, err := service.AdminMember().EmailUnique(ctx, in)
+	if err != nil {
+		return
+	}
+
+	res = new(member.EmailUniqueRes)
 	res.IsUnique = data.IsUnique
-	return &res, nil
+	return
 }
 
 // MobileUnique 手机号是否唯一
-func (c *cMember) MobileUnique(ctx context.Context, req *member.MobileUniqueReq) (*member.MobileUniqueRes, error) {
-
-	data, err := service.AdminMember().MobileUnique(ctx, adminin.MemberMobileUniqueInp{Id: req.Id, Mobile: req.Mobile})
-	if err != nil {
-		return nil, err
+func (c *cMember) MobileUnique(ctx context.Context, req *member.MobileUniqueReq) (res *member.MobileUniqueRes, err error) {
+	var in = adminin.MemberMobileUniqueInp{
+		Id:     req.Id,
+		Mobile: req.Mobile,
 	}
 
-	var res member.MobileUniqueRes
+	data, err := service.AdminMember().MobileUnique(ctx, in)
+	if err != nil {
+		return
+	}
+
+	res = new(member.MobileUniqueRes)
 	res.IsUnique = data.IsUnique
-	return &res, nil
+	return
 }
 
 // NameUnique 名称是否唯一
-func (c *cMember) NameUnique(ctx context.Context, req *member.NameUniqueReq) (*member.NameUniqueRes, error) {
-
-	data, err := service.AdminMember().NameUnique(ctx, adminin.MemberNameUniqueInp{Id: req.Id, Username: req.Username})
-	if err != nil {
-		return nil, err
+func (c *cMember) NameUnique(ctx context.Context, req *member.NameUniqueReq) (res *member.NameUniqueRes, err error) {
+	var in = adminin.MemberNameUniqueInp{
+		Id:       req.Id,
+		Username: req.Username,
 	}
 
-	var res member.NameUniqueRes
+	data, err := service.AdminMember().NameUnique(ctx, in)
+	if err != nil {
+		return
+	}
+
+	res = new(member.NameUniqueRes)
 	res.IsUnique = data.IsUnique
-	return &res, nil
+	return
 }
 
 // Delete 删除
 func (c *cMember) Delete(ctx context.Context, req *member.DeleteReq) (res *member.DeleteRes, err error) {
-
 	var in adminin.MemberDeleteInp
 	if err = gconv.Scan(req, &in); err != nil {
-		return nil, err
+		return
 	}
-	if err = service.AdminMember().Delete(ctx, in); err != nil {
-		return nil, err
-	}
-	return res, nil
+
+	err = service.AdminMember().Delete(ctx, in)
+	return
 }
 
 // Edit 修改/新增
 func (c *cMember) Edit(ctx context.Context, req *member.EditReq) (res *member.EditRes, err error) {
-
 	var in adminin.MemberEditInp
 	if err = gconv.Scan(req, &in); err != nil {
-		return nil, err
+		return
 	}
 
 	in.PostIds = req.PostIds
-	if err = service.AdminMember().Edit(ctx, in); err != nil {
-		return nil, err
-	}
-
-	return res, nil
+	err = service.AdminMember().Edit(ctx, in)
+	return
 }
 
 // MaxSort 最大排序
-func (c *cMember) MaxSort(ctx context.Context, req *member.MaxSortReq) (*member.MaxSortRes, error) {
-
-	data, err := service.AdminMember().MaxSort(ctx, adminin.MemberMaxSortInp{Id: req.Id})
+func (c *cMember) MaxSort(ctx context.Context, req *member.MaxSortReq) (res *member.MaxSortRes, err error) {
+	var in = adminin.MemberMaxSortInp{Id: req.Id}
+	data, err := service.AdminMember().MaxSort(ctx, in)
 	if err != nil {
-		return nil, err
+		return
 	}
 
-	var res member.MaxSortRes
+	res = new(member.MaxSortRes)
 	res.Sort = data.Sort
-	return &res, nil
+	return
 }
 
 // View 获取指定信息
-func (c *cMember) View(ctx context.Context, req *member.ViewReq) (*member.ViewRes, error) {
-
-	postsList, _, err := service.AdminPost().List(ctx, adminin.PostListInp{})
+func (c *cMember) View(ctx context.Context, req *member.ViewReq) (res *member.ViewRes, err error) {
+	data, err := service.AdminMember().View(ctx, adminin.MemberViewInp{Id: req.Id})
 	if err != nil {
-		return nil, err
+		return
 	}
 
-	//roleList, _, err := service.AdminRole().List(ctx, adminin.RoleListInp{})
-	//if err != nil {
-	//	return nil, err
-	//}
-
-	var res member.ViewRes
-	res.Posts = postsList
-	//res.Roles = roleList
-
-	if req.Id <= 0 {
-		return &res, err
-	}
-
-	memberInfo, err := service.AdminMember().View(ctx, adminin.MemberViewInp{Id: req.Id})
-	if err != nil {
-		return nil, err
-	}
-
-	res.MemberViewModel = memberInfo
-
-	res.PostIds, err = service.AdminMemberPost().GetMemberByIds(ctx, memberInfo.Id)
-	if err != nil {
-		return nil, err
-	}
-
-	res.RoleIds = []int64{memberInfo.RoleId}
-	res.DeptName, err = service.AdminDept().GetName(ctx, memberInfo.DeptId)
-	if err != nil {
-		return nil, err
-	}
-	return &res, nil
+	res = new(member.ViewRes)
+	res.MemberViewModel = data
+	return
 }
 
 // List 查看列表
-func (c *cMember) List(ctx context.Context, req *member.ListReq) (*member.ListRes, error) {
-
-	var (
-		in  adminin.MemberListInp
-		res member.ListRes
-	)
-
-	if err := gconv.Scan(req, &in); err != nil {
-		return nil, err
+func (c *cMember) List(ctx context.Context, req *member.ListReq) (res *member.ListRes, err error) {
+	var in adminin.MemberListInp
+	if err = gconv.Scan(req, &in); err != nil {
+		return
 	}
 
 	list, totalCount, err := service.AdminMember().List(ctx, in)
 	if err != nil {
-		return nil, err
+		return
 	}
 
+	res = new(member.ListRes)
 	res.List = list
 	res.PageCount = form.CalPageCount(totalCount, req.PerPage)
 	res.Page = req.Page
 	res.PerPage = req.PerPage
-
-	return &res, nil
+	return
 }
 
-// Info 登录用户信息
-func (c *cMember) Info(ctx context.Context, req *member.InfoReq) (res *member.InfoRes, err error) {
-
-	model, err := service.AdminMember().LoginMemberInfo(ctx, req)
+// LoginInfo 登录用户信息
+func (c *cMember) LoginInfo(ctx context.Context, req *member.LoginInfoReq) (res *member.LoginInfoRes, err error) {
+	data, err := service.AdminMember().LoginMemberInfo(ctx)
 	if err != nil {
-		return nil, err
+		return
 	}
 
-	if err = gconv.Scan(model, &res); err != nil {
-		return nil, err
-	}
+	res = new(member.LoginInfoRes)
+	res.LoginMemberInfoModel = data
 	return
 }
 
 // Status 更新状态
 func (c *cMember) Status(ctx context.Context, req *member.StatusReq) (res *member.StatusRes, err error) {
-
 	var in adminin.MemberStatusInp
 	if err = gconv.Scan(req, &in); err != nil {
-		return nil, err
-	}
-	if err = service.AdminMember().Status(ctx, in); err != nil {
-		return nil, err
+		return
 	}
 
-	return res, nil
+	err = service.AdminMember().Status(ctx, in)
+	return
+}
+
+// Select 获取可选的后台用户选项
+func (c *cMember) Select(ctx context.Context, req *member.SelectReq) (res *member.SelectRes, err error) {
+	data, err := service.AdminMember().Select(ctx, adminin.MemberSelectInp{})
+	if err != nil {
+		return
+	}
+
+	res = (*member.SelectRes)(&data)
+	return
 }

server/internal/controller/backend/admin/menu.go

@@ -22,99 +22,67 @@ var (
 type cMenu struct{}
 
 // RoleList 查询角色菜单列表
-func (c *cMenu) RoleList(ctx context.Context, req *menu.RoleListReq) (*menu.RoleListRes, error) {
-
+func (c *cMenu) RoleList(ctx context.Context, req *menu.RoleListReq) (res *menu.RoleListRes, err error) {
 	var in adminin.MenuRoleListInp
-	if err := gconv.Scan(req, &in); err != nil {
-		return nil, err
+	if err = gconv.Scan(req, &in); err != nil {
+		return
 	}
 
 	data, err := service.AdminMenu().RoleList(ctx, in)
 	if err != nil {
-		return nil, err
+		return
 	}
 
-	var res menu.RoleListRes
+	res = new(menu.RoleListRes)
 	res.CheckedKeys = data.CheckedKeys
 	res.Menus = data.Menus
-	return &res, nil
+	return
 }
 
 // SearchList 查询菜单列表
 func (c *cMenu) SearchList(ctx context.Context, req *menu.SearchListReq) (res *menu.SearchListRes, err error) {
-
 	res, err = service.AdminMenu().SearchList(ctx, req)
-	if err != nil {
-		return nil, err
-	}
-	return res, nil
+	return
 }
 
 // MaxSort 最大排序
 func (c *cMenu) MaxSort(ctx context.Context, req *menu.MaxSortReq) (res *menu.MaxSortRes, err error) {
-
 	res, err = service.AdminMenu().MaxSort(ctx, req)
-	if err != nil {
-		return nil, err
-	}
-	return res, nil
+	return
 }
 
 // NameUnique 菜单名称是否唯一
 func (c *cMenu) NameUnique(ctx context.Context, req *menu.NameUniqueReq) (res *menu.NameUniqueRes, err error) {
-
 	res, err = service.AdminMenu().NameUnique(ctx, req)
-	if err != nil {
-		return nil, err
-	}
-	return res, nil
+	return
 }
 
 // CodeUnique 菜单编码是否唯一
 func (c *cMenu) CodeUnique(ctx context.Context, req *menu.CodeUniqueReq) (res *menu.CodeUniqueRes, err error) {
-
 	res, err = service.AdminMenu().CodeUnique(ctx, req)
-	if err != nil {
-		return nil, err
-	}
-	return res, nil
+	return
 }
 
 // Delete 删除
 func (c *cMenu) Delete(ctx context.Context, req *menu.DeleteReq) (res *menu.DeleteRes, err error) {
-
-	if err = service.AdminMenu().Delete(ctx, req); err != nil {
-		return nil, err
-	}
-	return res, nil
+	err = service.AdminMenu().Delete(ctx, req)
+	return
 }
 
 // Edit 更新
 func (c *cMenu) Edit(ctx context.Context, req *menu.EditReq) (res *menu.EditRes, err error) {
-
-	if err = service.AdminMenu().Edit(ctx, req); err != nil {
-		return nil, err
-	}
-	return res, nil
+	err = service.AdminMenu().Edit(ctx, req)
+	return
 }
 
 // View 获取信息
 func (c *cMenu) View(ctx context.Context, req *menu.ViewReq) (res *menu.ViewRes, err error) {
-
 	res, err = service.AdminMenu().View(ctx, req)
-	if err != nil {
-		return nil, err
-	}
-	return res, nil
+	return
 }
 
 // List 获取列表
 func (c *cMenu) List(ctx context.Context, req *menu.ListReq) (res menu.ListRes, err error) {
-
 	res.List, err = service.AdminMenu().List(ctx, req)
-
-	if err != nil {
-		return res, err
-	}
-	return res, nil
+	return
 }

server/internal/controller/backend/admin/monitor.go

@@ -42,24 +42,23 @@ func (c *cMonitor) Offline(ctx context.Context, req *monitor.OfflineReq) (res *m
 		websocket.Close(client)
 	})
 
-	return res, nil
+	return
 }
 
 // View 获取指定信息
-func (c *cMonitor) View(ctx context.Context, req *monitor.OnlineViewReq) (*monitor.OnlineViewRes, error) {
-	return &monitor.OnlineViewRes{}, nil
+func (c *cMonitor) View(ctx context.Context, req *monitor.OnlineViewReq) (res *monitor.OnlineViewRes, err error) {
+	return
 }
 
 // OnlineList 获取在线列表
-func (c *cMonitor) OnlineList(ctx context.Context, req *monitor.OnlineListReq) (*monitor.OnlineListRes, error) {
+func (c *cMonitor) OnlineList(ctx context.Context, req *monitor.OnlineListReq) (res *monitor.OnlineListRes, err error) {
 	var (
-		res     monitor.OnlineListRes
 		clients []*monitor.OnlineModel
 		i       int
 	)
 
 	if c.wsManager.GetClientsLen() == 0 {
-		return &res, nil
+		return
 	}
 
 	for conn, _ := range c.wsManager.GetClients() {
@@ -90,6 +89,7 @@ func (c *cMonitor) OnlineList(ctx context.Context, req *monitor.OnlineListReq) (
 		})
 	}
 
+	res = new(monitor.OnlineListRes)
 	res.PageCount = form.CalPageCount(len(clients), req.PerPage)
 	res.Page = req.Page
 	res.PerPage = req.PerPage
@@ -108,5 +108,5 @@ func (c *cMonitor) OnlineList(ctx context.Context, req *monitor.OnlineListReq) (
 		}
 	}
 
-	return &res, nil
+	return
 }

server/internal/controller/backend/admin/notice.go

@@ -10,6 +10,7 @@ import (
 	"context"
 	"github.com/gogf/gf/v2/util/gconv"
 	"hotgo/api/backend/notice"
+	"hotgo/internal/consts"
 	"hotgo/internal/model/input/adminin"
 	"hotgo/internal/model/input/form"
 	"hotgo/internal/service"
@@ -25,63 +26,53 @@ type cNotice struct{}
 func (c *cNotice) Delete(ctx context.Context, req *notice.DeleteReq) (res *notice.DeleteRes, err error) {
 	var in adminin.NoticeDeleteInp
 	if err = gconv.Scan(req, &in); err != nil {
-		return nil, err
+		return
 	}
-	if err = service.AdminNotice().Delete(ctx, in); err != nil {
-		return nil, err
-	}
-	return res, nil
+
+	err = service.AdminNotice().Delete(ctx, in)
+	return
 }
 
 // Edit 更新
 func (c *cNotice) Edit(ctx context.Context, req *notice.EditReq) (res *notice.EditRes, err error) {
-
 	var in adminin.NoticeEditInp
 	if err = gconv.Scan(req, &in); err != nil {
-		return nil, err
-	}
-	if err = service.AdminNotice().Edit(ctx, in); err != nil {
-		return nil, err
+		return
 	}
 
-	return res, nil
+	in.Receiver = req.Receiver
+	err = service.AdminNotice().Edit(ctx, in)
+	return
 }
 
 // MaxSort 最大排序
-func (c *cNotice) MaxSort(ctx context.Context, req *notice.MaxSortReq) (*notice.MaxSortRes, error) {
-
+func (c *cNotice) MaxSort(ctx context.Context, req *notice.MaxSortReq) (res *notice.MaxSortRes, err error) {
 	data, err := service.AdminNotice().MaxSort(ctx, adminin.NoticeMaxSortInp{Id: req.Id})
 	if err != nil {
-		return nil, err
+		return
 	}
 
-	var res notice.MaxSortRes
+	res = new(notice.MaxSortRes)
 	res.Sort = data.Sort
-	return &res, nil
+	return
 }
 
 // View 获取指定信息
-func (c *cNotice) View(ctx context.Context, req *notice.ViewReq) (*notice.ViewRes, error) {
-
+func (c *cNotice) View(ctx context.Context, req *notice.ViewReq) (res *notice.ViewRes, err error) {
 	data, err := service.AdminNotice().View(ctx, adminin.NoticeViewInp{Id: req.Id})
 	if err != nil {
-		return nil, err
+		return
 	}
 
-	var res notice.ViewRes
+	res = new(notice.ViewRes)
 	res.NoticeViewModel = data
-	return &res, nil
+	return
 }
 
 // List 查看列表
-func (c *cNotice) List(ctx context.Context, req *notice.ListReq) (*notice.ListRes, error) {
-
-	var (
-		in  adminin.NoticeListInp
-		res notice.ListRes
-	)
-
-	if err := gconv.Scan(req, &in); err != nil {
+func (c *cNotice) List(ctx context.Context, req *notice.ListReq) (res *notice.ListRes, err error) {
+	var in adminin.NoticeListInp
+	if err = gconv.Scan(req, &in); err != nil {
 		return nil, err
 	}
 
@@ -90,24 +81,123 @@ func (c *cNotice) List(ctx context.Context, req *notice.ListReq) (*notice.ListRe
 		return nil, err
 	}
 
+	res = new(notice.ListRes)
 	res.List = list
 	res.PageCount = form.CalPageCount(totalCount, req.PerPage)
 	res.Page = req.Page
 	res.PerPage = req.PerPage
-
-	return &res, nil
+	return
 }
 
 // Status 更新部门状态
 func (c *cNotice) Status(ctx context.Context, req *notice.StatusReq) (res *notice.StatusRes, err error) {
-
 	var in adminin.NoticeStatusInp
 	if err = gconv.Scan(req, &in); err != nil {
 		return nil, err
 	}
-	if err = service.AdminNotice().Status(ctx, in); err != nil {
+
+	err = service.AdminNotice().Status(ctx, in)
+	return
+}
+
+// Notify 更新通知
+func (c *cNotice) Notify(ctx context.Context, req *notice.EditNotifyReq) (res *notice.EditNotifyRes, err error) {
+	var in adminin.NoticeEditInp
+	if err = gconv.Scan(req, &in); err != nil {
+		return
+	}
+
+	in.Type = consts.NoticeTypeNotify
+	in.Receiver = req.Receiver
+	err = service.AdminNotice().Edit(ctx, in)
+	return
+}
+
+// Notice 更新公告
+func (c *cNotice) Notice(ctx context.Context, req *notice.EditNoticeReq) (res *notice.EditNoticeRes, err error) {
+	var in adminin.NoticeEditInp
+	if err = gconv.Scan(req, &in); err != nil {
+		return
+	}
+
+	in.Type = consts.NoticeTypeNotice
+	in.Receiver = req.Receiver
+	err = service.AdminNotice().Edit(ctx, in)
+	return
+}
+
+// Letter 更新私信
+func (c *cNotice) Letter(ctx context.Context, req *notice.EditLetterReq) (res *notice.EditLetterRes, err error) {
+	var in adminin.NoticeEditInp
+	if err = gconv.Scan(req, &in); err != nil {
+		return
+	}
+
+	in.Type = consts.NoticeTypeLetter
+	in.Receiver = req.Receiver
+	err = service.AdminNotice().Edit(ctx, in)
+	return
+}
+
+// UpRead 更新已读
+func (c *cNotice) UpRead(ctx context.Context, req *notice.UpReadReq) (res *notice.UpReadRes, err error) {
+	var in adminin.NoticeUpReadInp
+	if err = gconv.Scan(req, &in); err != nil {
 		return nil, err
 	}
 
+	err = service.AdminNotice().UpRead(ctx, in)
 	return res, nil
 }
+
+// PullMessages 拉取未读消息列表
+func (c *cNotice) PullMessages(ctx context.Context, req *notice.PullMessagesReq) (res *notice.PullMessagesRes, err error) {
+	var in adminin.PullMessagesInp
+	if err = gconv.Scan(req, &in); err != nil {
+		return
+	}
+
+	if in.Limit == 0 {
+		in.Limit = 100
+	}
+
+	data, err := service.AdminNotice().PullMessages(ctx, in)
+	if err != nil {
+		return
+	}
+
+	res = new(notice.PullMessagesRes)
+	res.PullMessagesModel = data
+	return
+}
+
+// ReadAll 全部已读
+func (c *cNotice) ReadAll(ctx context.Context, req *notice.ReadAllReq) (res *notice.ReadAllRes, err error) {
+	var in adminin.NoticeReadAllInp
+	if err = gconv.Scan(req, &in); err != nil {
+		return
+	}
+
+	err = service.AdminNotice().ReadAll(ctx, in)
+	return
+}
+
+// MessageList 我的消息列表
+func (c *cNotice) MessageList(ctx context.Context, req *notice.MessageListReq) (res *notice.MessageListRes, err error) {
+	var in adminin.NoticeMessageListInp
+	if err = gconv.Scan(req, &in); err != nil {
+		return
+	}
+
+	list, totalCount, err := service.AdminNotice().MessageList(ctx, in)
+	if err != nil {
+		return
+	}
+
+	res = new(notice.MessageListRes)
+	res.List = list
+	res.PageCount = form.CalPageCount(totalCount, req.PerPage)
+	res.Page = req.Page
+	res.PerPage = req.PerPage
+	return
+}

server/internal/controller/backend/admin/post.go

@@ -24,117 +24,99 @@ type cPost struct{}
 func (c *cPost) Delete(ctx context.Context, req *post.DeleteReq) (res *post.DeleteRes, err error) {
 	var in adminin.PostDeleteInp
 	if err = gconv.Scan(req, &in); err != nil {
-		return nil, err
-	}
-	if err = service.AdminPost().Delete(ctx, in); err != nil {
-		return nil, err
+		return
 	}
+
+	err = service.AdminPost().Delete(ctx, in)
 	return res, nil
 }
 
 // Edit 修改/新增
 func (c *cPost) Edit(ctx context.Context, req *post.EditReq) (res *post.EditRes, err error) {
-
 	var in adminin.PostEditInp
 	if err = gconv.Scan(req, &in); err != nil {
-		return nil, err
-	}
-	if err = service.AdminPost().Edit(ctx, in); err != nil {
-		return nil, err
+		return
 	}
 
-	return res, nil
+	err = service.AdminPost().Edit(ctx, in)
+	return
 }
 
 // MaxSort 最大排序
-func (c *cPost) MaxSort(ctx context.Context, req *post.MaxSortReq) (*post.MaxSortRes, error) {
-
+func (c *cPost) MaxSort(ctx context.Context, req *post.MaxSortReq) (res *post.MaxSortRes, err error) {
 	data, err := service.AdminPost().MaxSort(ctx, adminin.PostMaxSortInp{Id: req.Id})
 	if err != nil {
-		return nil, err
+		return
 	}
 
-	var res post.MaxSortRes
+	res = new(post.MaxSortRes)
 	res.Sort = data.Sort
-	return &res, nil
+	return
 }
 
 // NameUnique 名称是否唯一
-func (c *cPost) NameUnique(ctx context.Context, req *post.NameUniqueReq) (*post.NameUniqueRes, error) {
-
+func (c *cPost) NameUnique(ctx context.Context, req *post.NameUniqueReq) (res *post.NameUniqueRes, err error) {
 	data, err := service.AdminPost().NameUnique(ctx, adminin.PostNameUniqueInp{Id: req.Id, Name: req.Name})
 	if err != nil {
-		return nil, err
+		return
 	}
 
-	var res post.NameUniqueRes
+	res = new(post.NameUniqueRes)
 	res.IsUnique = data.IsUnique
-	return &res, nil
+	return
 }
 
 // CodeUnique 编码是否唯一
-func (c *cPost) CodeUnique(ctx context.Context, req *post.CodeUniqueReq) (*post.CodeUniqueRes, error) {
-
+func (c *cPost) CodeUnique(ctx context.Context, req *post.CodeUniqueReq) (res *post.CodeUniqueRes, err error) {
 	data, err := service.AdminPost().CodeUnique(ctx, adminin.PostCodeUniqueInp{Id: req.Id, Code: req.Code})
 	if err != nil {
 		return nil, err
 	}
 
-	var res post.CodeUniqueRes
+	res = new(post.CodeUniqueRes)
 	res.IsUnique = data.IsUnique
-	return &res, nil
+	return
 }
 
 // View 获取指定信息
-func (c *cPost) View(ctx context.Context, req *post.ViewReq) (*post.ViewRes, error) {
-
+func (c *cPost) View(ctx context.Context, req *post.ViewReq) (res *post.ViewRes, err error) {
 	data, err := service.AdminPost().View(ctx, adminin.PostViewInp{Id: req.Id})
 	if err != nil {
-		return nil, err
+		return
 	}
 
-	var res post.ViewRes
+	res = new(post.ViewRes)
 	res.PostViewModel = data
-	return &res, nil
+	return
 }
 
 // List 获取列表
-func (c *cPost) List(ctx context.Context, req *post.ListReq) (*post.ListRes, error) {
+func (c *cPost) List(ctx context.Context, req *post.ListReq) (res *post.ListRes, err error) {
 	var in adminin.PostListInp
-	if err := gconv.Scan(req, &in); err != nil {
-		return nil, err
-	}
-	//adminin.PostListInp{
-	//	Page:    req.Page,
-	//	PerPage: req.PerPage,
-	//	Name:    req.Name,
-	//	Code:    req.Code,
-	//	Status:  req.Status,
-	//}
-	list, totalCount, err := service.AdminPost().List(ctx, in)
-	if err != nil {
-		return nil, err
+	if err = gconv.Scan(req, &in); err != nil {
+		return
 	}
 
-	var res post.ListRes
+	list, totalCount, err := service.AdminPost().List(ctx, in)
+	if err != nil {
+		return
+	}
+
+	res = new(post.ListRes)
 	res.List = list
 	res.PageCount = form.CalPageCount(totalCount, req.PerPage)
 	res.Page = req.Page
 	res.PerPage = req.PerPage
-
-	return &res, nil
+	return
 }
 
 // Status 更新状态
 func (c *cPost) Status(ctx context.Context, req *post.StatusReq) (res *post.StatusRes, err error) {
-
 	var in adminin.PostStatusInp
 	if err = gconv.Scan(req, &in); err != nil {
-		return nil, err
-	}
-	if err = service.AdminPost().Status(ctx, in); err != nil {
-		return nil, err
+		return
 	}
 
-	return res, nil
+	err = service.AdminPost().Status(ctx, in)
+	return
 }

server/internal/controller/backend/admin/role.go

@@ -22,73 +22,61 @@ var (
 
 type cRole struct{}
 
-// RoleMemberList 获取角色下的会员列表
-func (c *cRole) RoleMemberList(ctx context.Context, req *role.MemberListReq) (*role.MemberListRes, error) {
-
+// RoleMemberList 获取角色下的用户列表
+func (c *cRole) RoleMemberList(ctx context.Context, req *role.MemberListReq) (res *role.MemberListRes, err error) {
 	var in adminin.RoleMemberListInp
-	if err := gconv.Scan(req, &in); err != nil {
-		return nil, err
+	if err = gconv.Scan(req, &in); err != nil {
+		return
 	}
+
 	list, totalCount, err := service.AdminMember().RoleMemberList(ctx, in)
 	if err != nil {
-		return nil, err
+		return
 	}
 
-	var res role.MemberListRes
+	res = new(role.MemberListRes)
 	res.List = list
 	res.PageCount = form.CalPageCount(totalCount, req.PerPage)
 	res.PerPage = req.Page
 	res.PerPage = req.PerPage
-
-	return &res, nil
+	return
 }
 
 // List 获取列表
-func (c *cRole) List(ctx context.Context, req *role.ListReq) (*role.ListRes, error) {
+func (c *cRole) List(ctx context.Context, req *role.ListReq) (res *role.ListRes, err error) {
 	var in adminin.RoleListInp
-	if err := gconv.Scan(req, &in); err != nil {
-		return nil, err
-	}
-	list, totalCount, err := service.AdminRole().List(ctx, in)
-	if err != nil {
-		return nil, err
+	if err = gconv.Scan(req, &in); err != nil {
+		return
 	}
 
-	var res role.ListRes
+	list, totalCount, err := service.AdminRole().List(ctx, in)
+	if err != nil {
+		return
+	}
+
+	res = new(role.ListRes)
 	res.List = list
 	res.PageCount = form.CalPageCount(totalCount, req.PerPage)
 	res.Page = req.Page
 	res.PerPage = req.PerPage
-
-	return &res, nil
+	return
 }
 
 // Edit 修改角色
 func (c *cRole) Edit(ctx context.Context, req *role.EditReq) (res *role.EditRes, err error) {
 	err = service.AdminRole().Edit(ctx, req)
-	if err != nil {
-		return nil, err
-	}
-	return res, nil
+	return
 }
 
 // Delete 删除
 func (c *cRole) Delete(ctx context.Context, req *role.DeleteReq) (res *role.DeleteRes, err error) {
-
-	if err = service.AdminRole().Delete(ctx, req); err != nil {
-		return nil, err
-	}
-	return res, nil
+	err = service.AdminRole().Delete(ctx, req)
+	return
 }
 
 // Dynamic 动态路由
 func (c *cRole) Dynamic(ctx context.Context, req *role.DynamicReq) (res role.DynamicRes, err error) {
-
-	res, err = service.AdminMenu().GetMenuList(ctx, contexts.GetUserId(ctx))
-	if err != nil {
-		return res, err
-	}
-	return res, nil
+	return service.AdminMenu().GetMenuList(ctx, contexts.GetUserId(ctx))
 }
 
 // GetPermissions 获取指定角色权限
@@ -97,23 +85,21 @@ func (c *cRole) GetPermissions(ctx context.Context, req *role.GetPermissionsReq)
 	if err != nil {
 		return nil, err
 	}
+
 	res = &role.GetPermissionsRes{
 		MenuIds: []int64{},
 	}
+
 	if MenuIds != nil {
 		res.MenuIds = MenuIds
 	}
-
 	return res, nil
 }
 
 // UpdatePermissions 修改角色菜单权限
 func (c *cRole) UpdatePermissions(ctx context.Context, req *role.UpdatePermissionsReq) (res *role.UpdatePermissionsRes, err error) {
 	err = service.AdminRole().UpdatePermissions(ctx, req)
-	if err != nil {
-		return nil, err
-	}
-	return res, nil
+	return
 }
 
 // DataScopeSelect 获取数据权限选项
@@ -121,21 +107,17 @@ func (c *cRole) DataScopeSelect(ctx context.Context, req *role.DataScopeSelectRe
 	data := service.AdminRole().DataScopeSelect(ctx)
 	res = new(role.DataScopeSelectRes)
 	res.List = data
-	return res, nil
+	return
 }
 
 // DataScopeEdit 获取数据权限选项
 func (c *cRole) DataScopeEdit(ctx context.Context, req *role.DataScopeEditReq) (res *role.DataScopeEditRes, err error) {
 	var in adminin.DataScopeEditInp
 	if err = gconv.Scan(req, &in); err != nil {
-		return nil, err
+		return
 	}
 
 	in.CustomDept = req.CustomDept
 	err = service.AdminRole().DataScopeEdit(ctx, &in)
-	if err != nil {
-		return nil, err
-	}
-
-	return res, nil
+	return
 }

server/internal/controller/backend/admin/test.go

@@ -26,16 +26,16 @@ type cTest struct{}
 func (c *cTest) List(ctx context.Context, req *test.ListReq) (res *test.ListRes, err error) {
 	var in adminin.TestListInp
 	if err = gconv.Scan(req, &in); err != nil {
-		return nil, err
+		return
 	}
 
 	if err = validate.PreFilter(ctx, &in); err != nil {
-		return nil, err
+		return
 	}
 
 	list, totalCount, err := service.AdminTest().List(ctx, in)
 	if err != nil {
-		return nil, err
+		return
 	}
 
 	res = new(test.ListRes)
@@ -43,102 +43,93 @@ func (c *cTest) List(ctx context.Context, req *test.ListReq) (res *test.ListRes,
 	res.PageCount = form.CalPageCount(totalCount, req.PerPage)
 	res.Page = req.Page
 	res.PerPage = req.PerPage
-	return res, nil
+	return
 }
 
 // Export 导出列表
 func (c *cTest) Export(ctx context.Context, req *test.ExportReq) (res *test.ExportRes, err error) {
 	var in adminin.TestListInp
 	if err = gconv.Scan(req, &in); err != nil {
-		return nil, err
+		return
 	}
-	if err = service.AdminTest().Export(ctx, in); err != nil {
-		return nil, err
-	}
-	return res, nil
+
+	err = service.AdminTest().Export(ctx, in)
+	return
 }
 
 // Edit 更新
 func (c *cTest) Edit(ctx context.Context, req *test.EditReq) (res *test.EditRes, err error) {
 	var in adminin.TestEditInp
 	if err = gconv.Scan(req, &in); err != nil {
-		return nil, err
+		return
 	}
 
 	if err = validate.PreFilter(ctx, &in); err != nil {
-		return nil, err
+		return
 	}
-	if err = service.AdminTest().Edit(ctx, in); err != nil {
-		return nil, err
-	}
-	return res, nil
+
+	err = service.AdminTest().Edit(ctx, in)
+	return
 }
 
 // MaxSort 最大排序
 func (c *cTest) MaxSort(ctx context.Context, req *test.MaxSortReq) (res *test.MaxSortRes, err error) {
 	data, err := service.AdminTest().MaxSort(ctx, adminin.TestMaxSortInp{})
 	if err != nil {
-		return nil, err
+		return
 	}
 
 	res = new(test.MaxSortRes)
 	res.TestMaxSortModel = data
-	return res, nil
+	return
 }
 
 // View 获取指定信息
 func (c *cTest) View(ctx context.Context, req *test.ViewReq) (res *test.ViewRes, err error) {
 	var in adminin.TestViewInp
 	if err = gconv.Scan(req, &in); err != nil {
-		return nil, err
+		return
 	}
 
 	data, err := service.AdminTest().View(ctx, in)
 	if err != nil {
-		return nil, err
+		return
 	}
 
 	res = new(test.ViewRes)
 	res.TestViewModel = data
-	return res, nil
+	return
 }
 
 // Delete 删除
 func (c *cTest) Delete(ctx context.Context, req *test.DeleteReq) (res *test.DeleteRes, err error) {
 	var in adminin.TestDeleteInp
 	if err = gconv.Scan(req, &in); err != nil {
-		return nil, err
+		return
 	}
 
-	if err = service.AdminTest().Delete(ctx, in); err != nil {
-		return nil, err
-	}
-	return res, nil
+	err = service.AdminTest().Delete(ctx, in)
+	return
 }
 
 // Status 更新状态
 func (c *cTest) Status(ctx context.Context, req *test.StatusReq) (res *test.StatusRes, err error) {
 	var in adminin.TestStatusInp
 	if err = gconv.Scan(req, &in); err != nil {
-		return nil, err
+		return
 	}
 
-	if err = service.AdminTest().Status(ctx, in); err != nil {
-		return nil, err
-	}
-	return res, nil
+	err = service.AdminTest().Status(ctx, in)
+	return
 }
 
 // Switch 更新开关状态
 func (c *cTest) Switch(ctx context.Context, req *test.SwitchReq) (res *test.SwitchRes, err error) {
 	var in adminin.TestSwitchInp
 	if err = gconv.Scan(req, &in); err != nil {
-		return nil, err
+		return
 	}
 
-	if err = service.AdminTest().Switch(ctx, in); err != nil {
-		return nil, err
-	}
-
-	return res, nil
+	err = service.AdminTest().Switch(ctx, in)
+	return
 }