diff --git a/webapp/controller/BattleController.class.php b/webapp/controller/BattleController.class.php
index ccaf5ec..513580c 100644
--- a/webapp/controller/BattleController.class.php
+++ b/webapp/controller/BattleController.class.php
@@ -1,17 +1,8 @@
 <?php
 
-require_once('models/User.php');
-
-require_once('mt/Parameter.php');
-require_once('mt/Season.php');
-require_once('mt/Equip.php');
-
-require_once('services/PropertyChgService.php');
-require_once('services/SeasonService.php');
 require_once('services/BattleDataService.php');
 
 use phpcommon\SqlHelper;
-use models\User;
 
 class BattleController extends BaseAuthedController {
 
@@ -24,7 +15,6 @@ class BattleController extends BaseAuthedController {
         }
         $battleDataService = new services\BattleDataService();
         $battleDataService->updateBattleData();
-        $this->updateUserBaseInfo($userInfo);
         SqlHelper::insert(
             $this->_getSelfMysql(),
             't_battle_record',
@@ -38,8 +28,4 @@ class BattleController extends BaseAuthedController {
         $this->_rspOk();
     }
 
-    private function updateUserBaseInfo($userInfo)
-    {
-    }
-
 }
diff --git a/webapp/services/BattleDataService.php b/webapp/services/BattleDataService.php
index 573f0ed..e95bb50 100644
--- a/webapp/services/BattleDataService.php
+++ b/webapp/services/BattleDataService.php
@@ -9,6 +9,7 @@ require_once('mt/Season.php');
 require_once('models/Season.php');
 require_once('models/Battle.php');
 
+use mt;
 use phpcommon\SqlHelper;
 use models\Season;
 use models\Battle;
@@ -32,8 +33,14 @@ class BattleDataService extends BaseService {
             return;
         }
         $hisBattleData = Battle::getMyBattleData();
+        if (!isset($hisBattleData)) {
+            $hisBattleData = array(
+                'createtime' => myself()->_getNowTime(),
+                'modifytime' => myself()->_getNowTime()
+            );
+        }
         $this->apply($hisBattleData);
-        Battle::add($hisBattleData);
+        Battle::add(json_encode($hisBattleData));
         $seasonBattleData = json_decode($this->seasonDb['battle_data'], true);
         if (!isset($seasonBattleData['today_data'])) {
             $seasonBattleData['today_data'] = array(
@@ -74,6 +81,12 @@ class BattleDataService extends BaseService {
         $this->apply($seasonBattleData['season_data']);
         $this->apply($seasonBattleData['today_data']);
         $this->apply($seasonBattleData['this_week_data']);
+        Season::update(
+            $this->currSeasonMeta['id'],
+            array(
+                'battle_data' => json_encode($seasonBattleData),
+            )
+        );
     }
 
     private function apply(&$battleData)
@@ -124,8 +137,8 @@ class BattleDataService extends BaseService {
         $this->incValue($battleData, 'ride_car_move_distance', getReqVal('ride_car_move_distance', 0));
         $this->incValue($battleData, 'ride_car_kills', getReqVal('ride_car_kills', 0));
         $this->maxValue($battleData, 'max_single_battle_hero_lv', getReqVal('max_single_battle_hero_lv', 0));
-        $this->procWeaponEquip($battleData);
-        $this->procWeaponSlot($battleData);
+        $this->procWeaponsEquip($battleData);
+        $this->procWeaponsSlot($battleData);
         $this->procHeros($battleData);
         if (!isset($battleData['createtime'])) {
             $battleData['createtime'] = myself()->_getNowTime();
diff --git a/webapp/services/MissionService.php b/webapp/services/MissionService.php
index e357d64..8301d30 100644
--- a/webapp/services/MissionService.php
+++ b/webapp/services/MissionService.php
@@ -372,7 +372,7 @@ class MissionService extends BaseService {
         }
         break;
         }
-        $missionDto['current'] = $missionDto['target'];
+        //$missionDto['current'] = $missionDto['target'];
         if ($missionDto['current'] >= $missionDto['target']) {
             $missionDto['current'] = $missionDto['target'];
             $missionDto['state'] = Mission::RECEIVEABLE_STATE;