修改部分代码

modules/blazing/service/pet.go

@@ -47,15 +47,26 @@ func (s *UserService) PetExec(ctime uint32, t func(uint32, model.PetInfo) model.
 	m1.Save(player)
 
 }
-func (s *UserService) PetAdd(ctime uint32, inbag int, y model.PetInfo) {
+func (s *UserService) PetAdd(y model.PetInfo) {
 
 	m1 := cool.DBM(s.pet.Model).Where("player_id", s.userid)
 	var player model.Pet
 	player.PlayerID = s.userid
-	player.CatchTime = ctime
-	player.InBag = inbag
+	player.CatchTime = y.CatchTime
+	player.InBag = 1
 	tmp, _ := json.Marshal(y)
 	player.Data = string(tmp)
 	m1.Insert(player)
 
 }
+func (s *UserService) PetM(ctime, type1 int) model.PetInfo {
+
+	m1 := cool.DBM(s.pet.Model).Where("player_id", s.userid).Where("catch_time", ctime)
+	var player model.Pet
+	player.InBag = type1
+	m1.Update(player)
+	var tt model.PetInfo
+	json.Unmarshal([]byte(player.Data), &tt)
+	return tt
+
+}

modules/blazing/service/task.go

@@ -58,7 +58,7 @@ func (s *UserService) InitTask() {
 	//panic(err)
 
 }
-func (s *UserService) TaskExec(t func([]model.TaskInfo) []model.TaskInfo, isdaliy bool) (ret bool) {
+func (s *UserService) TaskExec(t func([]model.TaskInfo) []model.TaskInfo) (ret bool) {
 
 	//待实现检测是否为每日任务
 	// if isdaliy {