From 1c5e469e53c3d51bb8ac1d78a4b4a7680a818aea Mon Sep 17 00:00:00 2001
From: hujiabin <519660157@qq.com>
Date: Wed, 3 Apr 2024 14:41:33 +0800
Subject: [PATCH] 1

---
 sql/gamedb2006_migrate_240305_01.sql      | 1 -
 webapp/models/BattleSettlement.php        | 4 +---
 webapp/services/RoomBattleDataService.php | 3 +--
 webapp/services/TameBattleDataService.php | 5 ++---
 4 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/sql/gamedb2006_migrate_240305_01.sql b/sql/gamedb2006_migrate_240305_01.sql
index 8523d8d4..07002226 100644
--- a/sql/gamedb2006_migrate_240305_01.sql
+++ b/sql/gamedb2006_migrate_240305_01.sql
@@ -10,7 +10,6 @@ alter table t_hero drop column base_attr;
 
 alter table t_chip add column  `wealth_attr` mediumblob COMMENT '财富值属性';
 
-alter table t_battle_settlement_team add column  `status` tinyint(2) NOT NULL DEFAULT '0' COMMENT '0:未结算 1：已结算';
 
 insert into version (version) values(2024030501);
 
diff --git a/webapp/models/BattleSettlement.php b/webapp/models/BattleSettlement.php
index dd24aaec..ea582758 100644
--- a/webapp/models/BattleSettlement.php
+++ b/webapp/models/BattleSettlement.php
@@ -118,7 +118,7 @@ class BattleSettlement extends BaseModel
         return $data;
     }
 
-    public static function addTeam($battleUuid, $roomUuid, $data,$status)
+    public static function addTeam($battleUuid, $roomUuid, $data)
     {
         SqlHelper::upsert
         (myself()->_getSelfMysql(),
@@ -129,14 +129,12 @@ class BattleSettlement extends BaseModel
             ),
             array(
                 'data' => json_encode($data),
-                'status' => $status,
                 'modifytime' => myself()->_getNowTime(),
             ),
             array(
                 'battle_uuid' => $battleUuid,
                 'room_uuid' => $roomUuid,
                 'data' => json_encode($data),
-                'status' => $status,
                 'createtime' => myself()->_getNowTime(),
                 'modifytime' => myself()->_getNowTime(),
             )
diff --git a/webapp/services/RoomBattleDataService.php b/webapp/services/RoomBattleDataService.php
index bd52340e..70164044 100644
--- a/webapp/services/RoomBattleDataService.php
+++ b/webapp/services/RoomBattleDataService.php
@@ -128,8 +128,7 @@ class RoomBattleDataService extends BaseService {
         BattleSettlement::addTeam(
             $this->battleSettlementDb['battle_uuid'],
             $this->battleSettlementDb['room_uuid'],
-            $battleData,
-            1
+            $battleData
         );
 
     }
diff --git a/webapp/services/TameBattleDataService.php b/webapp/services/TameBattleDataService.php
index 0078ce7f..985bb84e 100644
--- a/webapp/services/TameBattleDataService.php
+++ b/webapp/services/TameBattleDataService.php
@@ -291,7 +291,7 @@ class TameBattleDataService extends BaseService {
                         }
                     }
                 }
-                BattleSettlement::addTeam($battle_uuid,$room_uuid,$data,$db['status']);
+                BattleSettlement::addTeam($battle_uuid,$room_uuid,$data);
             }
         }
     }
@@ -616,8 +616,7 @@ class TameBattleDataService extends BaseService {
         BattleSettlement::addTeam(
             getXVal($this->allInfo,'battle_uuid', 0),
             getXVal($this->allInfo,'room_uuid', 0),
-            $data,
-            0
+            $data
         );
     }