Merge branch 'master' into develop

api/controllers/AirDropController.php

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

console/controllers/AirDropController.php

@@ -107,7 +107,7 @@ class AirDropController extends Controller
 
         foreach ($applies as $apply) {
             $exist = AirDropRulePool::find()->where(['identifier' => $apply->identifier])->one();
-            if (false == $exist) continue;
+            if (false == $exist || false == $apply->wallet_address) continue;
             $result = $service->getBalance($apply->wallet_address, $execer);
             if (0 != $result['code']) continue;
             $balance = $result['result'][0]['balance'] ?? 0;