github_mirrors/hotgo
1
0
Fork 0
mirror of https://github.com/bufanyun/hotgo.git synced 2025-08-28 05:12:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

发布v2.8.4版本，更新内容请查看：https://github.com/bufanyun/hotgo/tree/v2.0/docs/guide-zh-CN/addon-version-upgrade.md

Browse Source
This commit is contained in:
孟帅
2023-07-20 18:01:10 +08:00
parent 9113fc5297
commit 373d9627fb
492 changed files with 12170 additions and 6982 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
server/internal/logic/admin/cash.go
View File

@@ -36,7 +36,7 @@ func init() {
}
// View 获取指定提现信息
func (s *sAdminCash) View(ctx context.Context, in adminin.CashViewInp) (res *adminin.CashViewModel, err error) {
func (s *sAdminCash) View(ctx context.Context, in *adminin.CashViewInp) (res *adminin.CashViewModel, err error) {
if !service.AdminMember().VerifySuperId(ctx, contexts.GetUserId(ctx)) {
err = gerror.New("没有访问权限")
return
@@ -68,7 +68,7 @@ func (s *sAdminCash) View(ctx context.Context, in adminin.CashViewInp) (res *adm
}
// List 获取列表
func (s *sAdminCash) List(ctx context.Context, in adminin.CashListInp) (list []*adminin.CashListModel, totalCount int, err error) {
func (s *sAdminCash) List(ctx context.Context, in *adminin.CashListInp) (list []*adminin.CashListModel, totalCount int, err error) {
var (
mod = dao.AdminCash.Ctx(ctx)
opMemberId = contexts.GetUserId(ctx)
@@ -109,9 +109,7 @@ func (s *sAdminCash) List(ctx context.Context, in adminin.CashListInp) (list []*
for _, v := range list {
var member *entity.AdminMember
err = dao.AdminMember.Ctx(ctx).
Fields("real_name", "username").Where("id", v.MemberId).Scan(&member)
if err != nil {
if err = dao.AdminMember.Ctx(ctx).Fields("real_name", "username").Where("id", v.MemberId).Scan(&member); err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return list, totalCount, err
}
@@ -125,7 +123,7 @@ func (s *sAdminCash) List(ctx context.Context, in adminin.CashListInp) (list []*
}
// Apply 申请提现
func (s *sAdminCash) Apply(ctx context.Context, in adminin.CashApplyInp) (err error) {
func (s *sAdminCash) Apply(ctx context.Context, in *adminin.CashApplyInp) (err error) {
var (
config *model.CashConfig
member *entity.AdminMember
@@ -185,7 +183,7 @@ func (s *sAdminCash) Apply(ctx context.Context, in adminin.CashApplyInp) (err er
return
}
conf, err := service.SysConfig().GetConfigByGroup(ctx, sysin.GetConfigInp{Group: "cash"})
conf, err := service.SysConfig().GetConfigByGroup(ctx, &sysin.GetConfigInp{Group: "cash"})
if err != nil {
return
}
@@ -232,7 +230,7 @@ func (s *sAdminCash) Apply(ctx context.Context, in adminin.CashApplyInp) (err er
}
// 更新余额
_, err = service.AdminCreditsLog().SaveBalance(ctx, adminin.CreditsLogSaveBalanceInp{
_, err = service.AdminCreditsLog().SaveBalance(ctx, &adminin.CreditsLogSaveBalanceInp{
MemberId: in.MemberId,
AppId: contexts.GetModule(ctx),
AddonsName: contexts.GetAddonName(ctx),
@@ -253,7 +251,7 @@ func (s *sAdminCash) Apply(ctx context.Context, in adminin.CashApplyInp) (err er
}
// Payment 提现打款处理
func (s *sAdminCash) Payment(ctx context.Context, in adminin.CashPaymentInp) (err error) {
func (s *sAdminCash) Payment(ctx context.Context, in *adminin.CashPaymentInp) (err error) {
if !service.AdminMember().VerifySuperId(ctx, contexts.GetUserId(ctx)) {
err = gerror.New("没有访问权限")
return

13
server/internal/logic/admin/credits_log.go
View File

@@ -20,6 +20,7 @@ import (
"hotgo/internal/service"
"hotgo/utility/convert"
"hotgo/utility/excel"
"hotgo/utility/validate"
"github.com/gogf/gf/v2/database/gdb"
"github.com/gogf/gf/v2/os/gctx"
@@ -42,8 +43,8 @@ func (s *sAdminCreditsLog) Model(ctx context.Context, option ...*handler.Option)
}
// SaveBalance 更新余额
func (s *sAdminCreditsLog) SaveBalance(ctx context.Context, in adminin.CreditsLogSaveBalanceInp) (res *adminin.CreditsLogSaveBalanceModel, err error) {
if err = in.Filter(ctx); err != nil {
func (s *sAdminCreditsLog) SaveBalance(ctx context.Context, in *adminin.CreditsLogSaveBalanceInp) (res *adminin.CreditsLogSaveBalanceModel, err error) {
if err = validate.PreFilter(ctx, in); err != nil {
return
}
@@ -101,8 +102,8 @@ func (s *sAdminCreditsLog) SaveBalance(ctx context.Context, in adminin.CreditsLo
}
// SaveIntegral 更新积分
func (s *sAdminCreditsLog) SaveIntegral(ctx context.Context, in adminin.CreditsLogSaveIntegralInp) (res *adminin.CreditsLogSaveIntegralModel, err error) {
if err = in.Filter(ctx); err != nil {
func (s *sAdminCreditsLog) SaveIntegral(ctx context.Context, in *adminin.CreditsLogSaveIntegralInp) (res *adminin.CreditsLogSaveIntegralModel, err error) {
if err = validate.PreFilter(ctx, in); err != nil {
return
}
@@ -160,7 +161,7 @@ func (s *sAdminCreditsLog) SaveIntegral(ctx context.Context, in adminin.CreditsL
}
// List 获取资产变动列表
func (s *sAdminCreditsLog) List(ctx context.Context, in adminin.CreditsLogListInp) (list []*adminin.CreditsLogListModel, totalCount int, err error) {
func (s *sAdminCreditsLog) List(ctx context.Context, in *adminin.CreditsLogListInp) (list []*adminin.CreditsLogListModel, totalCount int, err error) {
mod := s.Model(ctx)
// 查询变动ID
@@ -222,7 +223,7 @@ func (s *sAdminCreditsLog) List(ctx context.Context, in adminin.CreditsLogListIn
}
// Export 导出资产变动
func (s *sAdminCreditsLog) Export(ctx context.Context, in adminin.CreditsLogListInp) (err error) {
func (s *sAdminCreditsLog) Export(ctx context.Context, in *adminin.CreditsLogListInp) (err error) {
list, totalCount, err := s.List(ctx, in)
if err != nil {
return

120
server/internal/logic/admin/dept.go
View File

@@ -33,7 +33,7 @@ func init() {
}
// Delete 删除
func (s *sAdminDept) Delete(ctx context.Context, in adminin.DeptDeleteInp) (err error) {
func (s *sAdminDept) Delete(ctx context.Context, in *adminin.DeptDeleteInp) (err error) {
var models *entity.AdminDept
if err = dao.AdminDept.Ctx(ctx).Where("id", in.Id).Scan(&models); err != nil {
return err
@@ -56,12 +56,49 @@ func (s *sAdminDept) Delete(ctx context.Context, in adminin.DeptDeleteInp) (err
return
}
// Edit 修改/新增
func (s *sAdminDept) Edit(ctx context.Context, in adminin.DeptEditInp) (err error) {
if err = hgorm.IsUnique(ctx, &dao.AdminDept, g.Map{dao.AdminDept.Columns().Name: in.Name}, "名称已存在", in.Id); err != nil {
// VerifyUnique 验证部门唯一属性
func (s *sAdminDept) VerifyUnique(ctx context.Context, in *adminin.VerifyUniqueInp) (err error) {
if in.Where == nil {
return
}
cols := dao.AdminDept.Columns()
msgMap := g.MapStrStr{
cols.Name: "部门名称已存在，请换一个",
cols.Code: "部门编码已存在，请换一个",
}
for k, v := range in.Where {
if v == "" {
continue
}
message, ok := msgMap[k]
if !ok {
err = gerror.Newf("字段 [ %v ] 未配置唯一属性验证", k)
return
}
if err = hgorm.IsUnique(ctx, &dao.AdminDept, g.Map{k: v}, message, in.Id); err != nil {
return
}
}
return
}
// Edit 修改/新增
func (s *sAdminDept) Edit(ctx context.Context, in *adminin.DeptEditInp) (err error) {
// 验证唯一性
err = s.VerifyUnique(ctx, &adminin.VerifyUniqueInp{
Id: in.Id,
Where: g.Map{
dao.AdminDept.Columns().Name: in.Name,
dao.AdminDept.Columns().Code: in.Code,
},
})
if err != nil {
return
}
// 生成下级关系树
if in.Pid, in.Level, in.Tree, err = hgorm.GenSubTree(ctx, &dao.AdminDept, in.Pid); err != nil {
return
}
@@ -70,7 +107,7 @@ func (s *sAdminDept) Edit(ctx context.Context, in adminin.DeptEditInp) (err erro
if in.Id > 0 {
// 获取父级tree
var pTree gdb.Value
pTree, err = dao.AdminDept.Ctx(ctx).Where("id", in.Pid).Fields("tree").Value()
pTree, err = dao.AdminDept.Ctx(ctx).WherePri(in.Pid).Fields("tree").Value()
if err != nil {
return
}
@@ -115,7 +152,7 @@ func updateChildrenTree(ctx context.Context, _id int64, _level int, _tree string
}
// Status 更新部门状态
func (s *sAdminDept) Status(ctx context.Context, in adminin.DeptStatusInp) (err error) {
func (s *sAdminDept) Status(ctx context.Context, in *adminin.DeptStatusInp) (err error) {
if _, err = dao.AdminDept.Ctx(ctx).Where("id", in.Id).Data("status", in.Status).Update(); err != nil {
err = gerror.Wrap(err, "更新部门状态失败！")
}
@@ -123,7 +160,7 @@ func (s *sAdminDept) Status(ctx context.Context, in adminin.DeptStatusInp) (err
}
// MaxSort 最大排序
func (s *sAdminDept) MaxSort(ctx context.Context, in adminin.DeptMaxSortInp) (res *adminin.DeptMaxSortModel, err error) {
func (s *sAdminDept) MaxSort(ctx context.Context, in *adminin.DeptMaxSortInp) (res *adminin.DeptMaxSortModel, err error) {
if in.Id > 0 {
if err = dao.AdminDept.Ctx(ctx).Where("id", in.Id).Order("sort desc").Scan(&res); err != nil {
err = gerror.Wrap(err, "获取部门数据异常！")
@@ -135,12 +172,12 @@ func (s *sAdminDept) MaxSort(ctx context.Context, in adminin.DeptMaxSortInp) (re
res = new(adminin.DeptMaxSortModel)
}
res.Sort = form.DefaultMaxSort(ctx, res.Sort)
res.Sort = form.DefaultMaxSort(res.Sort)
return
}
// View 获取指定部门信息
func (s *sAdminDept) View(ctx context.Context, in adminin.DeptViewInp) (res *adminin.DeptViewModel, err error) {
func (s *sAdminDept) View(ctx context.Context, in *adminin.DeptViewInp) (res *adminin.DeptViewModel, err error) {
if err = dao.AdminDept.Ctx(ctx).Where("id", in.Id).Scan(&res); err != nil {
err = gerror.Wrap(err, "获取部门信息失败！")
}
@@ -148,7 +185,7 @@ func (s *sAdminDept) View(ctx context.Context, in adminin.DeptViewInp) (res *adm
}
// Option 选项
func (s *sAdminDept) Option(ctx context.Context, in adminin.DeptOptionInp) (res *adminin.DeptOptionModel, totalCount int, err error) {
func (s *sAdminDept) Option(ctx context.Context, in *adminin.DeptOptionInp) (res *adminin.DeptOptionModel, totalCount int, err error) {
var (
mod = dao.AdminDept.Ctx(ctx)
models []*entity.AdminDept
@@ -180,43 +217,72 @@ func (s *sAdminDept) Option(ctx context.Context, in adminin.DeptOptionInp) (res
}
// List 获取列表
func (s *sAdminDept) List(ctx context.Context, in adminin.DeptListInp) (res *adminin.DeptListModel, err error) {
func (s *sAdminDept) List(ctx context.Context, in *adminin.DeptListInp) (res *adminin.DeptListModel, err error) {
var (
mod = dao.AdminDept.Ctx(ctx)
cols = dao.AdminDept.Columns()
models []*entity.AdminDept
ids []int64
pids []int64
)
// 部门名称
if in.Name != "" {
columns, err := dao.AdminDept.Ctx(ctx).Fields("pid").WhereLike("name", "%"+in.Name+"%").Array()
if err != nil {
err = gerror.Wrap(err, "过滤部门列表失败-1！")
return nil, err
}
appends := func(columns []gdb.Value) {
ds := g.NewVar(columns).Int64s()
ids = append(ids, ds...)
pids = append(pids, ds...)
if len(ids) == 0 {
}
// 部门名称
if in.Name != "" {
columns, err := dao.AdminDept.Ctx(ctx).Fields(cols.Pid).WhereLike(cols.Name, "%"+in.Name+"%").Array()
if err != nil {
err = gerror.Wrap(err, "查询部门名称失败！")
return nil, err
}
if len(columns) == 0 {
return nil, nil
}
appends(columns)
}
if in.Code != "" {
columns, err := dao.AdminDept.Ctx(ctx).Fields("pid").WhereLike("code", "%"+in.Code+"%").Array()
columns, err := dao.AdminDept.Ctx(ctx).Fields(cols.Pid).WhereLike(cols.Code, "%"+in.Code+"%").Array()
if err != nil {
err = gerror.Wrap(err, "过滤部门列表失败-2！")
err = gerror.Wrap(err, "查询部门编码失败！")
return nil, err
}
ds := g.NewVar(columns).Int64s()
ids = append(ids, ds...)
pids = append(pids, ds...)
if len(ids) == 0 {
if len(columns) == 0 {
return nil, nil
}
appends(columns)
}
if in.Leader != "" {
columns, err := dao.AdminDept.Ctx(ctx).Fields(cols.Pid).Where(cols.Leader, in.Leader).Array()
if err != nil {
err = gerror.Wrap(err, "查询负责人失败！")
return nil, err
}
if len(columns) == 0 {
return nil, nil
}
appends(columns)
}
if len(in.CreatedAt) == 2 {
columns, err := dao.AdminDept.Ctx(ctx).Fields(cols.Pid).WhereBetween(cols.CreatedAt, in.CreatedAt[0], in.CreatedAt[1]).Array()
if err != nil {
err = gerror.Wrap(err, "查询创建时间失败！")
return nil, err
}
if len(columns) == 0 {
return nil, nil
}
appends(columns)
}
if len(ids) > 0 {
@@ -224,7 +290,7 @@ func (s *sAdminDept) List(ctx context.Context, in adminin.DeptListInp) (res *adm
}
if err = mod.Order("pid asc,sort asc").Scan(&models); err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
err = gerror.Wrap(err, "获取部门列表失败！")
return
}

118
server/internal/logic/admin/member.go
View File

@@ -28,12 +28,24 @@ import (
"hotgo/internal/service"
"hotgo/utility/tree"
"hotgo/utility/validate"
"sync"
)
type sAdminMember struct{}
// SuperAdmin 超级管理员用户
type SuperAdmin struct {
sync.RWMutex
RoleId int64 // 超管角色ID
MemberIds map[int64]struct{} // 超管用户ID
}
type sAdminMember struct {
superAdmin *SuperAdmin
}
func NewAdminMember() *sAdminMember {
return &sAdminMember{}
return &sAdminMember{
superAdmin: new(SuperAdmin),
}
}
func init() {
@@ -41,7 +53,7 @@ func init() {
}
// AddBalance 增加余额
func (s *sAdminMember) AddBalance(ctx context.Context, in adminin.MemberAddBalanceInp) (err error) {
func (s *sAdminMember) AddBalance(ctx context.Context, in *adminin.MemberAddBalanceInp) (err error) {
var (
mb *entity.AdminMember
memberId = contexts.GetUserId(ctx)
@@ -59,7 +71,7 @@ func (s *sAdminMember) AddBalance(ctx context.Context, in adminin.MemberAddBalan
return g.DB().Transaction(ctx, func(ctx context.Context, tx gdb.TX) (err error) {
// 更新我的余额
_, err = service.AdminCreditsLog().SaveBalance(ctx, adminin.CreditsLogSaveBalanceInp{
_, err = service.AdminCreditsLog().SaveBalance(ctx, &adminin.CreditsLogSaveBalanceInp{
MemberId: memberId,
AppId: in.AppId,
AddonsName: in.AddonsName,
@@ -72,7 +84,7 @@ func (s *sAdminMember) AddBalance(ctx context.Context, in adminin.MemberAddBalan
}
// 更新对方余额
_, err = service.AdminCreditsLog().SaveBalance(ctx, adminin.CreditsLogSaveBalanceInp{
_, err = service.AdminCreditsLog().SaveBalance(ctx, &adminin.CreditsLogSaveBalanceInp{
MemberId: mb.Id,
AppId: in.AppId,
AddonsName: in.AddonsName,
@@ -85,7 +97,7 @@ func (s *sAdminMember) AddBalance(ctx context.Context, in adminin.MemberAddBalan
}
// AddIntegral 增加积分
func (s *sAdminMember) AddIntegral(ctx context.Context, in adminin.MemberAddIntegralInp) (err error) {
func (s *sAdminMember) AddIntegral(ctx context.Context, in *adminin.MemberAddIntegralInp) (err error) {
var (
mb *entity.AdminMember
memberId = contexts.GetUserId(ctx)
@@ -103,7 +115,7 @@ func (s *sAdminMember) AddIntegral(ctx context.Context, in adminin.MemberAddInte
return g.DB().Transaction(ctx, func(ctx context.Context, tx gdb.TX) (err error) {
// 更新我的余额
_, err = service.AdminCreditsLog().SaveIntegral(ctx, adminin.CreditsLogSaveIntegralInp{
_, err = service.AdminCreditsLog().SaveIntegral(ctx, &adminin.CreditsLogSaveIntegralInp{
MemberId: memberId,
AppId: in.AppId,
AddonsName: in.AddonsName,
@@ -116,7 +128,7 @@ func (s *sAdminMember) AddIntegral(ctx context.Context, in adminin.MemberAddInte
}
// 更新对方余额
_, err = service.AdminCreditsLog().SaveIntegral(ctx, adminin.CreditsLogSaveIntegralInp{
_, err = service.AdminCreditsLog().SaveIntegral(ctx, &adminin.CreditsLogSaveIntegralInp{
MemberId: mb.Id,
AppId: in.AppId,
AddonsName: in.AddonsName,
@@ -129,7 +141,7 @@ func (s *sAdminMember) AddIntegral(ctx context.Context, in adminin.MemberAddInte
}
// UpdateCash 修改提现信息
func (s *sAdminMember) UpdateCash(ctx context.Context, in adminin.MemberUpdateCashInp) (err error) {
func (s *sAdminMember) UpdateCash(ctx context.Context, in *adminin.MemberUpdateCashInp) (err error) {
memberId := contexts.Get(ctx).User.Id
if memberId <= 0 {
err = gerror.New("获取用户信息失败！")
@@ -165,7 +177,7 @@ func (s *sAdminMember) UpdateCash(ctx context.Context, in adminin.MemberUpdateCa
}
// UpdateEmail 换绑邮箱
func (s *sAdminMember) UpdateEmail(ctx context.Context, in adminin.MemberUpdateEmailInp) (err error) {
func (s *sAdminMember) UpdateEmail(ctx context.Context, in *adminin.MemberUpdateEmailInp) (err error) {
memberId := contexts.Get(ctx).User.Id
if memberId <= 0 {
err = gerror.New("获取用户信息失败！")
@@ -195,7 +207,7 @@ func (s *sAdminMember) UpdateEmail(ctx context.Context, in adminin.MemberUpdateE
// 存在原绑定号码，需要进行验证
if mb.Email != "" {
err = service.SysEmsLog().VerifyCode(ctx, sysin.VerifyEmsCodeInp{
err = service.SysEmsLog().VerifyCode(ctx, &sysin.VerifyEmsCodeInp{
Event: consts.EmsTemplateBind,
Email: mb.Email,
Code: in.Code,
@@ -217,7 +229,7 @@ func (s *sAdminMember) UpdateEmail(ctx context.Context, in adminin.MemberUpdateE
}
// UpdateMobile 换绑手机号
func (s *sAdminMember) UpdateMobile(ctx context.Context, in adminin.MemberUpdateMobileInp) (err error) {
func (s *sAdminMember) UpdateMobile(ctx context.Context, in *adminin.MemberUpdateMobileInp) (err error) {
memberId := contexts.Get(ctx).User.Id
if memberId <= 0 {
err = gerror.New("获取用户信息失败！")
@@ -247,7 +259,7 @@ func (s *sAdminMember) UpdateMobile(ctx context.Context, in adminin.MemberUpdate
// 存在原绑定号码，需要进行验证
if mb.Mobile != "" {
err = service.SysSmsLog().VerifyCode(ctx, sysin.VerifyCodeInp{
err = service.SysSmsLog().VerifyCode(ctx, &sysin.VerifyCodeInp{
Event: consts.SmsTemplateBind,
Mobile: mb.Mobile,
Code: in.Code,
@@ -269,7 +281,7 @@ func (s *sAdminMember) UpdateMobile(ctx context.Context, in adminin.MemberUpdate
}
// UpdateProfile 更新用户资料
func (s *sAdminMember) UpdateProfile(ctx context.Context, in adminin.MemberUpdateProfileInp) (err error) {
func (s *sAdminMember) UpdateProfile(ctx context.Context, in *adminin.MemberUpdateProfileInp) (err error) {
memberId := contexts.Get(ctx).User.Id
if memberId <= 0 {
err = gerror.New("获取用户信息失败！")
@@ -306,7 +318,7 @@ func (s *sAdminMember) UpdateProfile(ctx context.Context, in adminin.MemberUpdat
}
// UpdatePwd 修改登录密码
func (s *sAdminMember) UpdatePwd(ctx context.Context, in adminin.MemberUpdatePwdInp) (err error) {
func (s *sAdminMember) UpdatePwd(ctx context.Context, in *adminin.MemberUpdatePwdInp) (err error) {
var mb entity.AdminMember
if err = dao.AdminMember.Ctx(ctx).WherePri(in.Id).Scan(&mb); err != nil {
err = gerror.Wrap(err, "获取用户信息失败，请稍后重试！")
@@ -330,7 +342,7 @@ func (s *sAdminMember) UpdatePwd(ctx context.Context, in adminin.MemberUpdatePwd
}
// ResetPwd 重置密码
func (s *sAdminMember) ResetPwd(ctx context.Context, in adminin.MemberResetPwdInp) (err error) {
func (s *sAdminMember) ResetPwd(ctx context.Context, in *adminin.MemberResetPwdInp) (err error) {
var (
mb *entity.AdminMember
memberId = contexts.GetUserId(ctx)
@@ -358,7 +370,7 @@ func (s *sAdminMember) ResetPwd(ctx context.Context, in adminin.MemberResetPwdIn
}
// VerifyUnique 验证管理员唯一属性
func (s *sAdminMember) VerifyUnique(ctx context.Context, in adminin.VerifyUniqueInp) (err error) {
func (s *sAdminMember) VerifyUnique(ctx context.Context, in *adminin.VerifyUniqueInp) (err error) {
if in.Where == nil {
return
}
@@ -388,7 +400,7 @@ func (s *sAdminMember) VerifyUnique(ctx context.Context, in adminin.VerifyUnique
}
// Delete 删除
func (s *sAdminMember) Delete(ctx context.Context, in adminin.MemberDeleteInp) (err error) {
func (s *sAdminMember) Delete(ctx context.Context, in *adminin.MemberDeleteInp) (err error) {
if s.VerifySuperId(ctx, gconv.Int64(in.Id)) {
err = gerror.New("超管账号禁止删除！")
return
@@ -425,7 +437,7 @@ func (s *sAdminMember) Delete(ctx context.Context, in adminin.MemberDeleteInp) (
}
// Edit 修改/新增
func (s *sAdminMember) Edit(ctx context.Context, in adminin.MemberEditInp) (err error) {
func (s *sAdminMember) Edit(ctx context.Context, in *adminin.MemberEditInp) (err error) {
opMemberId := contexts.GetUserId(ctx)
if opMemberId <= 0 {
err = gerror.New("获取用户信息失败！")
@@ -438,7 +450,7 @@ func (s *sAdminMember) Edit(ctx context.Context, in adminin.MemberEditInp) (err
}
cols := dao.AdminMember.Columns()
err = s.VerifyUnique(ctx, adminin.VerifyUniqueInp{
err = s.VerifyUnique(ctx, &adminin.VerifyUniqueInp{
Id: in.Id,
Where: g.Map{
cols.Username: in.Username,
@@ -490,6 +502,10 @@ func (s *sAdminMember) Edit(ctx context.Context, in adminin.MemberEditInp) (err
if err = dao.AdminMemberPost.UpdatePostIds(ctx, in.Id, in.PostIds); err != nil {
err = gerror.Wrap(err, "更新用户岗位失败，请稍后重试！")
}
if in.RoleId == s.superAdmin.RoleId {
s.LoadSuperAdmin(ctx)
}
return
})
}
@@ -524,12 +540,16 @@ func (s *sAdminMember) Edit(ctx context.Context, in adminin.MemberEditInp) (err
if err = dao.AdminMemberPost.UpdatePostIds(ctx, id, in.PostIds); err != nil {
err = gerror.Wrap(err, "新增用户岗位失败，请稍后重试！")
}
if in.RoleId == s.superAdmin.RoleId {
s.LoadSuperAdmin(ctx)
}
return
})
}
// View 获取用户信息
func (s *sAdminMember) View(ctx context.Context, in adminin.MemberViewInp) (res *adminin.MemberViewModel, err error) {
func (s *sAdminMember) View(ctx context.Context, in *adminin.MemberViewInp) (res *adminin.MemberViewModel, err error) {
if err = s.FilterAuthModel(ctx, contexts.GetUserId(ctx)).Hook(hook.MemberInfo).WherePri(in.Id).Scan(&res); err != nil {
err = gerror.Wrap(err, "获取用户信息失败，请稍后重试！")
}
@@ -537,7 +557,7 @@ func (s *sAdminMember) View(ctx context.Context, in adminin.MemberViewInp) (res
}
// List 获取列表
func (s *sAdminMember) List(ctx context.Context, in adminin.MemberListInp) (list []*adminin.MemberListModel, totalCount int, err error) {
func (s *sAdminMember) List(ctx context.Context, in *adminin.MemberListInp) (list []*adminin.MemberListModel, totalCount int, err error) {
mod := s.FilterAuthModel(ctx, contexts.GetUserId(ctx))
cols := dao.AdminMember.Columns()
@@ -590,14 +610,13 @@ func (s *sAdminMember) List(ctx context.Context, in adminin.MemberListInp) (list
err = gerror.Wrap(err, "获取用户岗位数据失败！")
return nil, 0, err
}
v.PostIds = g.NewVar(columns).Int64s()
}
return
}
// Status 更新状态
func (s *sAdminMember) Status(ctx context.Context, in adminin.MemberStatusInp) (err error) {
func (s *sAdminMember) Status(ctx context.Context, in *adminin.MemberStatusInp) (err error) {
if s.VerifySuperId(ctx, in.Id) {
err = gerror.New("超管账号不能更改状态")
return
@@ -652,7 +671,7 @@ func (s *sAdminMember) LoginMemberInfo(ctx context.Context) (res *adminin.LoginM
res.Permissions = permissions
// 登录统计
stat, err := s.MemberLoginStat(ctx, adminin.MemberLoginStatInp{MemberId: memberId})
stat, err := s.MemberLoginStat(ctx, &adminin.MemberLoginStatInp{MemberId: memberId})
if err != nil {
return
}
@@ -665,7 +684,7 @@ func (s *sAdminMember) LoginMemberInfo(ctx context.Context) (res *adminin.LoginM
}
// MemberLoginStat 用户登录统计
func (s *sAdminMember) MemberLoginStat(ctx context.Context, in adminin.MemberLoginStatInp) (res *adminin.MemberLoginStatModel, err error) {
func (s *sAdminMember) MemberLoginStat(ctx context.Context, in *adminin.MemberLoginStatInp) (res *adminin.MemberLoginStatModel, err error) {
var (
models *entity.SysLoginLog
cols = dao.SysLoginLog.Columns()
@@ -697,7 +716,7 @@ func (s *sAdminMember) MemberLoginStat(ctx context.Context, in adminin.MemberLog
}
// GetIdByCode 通过邀请码获取用户ID
func (s *sAdminMember) GetIdByCode(ctx context.Context, in adminin.GetIdByCodeInp) (res *adminin.GetIdByCodeModel, err error) {
func (s *sAdminMember) GetIdByCode(ctx context.Context, in *adminin.GetIdByCodeInp) (res *adminin.GetIdByCodeModel, err error) {
if err = dao.AdminMember.Ctx(ctx).Fields(adminin.GetIdByCodeModel{}).Where(dao.AdminMember.Columns().InviteCode, in.Code).Scan(&res); err != nil {
err = gerror.Wrap(err, "获取用户信息失败，请稍后重试！")
}
@@ -705,7 +724,7 @@ func (s *sAdminMember) GetIdByCode(ctx context.Context, in adminin.GetIdByCodeIn
}
// Select 获取可选的用户选项
func (s *sAdminMember) Select(ctx context.Context, in adminin.MemberSelectInp) (res []*adminin.MemberSelectModel, err error) {
func (s *sAdminMember) Select(ctx context.Context, in *adminin.MemberSelectInp) (res []*adminin.MemberSelectModel, err error) {
err = dao.AdminMember.Ctx(ctx).
Fields("id as value,real_name as label,username,avatar").
Handler(handler.FilterAuthWithField("id")).
@@ -718,12 +737,45 @@ func (s *sAdminMember) Select(ctx context.Context, in adminin.MemberSelectInp) (
// VerifySuperId 验证是否为超管
func (s *sAdminMember) VerifySuperId(ctx context.Context, verifyId int64) bool {
for _, id := range g.Cfg().MustGet(ctx, "hotgo.admin.superIds").Int64s() {
if id == verifyId {
return true
}
if s.superAdmin == nil || s.superAdmin.MemberIds == nil {
g.Log().Error(ctx, "superAdmin is not initialized.")
return false
}
return false
s.superAdmin.RLock()
defer s.superAdmin.RUnlock()
_, ok := s.superAdmin.MemberIds[verifyId]
return ok
}
// LoadSuperAdmin 加载超管数据
func (s *sAdminMember) LoadSuperAdmin(ctx context.Context) {
s.superAdmin.Lock()
defer s.superAdmin.Unlock()
value, err := dao.AdminRole.Ctx(ctx).Where(dao.AdminRole.Columns().Key, consts.SuperRoleKey).Value()
if err != nil {
g.Log().Errorf(ctx, "LoadSuperAdmin AdminRole err:%+v", err)
return
}
if value.IsEmpty() || value.IsNil() {
g.Log().Error(ctx, "the superAdmin role must be configured.")
return
}
array, err := dao.AdminMember.Ctx(ctx).Fields(dao.AdminMember.Columns().Id).Where(dao.AdminMember.Columns().RoleId, value).Array()
if err != nil {
g.Log().Errorf(ctx, "LoadSuperAdmin AdminMember err:%+v", err)
return
}
s.superAdmin.MemberIds = make(map[int64]struct{}, len(array))
for _, v := range array {
s.superAdmin.MemberIds[v.Int64()] = struct{}{}
}
s.superAdmin.RoleId = value.Int64()
}
func (s *sAdminMember) FilterAuthModel(ctx context.Context, memberId int64) *gdb.Model {

28
server/internal/logic/admin/menu.go
View File

@@ -36,7 +36,7 @@ func init() {
}
// Delete 删除
func (s *sAdminMenu) Delete(ctx context.Context, in adminin.MenuDeleteInp) (err error) {
func (s *sAdminMenu) Delete(ctx context.Context, in *adminin.MenuDeleteInp) (err error) {
exist, err := dao.AdminMenu.Ctx(ctx).Where("pid", in.Id).One()
if err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
@@ -50,7 +50,7 @@ func (s *sAdminMenu) Delete(ctx context.Context, in adminin.MenuDeleteInp) (err
}
// VerifyUnique 验证菜单唯一属性
func (s *sAdminMenu) VerifyUnique(ctx context.Context, in adminin.VerifyUniqueInp) (err error) {
func (s *sAdminMenu) VerifyUnique(ctx context.Context, in *adminin.VerifyUniqueInp) (err error) {
if in.Where == nil {
return
}
@@ -78,9 +78,9 @@ func (s *sAdminMenu) VerifyUnique(ctx context.Context, in adminin.VerifyUniqueIn
}
// Edit 修改/新增
func (s *sAdminMenu) Edit(ctx context.Context, in adminin.MenuEditInp) (err error) {
func (s *sAdminMenu) Edit(ctx context.Context, in *adminin.MenuEditInp) (err error) {
// 验证唯一性
err = s.VerifyUnique(ctx, adminin.VerifyUniqueInp{
err = s.VerifyUnique(ctx, &adminin.VerifyUniqueInp{
Id: in.Id,
Where: g.Map{
dao.AdminMenu.Columns().Title: in.Title,
@@ -132,7 +132,7 @@ func (s *sAdminMenu) Edit(ctx context.Context, in adminin.MenuEditInp) (err erro
}
// List 获取菜单列表
func (s *sAdminMenu) List(ctx context.Context, in adminin.MenuListInp) (res *adminin.MenuListModel, err error) {
func (s *sAdminMenu) List(ctx context.Context, in *adminin.MenuListInp) (res *adminin.MenuListModel, err error) {
var models []*entity.AdminMenu
if err = dao.AdminMenu.Ctx(ctx).Order("sort asc,id desc").Scan(&models); err != nil {
return
@@ -144,14 +144,14 @@ func (s *sAdminMenu) List(ctx context.Context, in adminin.MenuListInp) (res *adm
}
// genNaiveMenus 生成NaiveUI菜单格式
func (s *sAdminMenu) genNaiveMenus(menus []adminin.MenuRouteSummary) (sources []adminin.MenuRoute) {
func (s *sAdminMenu) genNaiveMenus(menus []*adminin.MenuRouteSummary) (sources []*adminin.MenuRoute) {
for _, men := range menus {
var source adminin.MenuRoute
var source = new(adminin.MenuRoute)
source.Name = men.Name
source.Path = men.Path
source.Redirect = men.Redirect
source.Component = men.Component
source.Meta = adminin.MenuRouteMeta{
source.Meta = &adminin.MenuRouteMeta{
Title: men.Title,
Icon: men.Icon,
KeepAlive: men.KeepAlive == 1,
@@ -174,10 +174,10 @@ func (s *sAdminMenu) genNaiveMenus(menus []adminin.MenuRouteSummary) (sources []
}
// getChildrenList 生成菜单树
func (s *sAdminMenu) getChildrenList(menu *adminin.MenuRouteSummary, treeMap map[string][]adminin.MenuRouteSummary) (err error) {
func (s *sAdminMenu) getChildrenList(menu *adminin.MenuRouteSummary, treeMap map[string][]*adminin.MenuRouteSummary) (err error) {
menu.Children = treeMap[gconv.String(menu.Id)]
for i := 0; i < len(menu.Children); i++ {
if err = s.getChildrenList(&menu.Children[i], treeMap); err != nil {
if err = s.getChildrenList(menu.Children[i], treeMap); err != nil {
return
}
}
@@ -187,9 +187,9 @@ func (s *sAdminMenu) getChildrenList(menu *adminin.MenuRouteSummary, treeMap map
// GetMenuList 获取菜单列表
func (s *sAdminMenu) GetMenuList(ctx context.Context, memberId int64) (res *role.DynamicRes, err error) {
var (
allMenus []adminin.MenuRouteSummary
menus []adminin.MenuRouteSummary
treeMap = make(map[string][]adminin.MenuRouteSummary)
allMenus []*adminin.MenuRouteSummary
menus []*adminin.MenuRouteSummary
treeMap = make(map[string][]*adminin.MenuRouteSummary)
mod = dao.AdminMenu.Ctx(ctx).Where("status", consts.StatusEnabled).WhereIn("type", []int{1, 2})
)
@@ -221,7 +221,7 @@ func (s *sAdminMenu) GetMenuList(ctx context.Context, memberId int64) (res *role
menus = treeMap["0"]
for i := 0; i < len(menus); i++ {
err = s.getChildrenList(&menus[i], treeMap)
err = s.getChildrenList(menus[i], treeMap)
}
res = new(role.DynamicRes)

39
server/internal/logic/admin/notice.go
View File

@@ -41,13 +41,13 @@ func (s *sAdminNotice) Model(ctx context.Context, option ...*handler.Option) *gd
}
// Delete 删除
func (s *sAdminNotice) Delete(ctx context.Context, in adminin.NoticeDeleteInp) (err error) {
func (s *sAdminNotice) Delete(ctx context.Context, in *adminin.NoticeDeleteInp) (err error) {
_, err = s.Model(ctx).Where("id", in.Id).Delete()
return
}
// Edit 修改/新增
func (s *sAdminNotice) Edit(ctx context.Context, in adminin.NoticeEditInp) (err error) {
func (s *sAdminNotice) Edit(ctx context.Context, in *adminin.NoticeEditInp) (err error) {
var member = contexts.Get(ctx).User
if member == nil {
err = gerror.New("获取用户信息失败！")
@@ -108,12 +108,11 @@ func (s *sAdminNotice) Edit(ctx context.Context, in adminin.NoticeEditInp) (err
websocket.SendToAll(response)
}
})
return
}
// Status 更新部门状态
func (s *sAdminNotice) Status(ctx context.Context, in adminin.NoticeStatusInp) (err error) {
func (s *sAdminNotice) Status(ctx context.Context, in *adminin.NoticeStatusInp) (err error) {
if in.Id <= 0 {
err = gerror.New("ID不能为空")
return
@@ -135,7 +134,7 @@ func (s *sAdminNotice) Status(ctx context.Context, in adminin.NoticeStatusInp) (
}
// MaxSort 最大排序
func (s *sAdminNotice) MaxSort(ctx context.Context, in adminin.NoticeMaxSortInp) (res *adminin.NoticeMaxSortModel, err error) {
func (s *sAdminNotice) MaxSort(ctx context.Context, in *adminin.NoticeMaxSortInp) (res *adminin.NoticeMaxSortModel, err error) {
if err = dao.AdminNotice.Ctx(ctx).Order("sort desc").Scan(&res); err != nil {
return
}
@@ -144,12 +143,12 @@ func (s *sAdminNotice) MaxSort(ctx context.Context, in adminin.NoticeMaxSortInp)
res = new(adminin.NoticeMaxSortModel)
}
res.Sort = form.DefaultMaxSort(ctx, res.Sort)
res.Sort = form.DefaultMaxSort(res.Sort)
return
}
// View 获取指定字典类型信息
func (s *sAdminNotice) View(ctx context.Context, in adminin.NoticeViewInp) (res *adminin.NoticeViewModel, err error) {
func (s *sAdminNotice) View(ctx context.Context, in *adminin.NoticeViewInp) (res *adminin.NoticeViewModel, err error) {
if err = s.Model(ctx).Where("id", in.Id).Scan(&res); err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return nil, err
@@ -159,7 +158,7 @@ func (s *sAdminNotice) View(ctx context.Context, in adminin.NoticeViewInp) (res
}
// List 获取列表
func (s *sAdminNotice) List(ctx context.Context, in adminin.NoticeListInp) (list []*adminin.NoticeListModel, totalCount int, err error) {
func (s *sAdminNotice) List(ctx context.Context, in *adminin.NoticeListInp) (list []*adminin.NoticeListModel, totalCount int, err error) {
var memberId = contexts.GetUserId(ctx)
if memberId <= 0 {
err = gerror.New("获取用户信息失败！")
@@ -224,7 +223,7 @@ func (s *sAdminNotice) List(ctx context.Context, in adminin.NoticeListInp) (list
}
// PullMessages 拉取未读消息列表
func (s *sAdminNotice) PullMessages(ctx context.Context, in adminin.PullMessagesInp) (res *adminin.PullMessagesModel, err error) {
func (s *sAdminNotice) PullMessages(ctx context.Context, in *adminin.PullMessagesInp) (res *adminin.PullMessagesModel, err error) {
var memberId = contexts.GetUserId(ctx)
if memberId <= 0 {
err = gerror.New("获取用户信息失败！")
@@ -237,7 +236,7 @@ func (s *sAdminNotice) PullMessages(ctx context.Context, in adminin.PullMessages
}
res = new(adminin.PullMessagesModel)
unread, err := s.UnreadCount(ctx, adminin.NoticeUnreadCountInp{MemberId: memberId, MessageIds: messageIds})
unread, err := s.UnreadCount(ctx, &adminin.NoticeUnreadCountInp{MemberId: memberId, MessageIds: messageIds})
if err != nil {
return
}
@@ -268,7 +267,7 @@ func (s *sAdminNotice) PullMessages(ctx context.Context, in adminin.PullMessages
}
// UnreadCount 获取所有类型消息的未读数量
func (s *sAdminNotice) UnreadCount(ctx context.Context, in adminin.NoticeUnreadCountInp) (res *adminin.NoticeUnreadCountModel, err error) {
func (s *sAdminNotice) UnreadCount(ctx context.Context, in *adminin.NoticeUnreadCountInp) (res *adminin.NoticeUnreadCountModel, err error) {
if in.MemberId <= 0 {
if in.MemberId = contexts.GetUserId(ctx); in.MemberId <= 0 {
err = gerror.New("获取用户信息失败！")
@@ -338,7 +337,7 @@ func (s *sAdminNotice) messageIds(ctx context.Context, memberId int64) (ids []in
}
// UpRead 更新已读
func (s *sAdminNotice) UpRead(ctx context.Context, in adminin.NoticeUpReadInp) (err error) {
func (s *sAdminNotice) UpRead(ctx context.Context, in *adminin.NoticeUpReadInp) (err error) {
var (
data *entity.AdminNotice
memberId = contexts.GetUserId(ctx)
@@ -361,7 +360,7 @@ func (s *sAdminNotice) UpRead(ctx context.Context, in adminin.NoticeUpReadInp) (
}
// ReadAll 已读全部
func (s *sAdminNotice) ReadAll(ctx context.Context, in adminin.NoticeReadAllInp) (err error) {
func (s *sAdminNotice) ReadAll(ctx context.Context, in *adminin.NoticeReadAllInp) (err error) {
var memberId = contexts.GetUserId(ctx)
if memberId <= 0 {
err = gerror.New("获取用户信息失败！")
@@ -417,9 +416,7 @@ func (s *sAdminNotice) ReadAll(ctx context.Context, in adminin.NoticeReadAllInp)
// updatedReadClicks 更新公告已读次数
func (s *sAdminNotice) updatedReadClicks(ctx context.Context, noticeId, memberId int64) (err error) {
var (
models *entity.AdminNoticeRead
)
var models *entity.AdminNoticeRead
err = dao.AdminNoticeRead.Ctx(ctx).
Where(dao.AdminNoticeRead.Columns().NoticeId, noticeId).
Where(dao.AdminNoticeRead.Columns().MemberId, memberId).
@@ -437,7 +434,7 @@ func (s *sAdminNotice) updatedReadClicks(ctx context.Context, noticeId, memberId
}
// MessageList 我的消息列表
func (s *sAdminNotice) MessageList(ctx context.Context, in adminin.NoticeMessageListInp) (list []*adminin.NoticeMessageListModel, totalCount int, err error) {
func (s *sAdminNotice) MessageList(ctx context.Context, in *adminin.NoticeMessageListInp) (list []*adminin.NoticeMessageListModel, totalCount int, err error) {
var memberId = contexts.GetUserId(ctx)
if memberId <= 0 {
err = gerror.New("获取用户信息失败！")
@@ -457,16 +454,16 @@ func (s *sAdminNotice) MessageList(ctx context.Context, in adminin.NoticeMessage
totalCount, err = mod.Count()
if err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return list, totalCount, err
return
}
if totalCount == 0 {
return list, totalCount, nil
return
}
if err = mod.Page(in.Page, in.PerPage).Order("id desc").Scan(&list); err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return list, totalCount, err
return
}
for _, v := range list {
@@ -482,5 +479,5 @@ func (s *sAdminNotice) MessageList(ctx context.Context, in adminin.NoticeMessage
}
}
}
return list, totalCount, err
return
}

33
server/internal/logic/admin/order.go
View File

@@ -48,8 +48,8 @@ func (s *sAdminOrder) Model(ctx context.Context, option ...*handler.Option) *gdb
}
// AcceptRefund 受理申请退款
func (s *sAdminOrder) AcceptRefund(ctx context.Context, in adminin.OrderAcceptRefundInp) (err error) {
view, err := s.View(ctx, adminin.OrderViewInp{Id: in.Id})
func (s *sAdminOrder) AcceptRefund(ctx context.Context, in *adminin.OrderAcceptRefundInp) (err error) {
view, err := s.View(ctx, &adminin.OrderViewInp{Id: in.Id})
if err != nil {
return err
}
@@ -68,7 +68,7 @@ func (s *sAdminOrder) AcceptRefund(ctx context.Context, in adminin.OrderAcceptRe
// 同意退款
if in.Status == consts.OrderStatusReturned {
// 更新余额
_, err = service.AdminCreditsLog().SaveBalance(ctx, adminin.CreditsLogSaveBalanceInp{
_, err = service.AdminCreditsLog().SaveBalance(ctx, &adminin.CreditsLogSaveBalanceInp{
MemberId: view.MemberId,
AppId: contexts.GetModule(ctx),
AddonsName: contexts.GetAddonName(ctx),
@@ -81,7 +81,7 @@ func (s *sAdminOrder) AcceptRefund(ctx context.Context, in adminin.OrderAcceptRe
return err
}
_, err = service.PayRefund().Refund(ctx, payin.PayRefundInp{
_, err = service.PayRefund().Refund(ctx, &payin.PayRefundInp{
OrderSn: view.OrderSn,
RefundMoney: view.Money,
Reason: view.RefundReason,
@@ -98,16 +98,14 @@ func (s *sAdminOrder) AcceptRefund(ctx context.Context, in adminin.OrderAcceptRe
}
_, err = s.Model(ctx).Where(dao.AdminOrder.Columns().Id, in.Id).Data(update).Update()
return
})
return
}
// ApplyRefund 申请退款
func (s *sAdminOrder) ApplyRefund(ctx context.Context, in adminin.OrderApplyRefundInp) (err error) {
view, err := s.View(ctx, adminin.OrderViewInp{Id: in.Id})
func (s *sAdminOrder) ApplyRefund(ctx context.Context, in *adminin.OrderApplyRefundInp) (err error) {
view, err := s.View(ctx, &adminin.OrderViewInp{Id: in.Id})
if err != nil {
return err
}
@@ -137,7 +135,7 @@ func (s *sAdminOrder) ApplyRefund(ctx context.Context, in adminin.OrderApplyRefu
}
// PayNotify 支付成功通知
func (s *sAdminOrder) PayNotify(ctx context.Context, in payin.NotifyCallFuncInp) (err error) {
func (s *sAdminOrder) PayNotify(ctx context.Context, in *payin.NotifyCallFuncInp) (err error) {
var models *entity.AdminOrder
if err = s.Model(ctx).Where(dao.AdminOrder.Columns().OrderSn, in.Pay.OrderSn).Scan(&models); err != nil {
return
@@ -163,7 +161,7 @@ func (s *sAdminOrder) PayNotify(ctx context.Context, in payin.NotifyCallFuncInp)
}
// 更新余额
_, err = service.AdminCreditsLog().SaveBalance(ctx, adminin.CreditsLogSaveBalanceInp{
_, err = service.AdminCreditsLog().SaveBalance(ctx, &adminin.CreditsLogSaveBalanceInp{
MemberId: models.MemberId,
AppId: in.Pay.AppId,
AddonsName: in.Pay.AddonsName,
@@ -195,7 +193,7 @@ func (s *sAdminOrder) PayNotify(ctx context.Context, in payin.NotifyCallFuncInp)
}
// Create 创建充值订单
func (s *sAdminOrder) Create(ctx context.Context, in adminin.OrderCreateInp) (res *adminin.OrderCreateModel, err error) {
func (s *sAdminOrder) Create(ctx context.Context, in *adminin.OrderCreateInp) (res *adminin.OrderCreateModel, err error) {
var (
subject = "支付订单"
orderSn = payment.GenOrderSn()
@@ -247,12 +245,11 @@ func (s *sAdminOrder) Create(ctx context.Context, in adminin.OrderCreateInp) (re
res.Order = create.Order
return
})
return
}
// List 获取充值订单列表
func (s *sAdminOrder) List(ctx context.Context, in adminin.OrderListInp) (list []*adminin.OrderListModel, totalCount int, err error) {
func (s *sAdminOrder) List(ctx context.Context, in *adminin.OrderListInp) (list []*adminin.OrderListModel, totalCount int, err error) {
mod := s.Model(ctx)
// 查询业务订单号
@@ -307,7 +304,7 @@ func (s *sAdminOrder) List(ctx context.Context, in adminin.OrderListInp) (list [
}
// Export 导出充值订单
func (s *sAdminOrder) Export(ctx context.Context, in adminin.OrderListInp) (err error) {
func (s *sAdminOrder) Export(ctx context.Context, in *adminin.OrderListInp) (err error) {
list, totalCount, err := s.List(ctx, in)
if err != nil {
return
@@ -334,7 +331,7 @@ func (s *sAdminOrder) Export(ctx context.Context, in adminin.OrderListInp) (err
}
// Edit 修改/新增充值订单
func (s *sAdminOrder) Edit(ctx context.Context, in adminin.OrderEditInp) (err error) {
func (s *sAdminOrder) Edit(ctx context.Context, in *adminin.OrderEditInp) (err error) {
// 修改
if in.Id > 0 {
_, err = s.Model(ctx).
@@ -356,7 +353,7 @@ func (s *sAdminOrder) Edit(ctx context.Context, in adminin.OrderEditInp) (err er
}
// Delete 删除充值订单
func (s *sAdminOrder) Delete(ctx context.Context, in adminin.OrderDeleteInp) (err error) {
func (s *sAdminOrder) Delete(ctx context.Context, in *adminin.OrderDeleteInp) (err error) {
_, err = s.Model(ctx).
Where(dao.AdminOrder.Columns().Id, in.Id).
Where(dao.AdminOrder.Columns().Status, consts.OrderStatusClose).
@@ -365,13 +362,13 @@ func (s *sAdminOrder) Delete(ctx context.Context, in adminin.OrderDeleteInp) (er
}
// View 获取充值订单指定信息
func (s *sAdminOrder) View(ctx context.Context, in adminin.OrderViewInp) (res *adminin.OrderViewModel, err error) {
func (s *sAdminOrder) View(ctx context.Context, in *adminin.OrderViewInp) (res *adminin.OrderViewModel, err error) {
err = s.Model(ctx).Where(dao.AdminOrder.Columns().Id, in.Id).Scan(&res)
return
}
// Status 更新充值订单状态
func (s *sAdminOrder) Status(ctx context.Context, in adminin.OrderStatusInp) (err error) {
func (s *sAdminOrder) Status(ctx context.Context, in *adminin.OrderStatusInp) (err error) {
if in.Id <= 0 {
err = gerror.New("ID不能为空")
return

162
server/internal/logic/admin/post.go
View File

@@ -8,12 +8,13 @@ package admin
import (
"context"
"github.com/gogf/gf/v2/errors/gerror"
"github.com/gogf/gf/v2/frame/g"
"hotgo/internal/consts"
"hotgo/internal/dao"
"hotgo/internal/library/hgorm"
"hotgo/internal/model/input/adminin"
"hotgo/internal/model/input/form"
"hotgo/internal/service"
"hotgo/utility/validate"
)
type sAdminPost struct{}
@@ -27,8 +28,8 @@ func init() {
}
// Delete 删除
func (s *sAdminPost) Delete(ctx context.Context, in adminin.PostDeleteInp) (err error) {
exist, err := dao.AdminMemberPost.Ctx(ctx).Where("post_id", in.Id).One()
func (s *sAdminPost) Delete(ctx context.Context, in *adminin.PostDeleteInp) (err error) {
exist, err := dao.AdminMemberPost.Ctx(ctx).Where(dao.AdminMemberPost.Columns().PostId, in.Id).One()
if err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return err
@@ -38,44 +39,55 @@ func (s *sAdminPost) Delete(ctx context.Context, in adminin.PostDeleteInp) (err
return gerror.New("请先解除该岗位下所有已关联用户关联关系！")
}
_, err = dao.AdminPost.Ctx(ctx).Where("id", in.Id).Delete()
_, err = dao.AdminPost.Ctx(ctx).WherePri(in.Id).Delete()
return
}
// VerifyUnique 验证部门唯一属性
func (s *sAdminPost) VerifyUnique(ctx context.Context, in *adminin.VerifyUniqueInp) (err error) {
if in.Where == nil {
return
}
cols := dao.AdminPost.Columns()
msgMap := g.MapStrStr{
cols.Name: "岗位名称已存在，请换一个",
cols.Code: "岗位编码已存在，请换一个",
}
for k, v := range in.Where {
if v == "" {
continue
}
message, ok := msgMap[k]
if !ok {
err = gerror.Newf("字段 [ %v ] 未配置唯一属性验证", k)
return
}
if err = hgorm.IsUnique(ctx, &dao.AdminPost, g.Map{k: v}, message, in.Id); err != nil {
return
}
}
return
}
// Edit 修改/新增
func (s *sAdminPost) Edit(ctx context.Context, in adminin.PostEditInp) (err error) {
if in.Name == "" {
err = gerror.New("名称不能为空")
return
}
if in.Code == "" {
err = gerror.New("编码不能为空")
return
}
uniqueName, err := dao.AdminPost.IsUniqueName(ctx, in.Id, in.Name)
func (s *sAdminPost) Edit(ctx context.Context, in *adminin.PostEditInp) (err error) {
// 验证唯一性
err = s.VerifyUnique(ctx, &adminin.VerifyUniqueInp{
Id: in.Id,
Where: g.Map{
dao.AdminPost.Columns().Name: in.Name,
dao.AdminPost.Columns().Code: in.Code,
},
})
if err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return
}
if !uniqueName {
err = gerror.New("名称已存在")
return
}
uniqueCode, err := dao.AdminPost.IsUniqueCode(ctx, in.Id, in.Code)
if err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return
}
if !uniqueCode {
err = gerror.New("编码已存在")
return
}
// 修改
if in.Id > 0 {
_, err = dao.AdminPost.Ctx(ctx).Where("id", in.Id).Data(in).Update()
_, err = dao.AdminPost.Ctx(ctx).WherePri(in.Id).Data(in).Update()
return
}
@@ -85,9 +97,9 @@ func (s *sAdminPost) Edit(ctx context.Context, in adminin.PostEditInp) (err erro
}
// MaxSort 最大排序
func (s *sAdminPost) MaxSort(ctx context.Context, in adminin.PostMaxSortInp) (res *adminin.PostMaxSortModel, err error) {
func (s *sAdminPost) MaxSort(ctx context.Context, in *adminin.PostMaxSortInp) (res *adminin.PostMaxSortModel, err error) {
if in.Id > 0 {
if err = dao.AdminMenu.Ctx(ctx).Where("id", in.Id).Order("sort desc").Scan(&res); err != nil {
if err = dao.AdminPost.Ctx(ctx).WherePri(in.Id).OrderDesc(dao.AdminPost.Columns().Sort).Scan(&res); err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return
}
@@ -96,119 +108,73 @@ func (s *sAdminPost) MaxSort(ctx context.Context, in adminin.PostMaxSortInp) (re
if res == nil {
res = new(adminin.PostMaxSortModel)
}
res.Sort = form.DefaultMaxSort(ctx, res.Sort)
return
}
// NameUnique 菜单名称是否唯一
func (s *sAdminPost) NameUnique(ctx context.Context, in adminin.PostNameUniqueInp) (res *adminin.PostNameUniqueModel, err error) {
isUnique, err := dao.AdminPost.IsUniqueName(ctx, in.Id, in.Name)
if err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return
}
res = new(adminin.PostNameUniqueModel)
res.IsUnique = isUnique
return
}
// CodeUnique 编码是否唯一
func (s *sAdminPost) CodeUnique(ctx context.Context, in adminin.PostCodeUniqueInp) (res *adminin.PostCodeUniqueModel, err error) {
isUnique, err := dao.AdminPost.IsUniqueCode(ctx, in.Id, in.Code)
if err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return
}
res = new(adminin.PostCodeUniqueModel)
res.IsUnique = isUnique
res.Sort = form.DefaultMaxSort(res.Sort)
return
}
// View 获取指定岗位信息
func (s *sAdminPost) View(ctx context.Context, in adminin.PostViewInp) (res *adminin.PostViewModel, err error) {
err = dao.AdminPost.Ctx(ctx).Where("id", in.Id).Scan(&res)
func (s *sAdminPost) View(ctx context.Context, in *adminin.PostViewInp) (res *adminin.PostViewModel, err error) {
err = dao.AdminPost.Ctx(ctx).WherePri(in.Id).Scan(&res)
return
}
// List 获取列表
func (s *sAdminPost) List(ctx context.Context, in adminin.PostListInp) (list []*adminin.PostListModel, totalCount int, err error) {
func (s *sAdminPost) List(ctx context.Context, in *adminin.PostListInp) (list []*adminin.PostListModel, totalCount int, err error) {
mod := dao.AdminPost.Ctx(ctx)
cols := dao.AdminPost.Columns()
// 访问路径
if in.Name != "" {
mod = mod.WhereLike("name", "%"+in.Name+"%")
mod = mod.WhereLike(cols.Name, "%"+in.Name+"%")
}
// 模块
if in.Code != "" {
mod = mod.Where("code", in.Code)
mod = mod.Where(cols.Code, in.Code)
}
// 请求方式
if in.Status > 0 {
mod = mod.Where("status", in.Status)
mod = mod.Where(cols.Status, in.Status)
}
if len(in.CreatedAt) == 2 {
mod = mod.WhereBetween(cols.CreatedAt, in.CreatedAt[0], in.CreatedAt[1])
}
totalCount, err = mod.Count()
if err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
err = gerror.Wrap(err, "获取岗位列表失败！")
return
}
if totalCount == 0 {
return list, totalCount, nil
return
}
err = mod.Page(in.Page, in.PerPage).Order("id asc").Scan(&list)
err = mod.Page(in.Page, in.PerPage).OrderAsc(cols.Sort).Scan(&list)
return
}
// GetMemberByStartName 获取指定用户的第一岗位
func (s *sAdminPost) GetMemberByStartName(ctx context.Context, memberId int64) (name string, err error) {
// 默认取第一岗位
postId, err := dao.AdminMemberPost.Ctx(ctx).
Fields("post_id").
Where("member_id", memberId).
Limit(1).
Value()
postId, err := dao.AdminMemberPost.Ctx(ctx).Fields(dao.AdminMemberPost.Columns().PostId).Where(dao.AdminMemberPost.Columns().MemberId, memberId).Limit(1).Value()
if err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return
}
val, err := dao.AdminPost.Ctx(ctx).
Fields("name").
Where("id", postId.Int()).
Order("id desc").
Value()
val, err := dao.AdminPost.Ctx(ctx).Fields(dao.AdminPost.Columns().Name).WherePri(postId.Int()).OrderDesc(dao.AdminPost.Columns().Id).Value()
if err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
return
}
return val.String(), nil
}
// Status 更新状态
func (s *sAdminPost) Status(ctx context.Context, in adminin.PostStatusInp) (err error) {
if in.Id <= 0 {
err = gerror.New("ID不能为空")
return
}
if in.Status <= 0 {
err = gerror.New("状态不能为空")
return
}
if !validate.InSlice(consts.StatusSlice, in.Status) {
err = gerror.New("状态不正确")
return
}
// 修改
_, err = dao.AdminPost.Ctx(ctx).Where("id", in.Id).Data("status", in.Status).Update()
func (s *sAdminPost) Status(ctx context.Context, in *adminin.PostStatusInp) (err error) {
_, err = dao.AdminPost.Ctx(ctx).WherePri(in.Id).Data(dao.AdminPost.Columns().Status, in.Status).Update()
return
}

26
server/internal/logic/admin/role.go
View File

@@ -39,7 +39,6 @@ func init() {
func (s *sAdminRole) Verify(ctx context.Context, path, method string) bool {
var (
user = contexts.Get(ctx).User
sk = g.Cfg().MustGet(ctx, "hotgo.admin.superRoleKey")
err error
)
@@ -48,7 +47,7 @@ func (s *sAdminRole) Verify(ctx context.Context, path, method string) bool {
return false
}
if service.AdminMember().VerifySuperId(ctx, user.Id) || user.RoleKey == sk.String() {
if service.AdminMember().VerifySuperId(ctx, user.Id) {
return true
}
@@ -61,7 +60,7 @@ func (s *sAdminRole) Verify(ctx context.Context, path, method string) bool {
}
// List 获取列表
func (s *sAdminRole) List(ctx context.Context, in adminin.RoleListInp) (res *adminin.RoleListModel, totalCount int, err error) {
func (s *sAdminRole) List(ctx context.Context, in *adminin.RoleListInp) (res *adminin.RoleListModel, totalCount int, err error) {
var (
mod = dao.AdminRole.Ctx(ctx)
models []*entity.AdminRole
@@ -113,11 +112,8 @@ func (s *sAdminRole) GetMemberList(ctx context.Context, id int64) (list []*admin
}
// GetPermissions 更改角色菜单权限
func (s *sAdminRole) GetPermissions(ctx context.Context, in adminin.GetPermissionsInp) (res *adminin.GetPermissionsModel, err error) {
values, err := dao.AdminRoleMenu.Ctx(ctx).
Fields("menu_id").
Where("role_id", in.RoleId).
Array()
func (s *sAdminRole) GetPermissions(ctx context.Context, in *adminin.GetPermissionsInp) (res *adminin.GetPermissionsModel, err error) {
values, err := dao.AdminRoleMenu.Ctx(ctx).Fields("menu_id").Where("role_id", in.RoleId).Array()
if err != nil {
return
}
@@ -134,7 +130,7 @@ func (s *sAdminRole) GetPermissions(ctx context.Context, in adminin.GetPermissio
}
// UpdatePermissions 更改角色菜单权限
func (s *sAdminRole) UpdatePermissions(ctx context.Context, in adminin.UpdatePermissionsInp) (err error) {
func (s *sAdminRole) UpdatePermissions(ctx context.Context, in *adminin.UpdatePermissionsInp) (err error) {
err = dao.AdminRoleMenu.Transaction(ctx, func(ctx context.Context, tx gdb.TX) (err error) {
if _, err = dao.AdminRoleMenu.Ctx(ctx).Where("role_id", in.RoleId).Delete(); err != nil {
err = gerror.Wrap(err, consts.ErrorORM)
@@ -166,7 +162,7 @@ func (s *sAdminRole) UpdatePermissions(ctx context.Context, in adminin.UpdatePer
return casbin.Refresh(ctx)
}
func (s *sAdminRole) Edit(ctx context.Context, in adminin.RoleEditInp) (err error) {
func (s *sAdminRole) Edit(ctx context.Context, in *adminin.RoleEditInp) (err error) {
if err = hgorm.IsUnique(ctx, &dao.AdminRole, g.Map{dao.AdminRole.Columns().Name: in.Name}, "名称已存在", in.Id); err != nil {
return
}
@@ -231,7 +227,7 @@ func updateRoleChildrenTree(ctx context.Context, _id int64, _level int, _tree st
return
}
func (s *sAdminRole) Delete(ctx context.Context, in adminin.RoleDeleteInp) (err error) {
func (s *sAdminRole) Delete(ctx context.Context, in *adminin.RoleDeleteInp) (err error) {
var models *entity.AdminRole
if err = dao.AdminRole.Ctx(ctx).Where("id", in.Id).Scan(&models); err != nil {
return
@@ -270,11 +266,7 @@ func (s *sAdminRole) DataScopeSelect() (res form.Selects) {
}
func (s *sAdminRole) DataScopeEdit(ctx context.Context, in *adminin.DataScopeEditInp) (err error) {
var (
models *entity.AdminRole
sk = g.Cfg().MustGet(ctx, "hotgo.admin.superRoleKey")
)
var models *entity.AdminRole
if err = dao.AdminRole.Ctx(ctx).Where("id", in.Id).Scan(&models); err != nil {
return
}
@@ -283,7 +275,7 @@ func (s *sAdminRole) DataScopeEdit(ctx context.Context, in *adminin.DataScopeEdi
return gerror.New("角色不存在")
}
if models.Key == sk.String() {
if models.Key == consts.SuperRoleKey {
return gerror.New("超管角色拥有全部权限，无需修改！")
}

25
server/internal/logic/admin/site.go
View File

@@ -30,7 +30,7 @@ func init() {
}
// Register 账号注册
func (s *sAdminSite) Register(ctx context.Context, in adminin.RegisterInp) (err error) {
func (s *sAdminSite) Register(ctx context.Context, in *adminin.RegisterInp) (err error) {
config, err := service.SysConfig().GetLogin(ctx)
if err != nil {
return
@@ -42,12 +42,13 @@ func (s *sAdminSite) Register(ctx context.Context, in adminin.RegisterInp) (err
}
var data adminin.MemberAddInp
// 默认上级
data.Pid = 1
// 存在邀请人
if in.InviteCode != "" {
pmb, err := service.AdminMember().GetIdByCode(ctx, adminin.GetIdByCodeInp{Code: in.InviteCode})
pmb, err := service.AdminMember().GetIdByCode(ctx, &adminin.GetIdByCodeInp{Code: in.InviteCode})
if err != nil {
return err
}
@@ -81,7 +82,7 @@ func (s *sAdminSite) Register(ctx context.Context, in adminin.RegisterInp) (err
}
// 验证唯一性
err = service.AdminMember().VerifyUnique(ctx, adminin.VerifyUniqueInp{
err = service.AdminMember().VerifyUnique(ctx, &adminin.VerifyUniqueInp{
Where: g.Map{
dao.AdminMember.Columns().Username: in.Username,
dao.AdminMember.Columns().Mobile: in.Mobile,
@@ -92,7 +93,7 @@ func (s *sAdminSite) Register(ctx context.Context, in adminin.RegisterInp) (err
}
// 验证短信验证码
err = service.SysSmsLog().VerifyCode(ctx, sysin.VerifyCodeInp{
err = service.SysSmsLog().VerifyCode(ctx, &sysin.VerifyCodeInp{
Event: consts.SmsTemplateRegister,
Mobile: in.Mobile,
Code: in.Code,
@@ -101,7 +102,7 @@ func (s *sAdminSite) Register(ctx context.Context, in adminin.RegisterInp) (err
return
}
data.MemberEditInp = adminin.MemberEditInp{
data.MemberEditInp = &adminin.MemberEditInp{
Id: 0,
RoleId: config.RoleId,
PostIds: config.PostIds,
@@ -139,9 +140,9 @@ func (s *sAdminSite) Register(ctx context.Context, in adminin.RegisterInp) (err
}
// AccountLogin 账号登录
func (s *sAdminSite) AccountLogin(ctx context.Context, in adminin.AccountLoginInp) (res *adminin.LoginModel, err error) {
func (s *sAdminSite) AccountLogin(ctx context.Context, in *adminin.AccountLoginInp) (res *adminin.LoginModel, err error) {
defer func() {
service.SysLoginLog().Push(ctx, sysin.LoginLogPushInp{Response: res, Err: err})
service.SysLoginLog().Push(ctx, &sysin.LoginLogPushInp{Response: res, Err: err})
}()
var mb *entity.AdminMember
@@ -177,9 +178,9 @@ func (s *sAdminSite) AccountLogin(ctx context.Context, in adminin.AccountLoginIn
}
// MobileLogin 手机号登录
func (s *sAdminSite) MobileLogin(ctx context.Context, in adminin.MobileLoginInp) (res *adminin.LoginModel, err error) {
func (s *sAdminSite) MobileLogin(ctx context.Context, in *adminin.MobileLoginInp) (res *adminin.LoginModel, err error) {
defer func() {
service.SysLoginLog().Push(ctx, sysin.LoginLogPushInp{Response: res, Err: err})
service.SysLoginLog().Push(ctx, &sysin.LoginLogPushInp{Response: res, Err: err})
}()
var mb *entity.AdminMember
@@ -197,7 +198,7 @@ func (s *sAdminSite) MobileLogin(ctx context.Context, in adminin.MobileLoginInp)
res.Id = mb.Id
res.Username = mb.Username
err = service.SysSmsLog().VerifyCode(ctx, sysin.VerifyCodeInp{
err = service.SysSmsLog().VerifyCode(ctx, &sysin.VerifyCodeInp{
Event: consts.SmsTemplateLogin,
Mobile: in.Mobile,
Code: in.Code,
@@ -249,7 +250,7 @@ func (s *sAdminSite) handleLogin(ctx context.Context, mb *entity.AdminMember) (r
LoginAt: gtime.Now(),
}
loginToken, expires, err := token.Login(ctx, user)
lt, expires, err := token.Login(ctx, user)
if err != nil {
return nil, err
}
@@ -257,7 +258,7 @@ func (s *sAdminSite) handleLogin(ctx context.Context, mb *entity.AdminMember) (r
res = &adminin.LoginModel{
Username: user.Username,
Id: user.Id,
Token: loginToken,
Token: lt,
Expires: expires,
}
return