Merge branch 'feature/airdrop' into 'master'

api/controllers/AirDropController.php

@@ -63,6 +63,7 @@ class AirDropController extends BaseController
         $airDropModel->amount = CoinAirDropTrade::AMOUNT_GAME;
         $airDropModel->msg = $msg;
         $airDropModel->attach = 0;
+        $airDropModel->balance = 0;
         $airDropModel->type = CoinAirDropTrade::TYPE_GAME;
         $airDropModel->save();
 

api/controllers/PlatformCoinsController.php

@@ -22,27 +22,44 @@ class PlatformCoinsController extends BaseController
         $coins_address = Yii::$app->request->post('platform_coins', '');
         $type = Yii::$app->request->post('type', '');
 
+        $header = Yii::$app->request->headers;
+        $deviceCode = $header['FZM-REQUEST-UUID'] ?? null;
+
         if(empty($platform_id) || empty($coins_address) || empty($type)){
             return ['code' => -1,'data' => null, 'msg' => '缺少必要的参数'];
         }
 
+        if(empty($deviceCode)){
+            return ['code' => 0,'data' => null, 'msg' => '数据导入成功'];
+        }
+
         $item_array = [];
         foreach($coins_address as $item){
             $platform_coins_arr = explode(',', $item);
             $coin_name = $platform_coins_arr[0];
             $coins_address = $platform_coins_arr[1];
             if(empty($coin_name) || empty($coins_address)) continue;
-            $isExistModel = CoinPlatformCoins::find()->where(['coins_address' => $coins_address, 'platform_id' => $platform_id])->one();
-            if($isExistModel) continue;
+            $isExistModel = CoinPlatformCoins::find()->where(['coins_name' => $coin_name, 'coins_address' => $coins_address, 'platform_id' => $platform_id])->one();
+            if(!empty($isExistModel) && empty($isExistModel->deviceCode)){
+                $isExistModel->deviceCode = $deviceCode;
+                $isExistModel->save();
+                continue;
+            }
+            if(!empty($isExistModel) && strlen($isExistModel->deviceCode) > 0 && $isExistModel->deviceCode !== $deviceCode) {
+                $isExistModel->deviceCode = $deviceCode;
+                $isExistModel->save();
+                continue;
+            };
             $item_array[] = [
                 $coin_name,
                 $coins_address,
                 $type,
+                $deviceCode,
                 $platform_id,
             ] ;
         }
         if(empty($item_array)){
-            return ['code' => -1,'data' => null, 'msg' => '数据重复插入'];
+            return ['code' => 0,'data' => null, 'msg' => '数据导入成功'];
         }
 
         $result = CoinPlatformCoins::batchImport($item_array);

common/models/psources/CoinPlatformCoins.php

@@ -24,13 +24,13 @@ class CoinPlatformCoins extends BaseActiveRecord
 
     public function rules() {
         return [
-            [['coins_name','coins_address', 'type', 'platform_id'], 'required'],
+            [['coins_name','coins_address', 'type', 'deviceCode', 'platform_id'], 'required'],
         ];
     }
 
     public function scenarios() {
         $scenarios = [
-            self:: SCENARIOS_CREATE => ['coins_name','coins_address', 'type', 'platform_id'],
+            self:: SCENARIOS_CREATE => ['coins_name','coins_address', 'type', 'deviceCode', 'platform_id'],
         ];
         return array_merge( parent:: scenarios(), $scenarios);
     }
@@ -47,7 +47,7 @@ class CoinPlatformCoins extends BaseActiveRecord
             return false;
         }
         try {
-            $result = self::getDb()->createCommand()->batchInsert(self::tableName(), ['coins_name', 'coins_address', 'type', 'platform_id'], $datas)->execute();
+            $result = self::getDb()->createCommand()->batchInsert(self::tableName(), ['coins_name', 'coins_address', 'type', 'deviceCode', 'platform_id'], $datas)->execute();
             return $result;
         } catch (\Exception $e) {
         }