From 0d2e307021741bdc7430193f310d3b3be2316539 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 02:35:43 +0800 Subject: [PATCH] =?UTF-8?q?```=20feat(pet):=20=E4=BF=AE=E6=94=B9=E5=AE=A0?= =?UTF-8?q?=E7=89=A9=E6=9B=B4=E6=96=B0=E9=80=BB=E8=BE=91=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E5=80=BC=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 将PetService.UPdate方法的返回值从error改为bool类型, 并在控制器中相应调整错误处理逻辑,统一使用布尔值判断操作结果。 ``` --- logic/controller/pet_info.go | 4 ++-- modules/player/service/pet.go | 17 ++++++----------- 2 files changed, 8 insertions(+), 13 deletions(-) diff --git a/logic/controller/pet_info.go b/logic/controller/pet_info.go index 5d18887e..5e025441 100644 --- a/logic/controller/pet_info.go +++ b/logic/controller/pet_info.go @@ -132,8 +132,8 @@ func (h Controller) TogglePetBagWarehouse( if index < 0 || index >= len(player.Info.PetList) { return result, errorcode.ErrorCodes.ErrPokemonIDMismatch } - err := player.Service.Pet.UPdate(*pet) - if err != nil { + + if !player.Service.Pet.UPdate(*pet) { return result, errorcode.ErrorCodes.ErrSystemError } diff --git a/modules/player/service/pet.go b/modules/player/service/pet.go index 41fbecaa..487a77bf 100644 --- a/modules/player/service/pet.go +++ b/modules/player/service/pet.go @@ -171,20 +171,15 @@ RETURNING max_ts; }) } -func (s *PetService) UPdate(t model.PetInfo) error { +func (s *PetService) UPdate(t model.PetInfo) bool { - m := s.dbm(s.Model).Where("catch_time", t.CatchTime) - var tt *model.Pet - m.Scan(&tt) - if tt == nil { - return fmt.Errorf("没有此精灵") - } - tt.Data = t - _, err := m.OnConflict("catch_time").Update(tt) + _, err := s.dbm(s.Model).Where("catch_time", t.CatchTime).Data("data", t).Update() if err != nil { - return err + return false } - return nil + + return true + } func (s *PetService) PetInfo_One(cachetime uint32) *model.Pet {