昔念
35c89215f7
feat(player): 重构玩家金币系统，使用BaseSysUserService管理金币 将玩家金币逻辑从PlayerInfo中移除，改为通过BaseSysUserService进行统一管理。 新增了金币的获取与设置方法，支持以分为单位的精确计算。 调整了登录时用户服务的初始化逻辑，确保User字段正确赋值。 fix(pet): 修复宠物性格道具使用逻辑错误 更新了多个性格相关道具的处理方式，包括新增的性格转换道具范围。 修正了性格随机与指定逻辑，避免越界问题并增强可维护性。 feat(fight): 战斗初始化时恢复宠物状态 在战斗初始化阶段调用宠物治愈方法，确保战斗开始前宠物处于健康状态。 feat(admin): 调整管理员会话获取接口参数类型 修改GetPerson方法传入参数为uint32类型，提高数据一致性与安全性。 refactor(model): 移除PlayerInfo中的GoldBean字段 金币字段不再存储于PlayerInfo结构体中，转而由BaseSysUser模块统一管理。 ```
333 lines
9.3 KiB
Go
333 lines
9.3 KiB
Go
package service
|
||
|
||
import (
|
||
"context"
|
||
"fmt"
|
||
|
||
"blazing/cool"
|
||
|
||
"blazing/modules/base/model"
|
||
|
||
"github.com/alpacahq/alpacadecimal"
|
||
"github.com/gogf/gf/v2/container/garray"
|
||
"github.com/gogf/gf/v2/container/gset"
|
||
"github.com/gogf/gf/v2/crypto/gmd5"
|
||
"github.com/gogf/gf/v2/database/gdb"
|
||
"github.com/gogf/gf/v2/errors/gerror"
|
||
"github.com/gogf/gf/v2/frame/g"
|
||
"github.com/gogf/gf/v2/util/gconv"
|
||
)
|
||
|
||
type BaseSysUserService struct {
|
||
*cool.Service
|
||
}
|
||
|
||
// Person 方法 返回不带密码的用户信息
|
||
func (s *BaseSysUserService) Person(userId uint) (res gdb.Record, err error) {
|
||
m := cool.DBM(s.Model)
|
||
res, err = m.Where("id", userId).FieldsEx("password").One()
|
||
return
|
||
}
|
||
func (s *BaseSysUserService) GetSession(email string, password string) (res *model.BaseSysUser, err error) {
|
||
m := cool.DBM(s.Model)
|
||
|
||
m.Where("email", email).Where("password", password).Where("status", 1).Scan(&res)
|
||
if res == nil {
|
||
err = gerror.New("账户或密码不正确~")
|
||
return
|
||
}
|
||
|
||
return
|
||
}
|
||
func (s *BaseSysUserService) GetPerson(userId uint32) (res *model.BaseSysUser) {
|
||
m := cool.DBM(s.Model)
|
||
m.Where("id", userId).FieldsEx("password").Scan(&res)
|
||
|
||
return
|
||
}
|
||
func (s *BaseSysUserService) SetGold(userId uint32, gold uint32) (res *model.BaseSysUser) {
|
||
m := cool.DBM(s.Model)
|
||
m.Where("id", userId).Scan(&res)
|
||
res.GoldBean, _ = alpacadecimal.NewFromFloat(float64(gold)).Div(alpacadecimal.NewFromFloat(100)).Float64()
|
||
m.Save(res)
|
||
|
||
return
|
||
}
|
||
func (s *BaseSysUserService) GetGold(userId uint) (res uint32) {
|
||
var res1 model.BaseSysUser
|
||
m := cool.DBM(s.Model)
|
||
m.Where("id", userId).FieldsEx("password").Scan(&res1)
|
||
|
||
return uint32(alpacadecimal.NewFromFloat(res1.GoldBean).Mul(alpacadecimal.NewFromFloat(100)).IntPart())
|
||
}
|
||
func (s *BaseSysUserService) GetEamil(userId string) (res *model.BaseSysUser) {
|
||
m := cool.DBM(s.Model)
|
||
m.Where("email", userId).FieldsEx("password").Scan(&res)
|
||
|
||
return
|
||
}
|
||
func (s *BaseSysUserService) ModifyBefore(ctx context.Context, method string, param g.MapStrAny) (err error) {
|
||
if method == "Delete" {
|
||
// 禁止删除超级管理员
|
||
userIds := garray.NewIntArrayFrom(gconv.Ints(param["ids"]))
|
||
currentId, found := userIds.Get(0)
|
||
superAdminId := 1
|
||
|
||
if userIds.Len() == 1 && found && currentId == superAdminId {
|
||
err = gerror.New("超级管理员不能删除")
|
||
return
|
||
}
|
||
|
||
// 删除超级管理员
|
||
userIds.RemoveValue(1)
|
||
g.RequestFromCtx(ctx).SetParam("ids", userIds.Slice())
|
||
}
|
||
return
|
||
}
|
||
|
||
func (s *BaseSysUserService) ModifyAfter(ctx context.Context, method string, param g.MapStrAny) (err error) {
|
||
if method == "Delete" {
|
||
userIds := garray.NewIntArrayFrom(gconv.Ints(param["ids"]))
|
||
userIds.RemoveValue(1)
|
||
// 删除用户时删除相关数据
|
||
cool.DBM(model.NewBaseSysUserRole()).WhereIn("userId", userIds.Slice()).Delete()
|
||
}
|
||
return
|
||
}
|
||
|
||
// ServiceAdd 方法 添加用户
|
||
func (s *BaseSysUserService) ServiceAdd(ctx context.Context, req *cool.AddReq) (data interface{}, err error) {
|
||
var (
|
||
m = cool.DBM(s.Model)
|
||
r = g.RequestFromCtx(ctx)
|
||
reqmap = r.GetMap()
|
||
)
|
||
|
||
// 如果reqmap["password"]不为空，则对密码进行md5加密
|
||
if !r.Get("password").IsNil() {
|
||
reqmap["password"] = gmd5.MustEncryptString(r.Get("password").String())
|
||
}
|
||
if s.UniqueKey != nil {
|
||
for k, v := range s.UniqueKey {
|
||
if reqmap[k] != nil {
|
||
count, err := cool.DBM(s.Model).Where(k, reqmap[k]).Count()
|
||
if err != nil {
|
||
return nil, err
|
||
}
|
||
if count > 0 {
|
||
err = gerror.New(v)
|
||
return nil, err
|
||
}
|
||
}
|
||
}
|
||
}
|
||
lastInsertId, err := m.Data(reqmap).InsertAndGetId()
|
||
if err != nil {
|
||
return
|
||
}
|
||
data = g.Map{"id": lastInsertId}
|
||
err = g.DB().Transaction(ctx, func(ctx context.Context, tx gdb.TX) (err error) {
|
||
|
||
if !r.Get("roleIdList").IsNil() {
|
||
inRoleIdSet := gset.NewFrom(r.Get("roleIdList").Ints())
|
||
roleArray := garray.NewArray()
|
||
inRoleIdSet.Iterator(func(v interface{}) bool {
|
||
roleArray.PushRight(g.Map{
|
||
"userId": gconv.Uint(lastInsertId),
|
||
"roleId": gconv.Uint(v),
|
||
})
|
||
return true
|
||
})
|
||
|
||
_, err = cool.DBM(model.NewBaseSysUserRole()).Fields("userId,roleId").Insert(roleArray)
|
||
if err != nil {
|
||
return err
|
||
}
|
||
}
|
||
|
||
return
|
||
})
|
||
return
|
||
}
|
||
|
||
// ServiceInfo 方法 返回服务信息
|
||
func (s *BaseSysUserService) ServiceInfo(ctx g.Ctx, req *cool.InfoReq) (data interface{}, err error) {
|
||
result, err := s.Service.ServiceInfo(ctx, req)
|
||
if err != nil {
|
||
return nil, err
|
||
}
|
||
if result.(gdb.Record).IsEmpty() {
|
||
return nil, nil
|
||
}
|
||
// g.DumpWithType(result)
|
||
resultMap := result.(gdb.Record).Map()
|
||
|
||
// 获取角色
|
||
roleIds, err := cool.DBM(model.NewBaseSysUserRole()).Where("userId", resultMap["id"]).Fields("roleId").Array()
|
||
if err != nil {
|
||
return nil, err
|
||
}
|
||
resultMap["roleIdList"] = roleIds
|
||
data = resultMap
|
||
|
||
return
|
||
}
|
||
|
||
// ServiceUpdate 方法 更新用户信息
|
||
func (s *BaseSysUserService) ServiceUpdate(ctx context.Context, req *cool.UpdateReq) (data interface{}, err error) {
|
||
var (
|
||
admin = cool.GetAdmin(ctx)
|
||
m = cool.DBM(s.Model)
|
||
)
|
||
|
||
r := g.RequestFromCtx(ctx)
|
||
rMap := r.GetMap()
|
||
|
||
// 如果不传入ID代表更新当前用户
|
||
userId := r.Get("id", admin.UserId).Uint()
|
||
userInfo, err := m.Where("id", userId).One()
|
||
|
||
if err != nil {
|
||
return
|
||
}
|
||
if userInfo.IsEmpty() {
|
||
err = gerror.New("用户不存在")
|
||
return
|
||
}
|
||
|
||
// 禁止禁用超级管理员
|
||
if userId == 1 && (!r.Get("status").IsNil() && r.Get("status").Int() == 0) {
|
||
err = gerror.New("禁止禁用超级管理员")
|
||
return
|
||
}
|
||
if s.UniqueKey != nil {
|
||
for k, v := range s.UniqueKey {
|
||
if rMap[k] != nil {
|
||
count, err := cool.DBM(s.Model).Where(k, rMap[k]).WhereNot("id", userId).Count()
|
||
if err != nil {
|
||
return nil, err
|
||
}
|
||
if count > 0 {
|
||
err = gerror.New(v)
|
||
return nil, err
|
||
}
|
||
}
|
||
}
|
||
}
|
||
// 如果请求的password不为空并且密码加密后的值有变动，说明要修改密码
|
||
var rPassword = r.Get("password", "").String()
|
||
if rPassword != "" && rPassword != userInfo["password"].String() {
|
||
rMap["password"], _ = gmd5.Encrypt(rPassword)
|
||
rMap["passwordV"] = userInfo["passwordV"].Int() + 1
|
||
cool.CacheManager.Set(ctx, fmt.Sprintf("admin:passwordVersion:%d", userId), rMap["passwordV"], 0)
|
||
} else {
|
||
delete(rMap, "password")
|
||
}
|
||
|
||
err = g.DB().Transaction(ctx, func(ctx context.Context, tx gdb.TX) (err error) {
|
||
roleModel := cool.DBM(model.NewBaseSysUserRole()).TX(tx).Where("userId", userId)
|
||
roleIds, err := roleModel.Fields("roleId").Array()
|
||
if err != nil {
|
||
return
|
||
}
|
||
|
||
// 如果请求参数中不包含roleIdList说明不修改角色信息
|
||
if !r.Get("roleIdList").IsNil() {
|
||
inRoleIdSet := gset.NewFrom(r.Get("roleIdList").Ints())
|
||
roleIdsSet := gset.NewFrom(gconv.Ints(roleIds))
|
||
|
||
// 如果请求的角色信息未发生变化则跳过更新逻辑
|
||
if roleIdsSet.Diff(inRoleIdSet).Size() != 0 || inRoleIdSet.Diff(roleIdsSet).Size() != 0 {
|
||
roleArray := garray.NewArray()
|
||
inRoleIdSet.Iterator(func(v interface{}) bool {
|
||
roleArray.PushRight(g.Map{
|
||
"userId": gconv.Uint(userId),
|
||
"roleId": gconv.Uint(v),
|
||
})
|
||
return true
|
||
})
|
||
|
||
_, err = roleModel.Delete()
|
||
|
||
if err != nil {
|
||
return err
|
||
}
|
||
_, err = roleModel.Fields("userId,roleId").Insert(roleArray)
|
||
if err != nil {
|
||
return err
|
||
}
|
||
}
|
||
}
|
||
|
||
_, err = m.TX(tx).Update(rMap)
|
||
|
||
if err != nil {
|
||
return err
|
||
}
|
||
return
|
||
})
|
||
return
|
||
}
|
||
|
||
// Move 移动用户部门
|
||
func (s *BaseSysUserService) Move(ctx g.Ctx) (err error) {
|
||
request := g.RequestFromCtx(ctx)
|
||
departmentId := request.Get("departmentId").Int()
|
||
userIds := request.Get("userIds").Slice()
|
||
|
||
_, err = cool.DBM(s.Model).Where("id IN(?)", userIds).Data(g.Map{"departmentId": departmentId}).Update()
|
||
|
||
return
|
||
}
|
||
|
||
// NewBaseSysUserService 创建一个新的BaseSysUserService实例
|
||
func NewBaseSysUserService() *BaseSysUserService {
|
||
return &BaseSysUserService{
|
||
Service: &cool.Service{
|
||
Model: model.NewBaseSysUser(),
|
||
InfoIgnoreProperty: "password",
|
||
UniqueKey: map[string]string{
|
||
"username": "用户名不能重复",
|
||
"email": "邮箱不能重复",
|
||
},
|
||
PageQueryOp: &cool.QueryOp{
|
||
Select: `
|
||
base_sys_user.*,
|
||
STRING_AGG(role.name, ', ') AS roleName`,
|
||
Join: []*cool.JoinOp{
|
||
{
|
||
Model: model.NewBaseSysDepartment(),
|
||
Alias: "dept",
|
||
Type: "LeftJoin",
|
||
Condition: `base_sys_user."departmentId" = dept.id`,
|
||
},
|
||
{
|
||
Model: model.NewBaseSysUserRole(),
|
||
Alias: "user_role",
|
||
Type: "LeftJoin",
|
||
Condition: `base_sys_user.id = user_role."userId"`,
|
||
},
|
||
{
|
||
Model: model.NewBaseSysRole(),
|
||
Alias: "role",
|
||
Type: "LeftJoin",
|
||
Condition: `role.id = user_role."roleId"`,
|
||
},
|
||
},
|
||
Where: func(ctx context.Context) []g.Array {
|
||
r := g.RequestFromCtx(ctx).GetMap()
|
||
return []g.Array{
|
||
{"id != ?", g.Slice{"10001"}, true}, //排除管理员
|
||
{`("departmentId" IN (?))`, gconv.SliceStr(r["departmentIds"])},
|
||
}
|
||
},
|
||
Extend: func(ctx g.Ctx, m *gdb.Model) *gdb.Model {
|
||
return m.Group(`base_sys_user.id`)
|
||
},
|
||
KeyWordField: []string{"username", "email"},
|
||
FieldEQ: []string{"id"},
|
||
},
|
||
},
|
||
}
|
||
}
|