From 0b2d127faf3e5f63ec6fd851eb0823df51791699 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 05:33:40 +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方法中的事务处理逻辑，使用结构体初始化简化代码
- 添加nextCatchTime辅助方法用于生成唯一的捕捉时间戳
- 优化PetAdd方法的实现逻辑，提高代码可读性
- 清理无用注释代码
```
---
 modules/player/service/pet.go | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/modules/player/service/pet.go b/modules/player/service/pet.go
index 1dc61e6b..20dec545 100644
--- a/modules/player/service/pet.go
+++ b/modules/player/service/pet.go
@@ -226,14 +226,14 @@ func (s *PetService) PetLevelAll() []model.Pet {
 }
 
 // PetAdd 精灵真正添加后的捕捉时间才是真正的时间
-func (s *PetService) PetAdd(y *model.PetInfo, saleCount uint32) uint32 {
+func (s *PetService) PetAdd(y *model.PetInfo, saleCount uint32) (uint32, error) {
 	if y == nil {
-		return 0
+		return 0, nil
 	}
 
 	catchTime, err := s.nextCatchTime()
 	if err != nil {
-		return 0
+		return 0, err
 	}
 	y.CatchTime = catchTime
 
@@ -246,9 +246,9 @@ func (s *PetService) PetAdd(y *model.PetInfo, saleCount uint32) uint32 {
 	}
 	player.IsVip = cool.Config.ServerInfo.IsVip
 	if _, err := cool.DBM(s.Model).Where("player_id", s.userid).Insert(player); err != nil {
-		return 0
+		return 0, err
 	}
-	return catchTime
+	return catchTime, nil
 }
 
 type PetService struct {