From 619e4b50cac123238998cf6e345b0dc7e5ed350e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=98=94=E5=BF=B5?= <12574910+72wo@users.noreply.github.com> Date: Thu, 26 Mar 2026 04:51:36 +0800 Subject: [PATCH] =?UTF-8?q?```=20refactor(pet):=20=E9=87=8D=E6=9E=84?= =?UTF-8?q?=E5=AE=A0=E7=89=A9=E6=9C=8D=E5=8A=A1=E6=96=B9=E6=B3=95=E5=91=BD?= =?UTF-8?q?=E5=90=8D=E5=92=8C=E4=BC=98=E5=8C=96=E6=95=B0=E6=8D=AE=E5=BA=93?= =?UTF-8?q?=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 统一PetService中方法命名规范，将驼峰命名改为标准驼峰格式 - 修复拼写错误：UPdate -> Update, UPdateFree -> UpdateFree等 - 重命名查询方法：PetInfo_One -> PetInfoOneByCatchTime, PetInfo_One_ID -> PetInfoOneByID, PetInfo_One_ohter -> PetInfoOneOther - 优化BuyPet方法中的事务处理逻辑，使用 --- logic/controller/item_use.go | 2 +- logic/controller/pet_info.go | 10 +- logic/controller/room_info.go | 4 +- logic/controller/room_set.go | 2 +- logic/service/player/pet.go | 4 +- modules/player/controller/admin/pet.go | 4 +- modules/player/service/pet.go | 295 +++++++++++-------------- 7 files changed, 136 insertions(+), 185 deletions(-) diff --git a/logic/controller/item_use.go b/logic/controller/item_use.go index 649df45eb..2fe88e0bc 100644 --- a/logic/controller/item_use.go +++ b/logic/controller/item_use.go @@ -79,7 +79,7 @@ func (h Controller) handleNeuronItem(currentPet *model.PetInfo, c *player.Player } originalCatchTime := currentPet.CatchTime - oldPet := c.Service.Pet.PetInfo_One_Unscoped(currentPet.OldCatchTime) + oldPet := c.Service.Pet.PetInfoOneUnscoped(currentPet.OldCatchTime) if oldPet == nil { return errorcode.ErrorCodes.ErrCannotRevertSpirit } diff --git a/logic/controller/pet_info.go b/logic/controller/pet_info.go index 5e025441e..380150ae9 100644 --- a/logic/controller/pet_info.go +++ b/logic/controller/pet_info.go @@ -26,7 +26,7 @@ func (h Controller) GetPetInfo( } return result, 0 } - ret := player.Service.Pet.PetInfo_One(data.CatchTime) + ret := player.Service.Pet.PetInfoOneByCatchTime(data.CatchTime) if ret == nil { return nil, errorcode.ErrorCodes.ErrPokemonNotExists } @@ -85,7 +85,7 @@ func (h Controller) PetReleaseToWarehouse( return nil, errorcode.ErrorCodes.ErrCannotReleaseNonWarehouse } - if !player.Service.Pet.UPdateFree(data.CatchTime, 1) { + if !player.Service.Pet.UpdateFree(data.CatchTime, 1) { return nil, errorcode.ErrorCodes.ErrSystemError } return nil, err @@ -98,7 +98,7 @@ func (h Controller) PetRetrieveFromWarehouse( //如果背包没找到,再放入背包 if _, _, ok := player.FindPet(data.CatchTime); !ok { - if !player.Service.Pet.UPdateFree(data.CatchTime, 0) { + if !player.Service.Pet.UpdateFree(data.CatchTime, 0) { return nil, errorcode.ErrorCodes.ErrSystemError } @@ -133,7 +133,7 @@ func (h Controller) TogglePetBagWarehouse( return result, errorcode.ErrorCodes.ErrPokemonIDMismatch } - if !player.Service.Pet.UPdate(*pet) { + if !player.Service.Pet.Update(*pet) { return result, errorcode.ErrorCodes.ErrSystemError } @@ -148,7 +148,7 @@ func (h Controller) TogglePetBagWarehouse( //如果背包没找到,再放入背包 if !ok { - r := player.Service.Pet.PetInfo_One(data.CatchTime) + r := player.Service.Pet.PetInfoOneByCatchTime(data.CatchTime) if r == nil { return result, errorcode.ErrorCodes.ErrPokemonNotExists } diff --git a/logic/controller/room_info.go b/logic/controller/room_info.go index 1fe0f383a..bd5ab0003 100644 --- a/logic/controller/room_info.go +++ b/logic/controller/room_info.go @@ -34,7 +34,7 @@ func (h Controller) GetRoomPetShowInfo(data *room.PetRoomListInboundInfo, c *pla result.Pets = make([]pet.PetShortInfo, 0) roomInfo := c.Service.Room.Get(data.TargetUserID) for _, catchTime := range roomInfo.ShowPokemon { - petInfo := c.Service.Pet.PetInfo_One_ohter(data.TargetUserID, catchTime) + petInfo := c.Service.Pet.PetInfoOneOther(data.TargetUserID, catchTime) if petInfo.Data.ID == 0 { continue } @@ -76,7 +76,7 @@ func (h Controller) GetAllFurniture(data *room.FitmentAllInboundEmpty, c *player // c: 当前玩家对象 // 返回: 精灵详细信息和错误码 func (h Controller) GetRoomPetInfo(data *room.C2S_RoomPetInfo, c *player.Player) (result *pet.RoomPetInfo, err errorcode.ErrorCode) { - petInfo := c.Service.Pet.PetInfo_One_ohter(data.UserID, data.CatchTime) + petInfo := c.Service.Pet.PetInfoOneOther(data.UserID, data.CatchTime) result = &pet.RoomPetInfo{} copier.CopyWithOption(result, &petInfo.Data, copier.Option{DeepCopy: true}) result.OwnerId = data.UserID diff --git a/logic/controller/room_set.go b/logic/controller/room_set.go index 0bc041f56..fad2b79b4 100644 --- a/logic/controller/room_set.go +++ b/logic/controller/room_set.go @@ -34,7 +34,7 @@ func (h Controller) SetPet(data *room.C2S_PET_ROOM_SHOW, c *player.Player) (resu result = &room.S2C_PET_ROOM_SHOW{} result.PetShowList = make([]pet.PetShortInfo, len(showPetCatchTimes)) for _, catchTime := range showPetCatchTimes { - petInfo := c.Service.Pet.PetInfo_One(catchTime) + petInfo := c.Service.Pet.PetInfoOneByCatchTime(catchTime) if petInfo == nil { continue } diff --git a/logic/service/player/pet.go b/logic/service/player/pet.go index 6f56aad37..e5fcdd293 100644 --- a/logic/service/player/pet.go +++ b/logic/service/player/pet.go @@ -83,8 +83,8 @@ func (f *Player) PetDel(catchTime uint32) { if ok { //先将背包更新 - f.Service.Pet.UPdate(*olpet) - f.Service.Pet.Pet_del(catchTime) + f.Service.Pet.Update(*olpet) + f.Service.Pet.PetDel(catchTime) f.Info.PetList = append(f.Info.PetList[:index], f.Info.PetList[index+1:]...) } } diff --git a/modules/player/controller/admin/pet.go b/modules/player/controller/admin/pet.go index 929cef6d4..c14f83cbb 100644 --- a/modules/player/controller/admin/pet.go +++ b/modules/player/controller/admin/pet.go @@ -62,7 +62,7 @@ func (c *PetBagController) GetSession(ctx context.Context, req *PetGetReq) (res func (c *PetBagController) Level(ctx context.Context, req *PetLevelReq) (res *cool.BaseRes, err error) { // m := gmap.New() - r := service.NewUserService(0).Pet.Pet_LEVEL_all() + r := service.NewUserService(0).Pet.PetLevelAll() res = &cool.BaseRes{} ress := make([]PetLevelRes, 0) @@ -112,7 +112,7 @@ func (c *PetBagController) ModPrise(ctx context.Context, req *PriseReq) (res *co } } - err = service.NewPetService(uint32(admin.UserId)).UPdatePrice(req.Ctime, req.Price, req.Free) + err = service.NewPetService(uint32(admin.UserId)).UpdatePrice(req.Ctime, req.Price, req.Free) return diff --git a/modules/player/service/pet.go b/modules/player/service/pet.go index 2ce77a88e..1dc61e6b9 100644 --- a/modules/player/service/pet.go +++ b/modules/player/service/pet.go @@ -13,83 +13,99 @@ import ( "github.com/gogf/gf/v2/os/gtime" ) -// 获取精灵信息 0是仓库,1是放生 +// nextCatchTime 生成下一个唯一捕捉时间戳（原子递增 max_ts） +func (s *PetService) nextCatchTime(m ...*gdb.Model) (uint32, error) { + dbm := cool.DBM(service.NewBaseSysUserService().Model) + if len(m) > 0 { + dbm = m[0] + } + sql := fmt.Sprintf(` +UPDATE %s +SET max_ts = CASE + WHEN max_ts < EXTRACT(EPOCH FROM NOW())::INT THEN EXTRACT(EPOCH FROM NOW())::INT + ELSE max_ts + 1 +END +WHERE id = ? AND deleted_at IS NULL +RETURNING max_ts;`, service.NewBaseSysUserService().Model.TableName()) + + ret, err := dbm.Raw(sql, s.userid).All() + if err != nil { + return 0, fmt.Errorf("生成捕捉时间失败: %w", err) + } + arr := ret.Array() + if len(arr) == 0 { + return 0, fmt.Errorf("生成捕捉时间失败: 无返回数据") + } + return arr[0].Uint32(), nil +} + +// setCatchTime 将 Pet.CatchTime 同步到 Pet.Data.CatchTime +func setCatchTime(pet *model.Pet) { + if pet != nil { + pet.Data.CatchTime = pet.CatchTime + } +} + +// 获取精灵信息 0是仓库,1是放生 func (s *PetService) PetInfo(flag int) []model.Pet { var tt []model.Pet - err := s.dbm(s.Model).Where("free", flag).Scan(&tt) - if err != nil { - return []model.Pet{} + if err := s.dbm(s.Model).Where("free", flag).Scan(&tt); err != nil { + return nil } - - for i := 0; i < len(tt); i++ { + for i := range tt { tt[i].Data.CatchTime = tt[i].CatchTime - } - return tt - } + func (s *PetService) PetCount(flag int) int { - ret, err := s.dbm(s.Model).Where("free", flag).Count() - if err != nil { return 0 } - return ret - } -func (s *PetService) UPdateFree(ctime uint32, free uint32) bool { - - res, err := s.dbm(s.Model).Where("catch_time", ctime).Data( - - "free", free, - ).Update() +func (s *PetService) UpdateFree(catchTime, free uint32) bool { + res, err := s.dbm(s.Model).Where("catch_time", catchTime).Data("free", free).Update() if err != nil { return false } r, _ := res.RowsAffected() return r > 0 } -func (s *PetService) UPdatePrice(ctime uint32, Price uint32, free uint32) error { - var item1 model.Pet + +func (s *PetService) UpdatePrice(catchTime, price, free uint32) error { + var item model.Pet var feeRate float64 - var err1 error + if free == 2 { t, _ := s.dbm(s.Model).Where("free", 2).Count() if t > 3 { return fmt.Errorf("精灵数量已满") } } else { - - s.dbm(s.Model).Where("catch_time", ctime).Scan(&item1) - _, feeRate, err1 = item1.GetOffShelfFee() - if err1 != nil { - return err1 + if err := s.dbm(s.Model).Where("catch_time", catchTime).Scan(&item); err != nil { + return err } + _, feeRate, _ = item.GetOffShelfFee() + _ = feeRate // feeRate 仅在 non-2 分支使用，在此声明以统一作用域 } - res, _ := s.dbm(s.Model). - Where("catch_time", ctime). // 限定 ctime，避免全表更新 - //Where("sale_price = ?", 0). // 只筛选 sale_price=0 的记录 - Data(g.Map{ - "sale_price": Price, - "free": free, - }).Update() - g, _ := res.RowsAffected() - if g > 0 && free != 2 && feeRate != 0 { - - amount1 := item1.CalculateOffShelfAmount(feeRate) - service.NewBaseSysUserService().UpdateFreeGold(s.userid, -int64(amount1*100)) + res, _ := s.dbm(s.Model).Where("catch_time", catchTime).Data(g.Map{ + "sale_price": price, + "free": free, + }).Update() + affected, _ := res.RowsAffected() + if affected > 0 && free != 2 && feeRate != 0 { + amount := item.CalculateOffShelfAmount(feeRate) + service.NewBaseSysUserService().UpdateFreeGold(s.userid, -int64(amount*100)) } - return nil } -func (s *PetService) BuyPet(pid uint32) error { - tt := NewPetService(0).PetInfo_One_ID(pid) +func (s *PetService) BuyPet(pid uint32) error { + tt := NewPetService(0).PetInfoOneByID(pid) if tt == nil { return fmt.Errorf("没有此精灵") } @@ -105,192 +121,136 @@ func (s *PetService) BuyPet(pid uint32) error { if !tt.UpdateTime.AddDate(0, 0, 1).Before(gtime.Now()) { return fmt.Errorf("未到购买时间") } + return g.DB().Transaction(context.TODO(), func(ctx context.Context, tx gdb.TX) error { + useGold := int64(tt.SalePrice)*102 + int64(tt.SaleCount)*5 + var user basemodel.BaseSysUser - useglod := int64(tt.SalePrice)*102 + int64(tt.SaleCount)*5 - var res1 basemodel.BaseSysUser - - err := tx.Model(basemodel.BaseSysUser{}).Where("id", s.userid).Fields("free_gold").Scan(&res1) - if err != nil { + if err := tx.Model(basemodel.BaseSysUser{}).Where("id", s.userid).Fields("free_gold").Scan(&user); err != nil { return err } - if res1.FreeGold < useglod { + if user.FreeGold < useGold { return fmt.Errorf("余额不足") } - _, err = tx.Model(basemodel.BaseSysUser{}).Where("id", s.userid).Increment("free_gold", -useglod) - if err != nil { - return err - } - res, err := tx.Model(s.Model).Where("id", tt.ID).Delete() + if _, err := tx.Model(basemodel.BaseSysUser{}).Where("id", s.userid).Increment("free_gold", -useGold); err != nil { + return err + } + + res, err := tx.Model(s.Model).Where("id", tt.ID).Delete() if err != nil { return err } - cd, _ := res.RowsAffected() - if cd == 0 { + affected, _ := res.RowsAffected() + if affected == 0 { return fmt.Errorf("重复订单") } - _, err = tx.Model(basemodel.BaseSysUser{}).Where("id", tt.PlayerID).Increment("free_gold", int64(tt.SalePrice)*98) + + if _, err := tx.Model(basemodel.BaseSysUser{}).Where("id", tt.PlayerID).Increment("free_gold", int64(tt.SalePrice)*98); err != nil { + return err + } + + catchTime, err := s.nextCatchTime(tx.Model(service.NewBaseSysUserService().Model)) if err != nil { return err } - sql := fmt.Sprintf(` -UPDATE %s -SET max_ts = CASE - WHEN max_ts < EXTRACT(EPOCH FROM NOW())::INT THEN EXTRACT(EPOCH FROM NOW())::INT - ELSE max_ts + 1 -END -WHERE id = ? AND deleted_at IS NULL -RETURNING max_ts; -`, service.NewBaseSysUserService().Model.TableName()) - // 执行 Raw SQL 并扫描返回值 - ret, err := tx.Model(service.NewBaseSysUserService().Model).Raw(sql, s.userid).All() - if err != nil { - return err + player := model.Pet{ + PlayerID: s.userid, + Data: tt.Data, + CatchTime: catchTime, + Free: 0, + SalePrice: tt.SalePrice, + SaleCount: tt.SaleCount + 1, } - //fmt.Println(ret, err) - tt.CatchTime = ret.Array()[0].Uint32() - - var player model.Pet - player.PlayerID = s.userid - player.Data = tt.Data - player.Data.OldCatchTime = 0 - player.CatchTime = tt.CatchTime - player.Free = 0 - player.SalePrice = tt.SalePrice - player.SaleCount = tt.SaleCount + 1 player.IsVip = cool.Config.ServerInfo.IsVip + player.Data.OldCatchTime = 0 - _, err = tx.Model(s.Model).Insert(player) - if err != nil { + if _, err := tx.Model(s.Model).Insert(player); err != nil { return err } - return nil }) - } -func (s *PetService) UPdate(t model.PetInfo) bool { +func (s *PetService) Update(t model.PetInfo) bool { _, err := s.dbm(s.Model).Where("catch_time", t.CatchTime).Data("data", t).Update() - return err == nil - } -func (s *PetService) PetInfo_One(cachetime uint32) *model.Pet { - m := s.dbm(s.Model).Where("catch_time", cachetime) +func (s *PetService) PetInfoOneByCatchTime(catchTime uint32) *model.Pet { var tt *model.Pet - - m.Scan(&tt) - if tt == nil { + if err := s.dbm(s.Model).Where("catch_time", catchTime).Scan(&tt); err != nil || tt == nil { return nil } - - tt.Data.CatchTime = tt.CatchTime + setCatchTime(tt) return tt } -func (s *PetService) PetInfo_One_ID(Pid uint32) *model.Pet { - m := s.dbm(s.Model).Where("id", Pid) +func (s *PetService) PetInfoOneByID(id uint32) *model.Pet { var tt *model.Pet - - m.Scan(&tt) - if tt == nil { + if err := s.dbm(s.Model).Where("id", id).Scan(&tt); err != nil || tt == nil { return nil } - - tt.Data.CatchTime = tt.CatchTime + setCatchTime(tt) return tt } -func (s *PetService) PetInfo_One_ohter(userid, cachetime uint32) model.Pet { - m := s.dbm(s.Model).Where("catch_time", cachetime) +func (s *PetService) PetInfoOneOther(userid, catchTime uint32) model.Pet { var tt model.Pet - - m.Scan(&tt) + s.dbm(s.Model).Where("catch_time", catchTime).Scan(&tt) tt.Data.CatchTime = tt.CatchTime return tt } -func (s *PetService) PetInfo_One_Unscoped(cachetime uint32) *model.Pet { - m := s.dbm(s.Model).Where("catch_time", cachetime).Unscoped() +func (s *PetService) PetInfoOneUnscoped(catchTime uint32) *model.Pet { var tt *model.Pet - - m.Scan(&tt) - if tt == nil { + if err := s.dbm(s.Model).Where("catch_time", catchTime).Unscoped().Scan(&tt); err != nil || tt == nil { return nil - } - tt.Data.CatchTime = tt.CatchTime + setCatchTime(tt) return tt } -func (s *PetService) Pet_del(cachetime uint32) { - - s.dbm(s.Model).Where("catch_time", cachetime).Delete() +func (s *PetService) PetDel(catchTime uint32) { + s.dbm(s.Model).Where("catch_time", catchTime).Delete() } -func (s *PetService) Pet_LEVEL_all() []model.Pet { + +func (s *PetService) PetLevelAll() []model.Pet { var tt []model.Pet - - s.dbm(s.Model).As("pp").Wheref(`(pp.data->>'Level')::INT > 100`).OrderDesc("(pp.data->>'Level')::INT").Scan(&tt) + s.dbm(s.Model).As("pp"). + Wheref("(pp.data->>'Level')::INT > 100"). + OrderDesc("(pp.data->>'Level')::INT"). + Scan(&tt) return tt } -// 精灵真正添加后的捕捉时间才是真正的时间 -func (s *PetService) PetAdd(y *model.PetInfo, salecount uint32) uint32 { +// PetAdd 精灵真正添加后的捕捉时间才是真正的时间 +func (s *PetService) PetAdd(y *model.PetInfo, saleCount uint32) uint32 { if y == nil { return 0 } - sql := fmt.Sprintf(` -UPDATE %s -SET max_ts = CASE - WHEN max_ts < EXTRACT(EPOCH FROM NOW())::INT THEN EXTRACT(EPOCH FROM NOW())::INT - ELSE max_ts + 1 -END -WHERE id = ? AND deleted_at IS NULL -RETURNING max_ts; -`, service.NewBaseSysUserService().Model.TableName()) - // 执行 Raw SQL 并扫描返回值 - ret, _ := cool.DBM(service.NewBaseSysUserService().Model).Raw(sql, s.userid).All() - //fmt.Println(ret, err) - y.CatchTime = ret.Array()[0].Uint32() - m1 := cool.DBM(s.Model).Where("player_id", s.userid) - var player model.Pet - player.PlayerID = s.userid - player.Data = *y - player.CatchTime = y.CatchTime - player.Free = 0 - player.SaleCount = salecount - player.IsVip = cool.Config.ServerInfo.IsVip - - _, err := m1.Insert(player) + catchTime, err := s.nextCatchTime() if err != nil { - panic(err) + return 0 } - return y.CatchTime + y.CatchTime = catchTime + + player := model.Pet{ + PlayerID: s.userid, + Data: *y, + CatchTime: catchTime, + Free: 0, + SaleCount: saleCount, + } + player.IsVip = cool.Config.ServerInfo.IsVip + if _, err := cool.DBM(s.Model).Where("player_id", s.userid).Insert(player); err != nil { + return 0 + } + return catchTime } -// func (s *PetService) ModifyBefore(ctx context.Context, method string, param map[string]interface{}) (err error) { -// admin := cool.GetAdmin(ctx) -// userId := admin.UserId -// s.userid = uint32(userId) -// // if method == "Update" { - -// // if gconv.Uint(param["free"]) != 0 { -// // err = fmt.Errorf("修改失败") -// // } -// // if userId != gconv.Uint(param["player_id"]) { -// // err = fmt.Errorf("修改失败") -// // } - -// // } - -// return -// } - type PetService struct { BaseService } @@ -305,29 +265,20 @@ func NewPetService(userid uint32) *PetService { AddOrderby: g.MapStrStr{"updateTime": "asc"}, FieldEQ: []string{"player_id", "free"}, Where: func(ctx context.Context) [][]interface{} { - return [][]interface{}{ {"free", 0, false}, - {"is_vip", 0, true}, } - }, }, PageQueryOp: &cool.QueryOp{ FieldEQ: []string{"player_id", "free"}, DataFieldEQ: []string{"ID"}, Where: func(ctx context.Context) [][]interface{} { - // var ( - // admin = cool.GetAdmin(ctx) - // // userId = admin.UserId - // ) return [][]interface{}{ - // {"player_id", userId, true}, {"free", 0, false}, {"is_vip", 0, true}, } - }, }, },