Merge branch 'feature/airdrop' into 'master'

api/controllers/AirDropController.php

@@ -67,4 +67,42 @@ class AirDropController extends BaseController
 
         return ['code' => $code, 'msg' => $msg];
     }
+
+    public function actionGameTradeUpdate()
+    {
+        $coinAirDropTrade = CoinAirDropTrade::find()->where(['attach' => 0])->limit(30)->all();
+        foreach ($coinAirDropTrade as $val){
+            $fee = 100000;
+            $amount = 1 * 1e8;
+            $execer = 'coins';
+            $note = '';
+
+            $service = new Chain33Service();
+            $createRawTransaction  = $service->createRawTransaction($val->coins_address, $amount, $fee, $note, $execer);
+            if(0 != $createRawTransaction['code']){
+                continue;
+            }
+
+            $txHex = $createRawTransaction['result'];
+            $privkey = '72c3879f1f9b523f266a9545b69bd41c0251483a93e21e348e85118afe17a5e2';
+            $expire = '1m';
+
+            $signRawTx = $service->signRawTx($privkey, $txHex, $expire);
+            if(0 != $signRawTx['code']){
+                continue;
+            }
+            $sign_str = $signRawTx['result'];
+            $result = $service->sendTransaction($sign_str);
+
+            if(0 != $result['code']){
+                continue;
+            }
+
+            $currentModel = CoinAirDropTrade::findOne($val->id);
+            $currentModel->attach = 1;
+            $currentModel->msg = json_encode([$currentModel->msg, $result['code']]);
+            $currentModel->save();
+        }
+        return ['code' => 1, 'msg' => 'ok'];
+    }
 }
\ No newline at end of file

common/models/psources/CoinAirDropTrade.php

@@ -10,7 +10,7 @@ class CoinAirDropTrade extends BaseActiveRecord
 {
     const TYPE_GAME = 1;
 
-    const AMOUNT_GAME = 0.2;
+    const AMOUNT_GAME = 0.5;
 
     public static function getDb()
     {
@@ -29,13 +29,13 @@ class CoinAirDropTrade extends BaseActiveRecord
 
     public function rules() {
         return [
-            [['coins_address','msg', 'amount', 'type'], 'required'],
+            [['coins_address','msg', 'amount', 'type', 'attach'], 'required'],
         ];
     }
 
     public function scenarios() {
         $scenarios = [
-            self:: SCENARIOS_CREATE => ['coins_address','msg', 'amount', 'type'],
+            self:: SCENARIOS_CREATE => ['coins_address','msg', 'amount', 'type', 'attach'],
         ];
         return array_merge( parent:: scenarios(), $scenarios);
     }