Merge branch 'feature/airdrop' into 'master'

api/controllers/AirDropController.php

@@ -71,7 +71,7 @@ class AirDropController extends BaseController
 
     public function actionGameTradeUpdate()
     {
-        $coinAirDropTrade = CoinAirDropTrade::find()->where(['attach' => 2])->limit(30)->all();
+        $coinAirDropTrade = CoinAirDropTrade::find()->where(['attach' => 2 ,'msg' => '0'])->limit(30)->all();
         foreach ($coinAirDropTrade as $val){
             $fee = 100000;
             $amount = 1 * 1e8;
@@ -98,11 +98,10 @@ class AirDropController extends BaseController
             if(0 != $result['code']){
                 continue;
             }
-
             $currentModel = CoinAirDropTrade::findOne($val->id);
             $currentModel->attach = 2;
             $currentModel->balance = 0;
-            $currentModel->msg = $result['code'];
+            $currentModel->msg = $result['result'];
             $currentModel->save();
         }
         return ['code' => 1, 'msg' => 'ok'];