feat: EK-879: 【AE】管理员增加“Country”属性，根据所选国家限制登录后所显示的奖金、余额等数据（二期）.

common/models/forms/UserBonusForm.php

@@ -2,6 +2,7 @@
 namespace common\models\forms;
 
 use common\components\Model;
+use Yii;
 use yii\base\Exception;
 
 /**
@@ -47,7 +48,8 @@ class UserBonusForm extends Model
         // 异步处理添加任务
         $settings = \Yii::$app->params['swooleAsyncTimer'];
         $bonusSettings = \Yii::$app->params['swooleBonusConfig'];
-        $settings = array_merge($settings, $bonusSettings);
+        $adminId = Yii::$app->getUser()->getUserInfo()['id'];
+        $settings = array_merge($settings, $bonusSettings, $adminId);
         $taskKey = \Yii::$app->swooleAsyncTimer->asyncHandle('bonus/auto-withdraw', \Yii::$app->request->get(), $settings);
         if($taskKey === false){
             $this->addError('perf', '请求失败');

common/models/forms/WithdrawForm.php

@@ -776,7 +776,6 @@ class WithdrawForm extends Model {
                     if (!$withdrawModel->save()) {
                         throw new Exception(Form::formatErrorsForApi($withdrawModel->getErrors()));
                     }
-//                    print_r($data['BONUS'].',,'.$i.PHP_EOL);
                     $transaction->commit();
                     unset($withdrawModel);
                 } catch (Exception $e) {

console/controllers/BonusController.php

@@ -51,6 +51,7 @@ use common\helpers\Excel;
 use common\helpers\Form;
 use common\helpers\http\RemoteUploadApi;
 use common\helpers\Log;
+use common\helpers\LoggerTool;
 use common\libs\export\module\BonusExport;
 use common\models\forms\PeriodForm;
 use common\models\forms\UserPerformanceForm;
@@ -529,10 +530,14 @@ class BonusController extends BaseController
      *
      */
     public function actionAutoWithdraw($taskKey){
-        Cache::setWithdrawLock(1);
-        $formModel = new WithdrawForm();
-        $formModel->batchWithdraw(1000,0);
-        Cache::setWithdrawLock(0);
+        $params = Cache::getAsyncParams($taskKey);
+
+        LoggerTool::debug(['actionAutoWithdraw', $params]);
+
+//        Cache::setWithdrawLock(1);
+//        $formModel = new WithdrawForm();
+//        $formModel->batchWithdraw(1000,0);
+//        Cache::setWithdrawLock(0);
     }
 
     /**