Merge branch 'main' of https://cnb.cool/blzing/blazing

feat(fight): 新增团战胜利关闭和超时退出功能

新增 GroupFightWinClose 和 GroupFightTimeoutExit 方法，
用于处理团战胜利关闭和超时退出逻辑，统一调用 QuitFight() 退出战斗。

fix(gold_list): 修复挂单服务中的逻辑错误和潜在异常

修复了 GoldListService 中的多处问题：
- 修正条件判断语句格式
- 添加数据库查询错误检查
- 优化

logic/controller/fight_base.go

@@ -74,6 +74,20 @@ func (h Controller) GroupEscape(data *GroupEscapeInboundInfo, c *player.Player)
 	return nil, 0
 }
 
+func (h Controller) GroupFightWinClose(data *GroupFightWinCloseInboundInfo, c *player.Player) (result *fight.NullOutboundInfo, err errorcode.ErrorCode) {
+	if c != nil {
+		c.QuitFight()
+	}
+	return nil, -1
+}
+
+func (h Controller) GroupFightTimeoutExit(data *GroupFightTimeoutExitInboundInfo, c *player.Player) (result *fight.NullOutboundInfo, err errorcode.ErrorCode) {
+	if c != nil {
+		c.QuitFight()
+	}
+	return nil, -1
+}
+
 // UseSkill 使用技能包
 func (h Controller) UseSkill(data *UseSkillInInfo, c *player.Player) (result *fight.NullOutboundInfo, err errorcode.ErrorCode) {
 	if err := h.checkFightStatus(c); err != 0 {

logic/controller/inbound_fight.go

@@ -49,6 +49,14 @@ type GroupEscapeInboundInfo struct {
 	ActorIndex uint8
 }
 
+type GroupFightWinCloseInboundInfo struct {
+	Head common.TomeeHeader `cmd:"7574" struc:"skip"`
+}
+
+type GroupFightTimeoutExitInboundInfo struct {
+	Head common.TomeeHeader `cmd:"7587" struc:"skip"`
+}
+
 // EscapeFightInboundInfo 定义请求或响应数据结构。
 type EscapeFightInboundInfo struct {
 	Head common.TomeeHeader `cmd:"2410" struc:"skip"`

modules/player/service/gold_list.go

@@ -29,7 +29,7 @@ func (s *GoldListService) ModifyBefore(ctx context.Context, method string, param
 		if t > 0 {
 			return fmt.Errorf("不允许多挂单")
 		}
-		if gconv.Float64(param["rate"]) > 2{
+		if gconv.Float64(param["rate"]) > 2 {
 			r := g.List{}
 			for i := 0; i < grand.N(1, 3); i++ {
 				r = append(r, g.Map{"rate": param["rate"], "exchange_num": param["exchange_num"], "player_id": 10001})
@@ -38,13 +38,21 @@ func (s *GoldListService) ModifyBefore(ctx context.Context, method string, param
 			s.dbm_fix(s.Model).Data(r).Insert()
 
 		}
-	}else{
+	} else {
 		var items []model.GoldBeanOrder
-		s.dbm_fix(s.Model).WhereIn("id", param["ids"]).Scan(&items)
-		for _, v := range items {
-			s.dbm_fix(s.Model).Where("rate", v.Rate, "exchange_num", v.ExchangeNum,"player_id", 10001).Delete()
+		if err = s.dbm_fix(s.Model).WhereIn("id", param["ids"]).Scan(&items); err != nil {
+			return err
 		}
-	 
+		for _, v := range items {
+			if _, err = s.dbm_fix(s.Model).
+				Where("rate", v.Rate).
+				Where("exchange_num", v.ExchangeNum).
+				Where("player_id", 10001).
+				Delete(); err != nil {
+				return err
+			}
+		}
+
 	}
 
 	return