Merge branch 'feature/airdrop' into 'master'

api/controllers/AirDropController.php

@@ -147,7 +147,7 @@ class AirDropController extends BaseController
 
         $this->data = AirDropApplyRecord::find()
             ->where(['apply_id' => $model['id'], 'reach' => AirDropApplyRecord::REACH_YES])
-            ->sum('bonus_token');
+            ->sum('amount');
         if (empty($this->data)) {
             $this->data = 0;
             goto doEnd;

console/controllers/AirDropController.php

@@ -40,14 +40,14 @@ class AirDropController extends Controller
                     $draw_success = AirDropApplyRecord::find()
                         ->where(['apply_id' => $val['id'], 'draw_status' => AirDropApplyRecord::STATUS_DRAW_SUEEESS])
                         ->andWhere(['<', 'create_time', $expiry_date])
-                        ->sum('bonus_token');
+                        ->sum('amount');
                     $draw_success = empty($draw_success) ? 0 : (int)$draw_success;
 
                     //总收益
                     $income = AirDropApplyRecord::find()
                         ->where(['apply_id' => $val['id'], 'reach' => AirDropApplyRecord::REACH_YES])
                         ->andWhere(['<', 'create_time', $expiry_date])
-                        ->sum('bonus_token');
+                        ->sum('amount');
                     $income = empty($income) ? 0 : (int)$income;
 
                     //未领取
@@ -136,7 +136,7 @@ class AirDropController extends Controller
         foreach ($record as $val) {
             go(function () use ($val) {
                 \Co::sleep(0.5);
-                $amount = $val->amount;
+                $amount = $val->amount * 1e8;
                 $fee = 1;
                 $note = '';
                 $execer = 'token';