Commit f47dae56 authored by rlgy's avatar rlgy

update

parent d13972a7
...@@ -102,7 +102,6 @@ class CoinReleaseCheckController extends BaseController ...@@ -102,7 +102,6 @@ class CoinReleaseCheckController extends BaseController
$check_ids = array_unique(array_values(array_merge($check_ids, array_column($datas, 'check_second_uid')))); $check_ids = array_unique(array_values(array_merge($check_ids, array_column($datas, 'check_second_uid'))));
//获取所有管理员 //获取所有管理员
$admins = $this->getAccessAdmins(); $admins = $this->getAccessAdmins();
foreach ($datas as $key => &$value) { foreach ($datas as $key => &$value) {
$value['check_first_uid'] = $admins[$value['check_first_uid']]; $value['check_first_uid'] = $admins[$value['check_first_uid']];
$value['check_second_uid'] = $admins[$value['check_second_uid']]; $value['check_second_uid'] = $admins[$value['check_second_uid']];
...@@ -145,7 +144,9 @@ class CoinReleaseCheckController extends BaseController ...@@ -145,7 +144,9 @@ class CoinReleaseCheckController extends BaseController
return ['code' => -1, 'msg' => '初审未通过']; return ['code' => -1, 'msg' => '初审未通过'];
} }
} elseif (self::STEP_CANCEL == $step) { } elseif (self::STEP_CANCEL == $step) {
$model->status = CoinReleaseCheck::STATUS_CANCEL; $model->check_first_uid = Yii::$app->user->id;
$model->check_second_uid = Yii::$app->user->id;
$model->status = CoinReleaseCheck::STATUS_CANCEL;
} }
if ($model->save(false)) { if ($model->save(false)) {
if ($step == self::STEP_CHECK_SECOND && CoinReleaseCheck::CHECK_SECOND_STATUS_SUCCEED == $model->check_second_status) { if ($step == self::STEP_CHECK_SECOND && CoinReleaseCheck::CHECK_SECOND_STATUS_SUCCEED == $model->check_second_status) {
......
...@@ -80,7 +80,7 @@ class GuodunController extends BaseController ...@@ -80,7 +80,7 @@ class GuodunController extends BaseController
$user_asset = CoinReleaseMember::findOne([$id]); $user_asset = CoinReleaseMember::findOne([$id]);
//判断余额师傅充足 //判断余额师傅充足
if ($user_asset->release < $amount * 1e5) { if ($user_asset->release < $amount * 1e8) {
$response->build(-1, '余额不足!'); $response->build(-1, '余额不足!');
return $response; return $response;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment