Browse Source

修复社区站点测试bug

master
lanzu_qsy 6 years ago
parent
commit
6eb22b195a
  1. 11
      app/Admin/Controllers/LanzuCsInfoController.php
  2. 5
      app/Admin/Controllers/LanzuCsWithdrawController.php
  3. 2
      app/Admin/Controllers/LanzuFinancialRecord.php
  4. 2
      app/Admin/Controllers/LanzuServiceRewardController.php
  5. 1
      app/Models/LanzuUserBalance.php

11
app/Admin/Controllers/LanzuCsInfoController.php

@ -9,6 +9,7 @@ use App\Admin\Repositories\LanzuCsInfo;
use App\Models\AdminUsers; use App\Models\AdminUsers;
use App\Models\FinancialRecord; use App\Models\FinancialRecord;
use App\Models\ImsCjdcMarket; use App\Models\ImsCjdcMarket;
use App\Models\ImsCjdcUser;
use App\Models\LanzuUserBalance; use App\Models\LanzuUserBalance;
use Dcat\Admin\Admin; use Dcat\Admin\Admin;
use Dcat\Admin\Form; use Dcat\Admin\Form;
@ -16,6 +17,7 @@ use Dcat\Admin\Grid;
use Dcat\Admin\Show; use Dcat\Admin\Show;
use Dcat\Admin\Controllers\AdminController; use Dcat\Admin\Controllers\AdminController;
use \App\Models\LanzuCsInfo as modelCsInfo; use \App\Models\LanzuCsInfo as modelCsInfo;
use function foo\func;
class LanzuCsInfoController extends AdminController class LanzuCsInfoController extends AdminController
{ {
@ -90,7 +92,14 @@ class LanzuCsInfoController extends AdminController
$form->select('market_id', '所属市场')->options(ImsCjdcMarket::getMarket())->required(); $form->select('market_id', '所属市场')->options(ImsCjdcMarket::getMarket())->required();
$form->text('address', '社区地址')->required(); $form->text('address', '社区地址')->required();
$form->radio('status', '状态')->options(['禁用', '启用'])->default(1); $form->radio('status', '状态')->options(['禁用', '启用'])->default(1);
//$form->datetime('start_time')->value('1598239137');
$form->saving(function (Form $form){
//检验用户user_id 是否存在
$count = ImsCjdcUser::where('id',$form->user_id)->count();
if (!$count){
return $form->error('用户ID不存在');
}
});
$form->saved(function (Form $form, $cid) { $form->saved(function (Form $form, $cid) {
$model = new modelCsInfo(); $model = new modelCsInfo();
if ($form->isCreating()) { if ($form->isCreating()) {

5
app/Admin/Controllers/LanzuCsWithdrawController.php

@ -25,6 +25,7 @@ class LanzuCsWithdrawController extends AdminController
*/ */
protected function grid() protected function grid()
{ {
return Grid::make(new LanzuCsWithdraw('csInfo'), function (Grid $grid) { return Grid::make(new LanzuCsWithdraw('csInfo'), function (Grid $grid) {
$user = Admin::user(); $user = Admin::user();
if (!$user->isRole('lanzu_cs')) {//如果不是社区站点的角色登陆,则隐藏提现入口 if (!$user->isRole('lanzu_cs')) {//如果不是社区站点的角色登陆,则隐藏提现入口
@ -35,6 +36,8 @@ class LanzuCsWithdrawController extends AdminController
} }
}); });
} else { } else {
$cid = LanzuCsInfo::where('admin_user_id',$user->id)->pluck('id')->first();
$grid->model()->where('cs_id',$cid);
$grid->disableEditButton(); $grid->disableEditButton();
} }
$grid->disableViewButton(); $grid->disableViewButton();
@ -87,7 +90,7 @@ class LanzuCsWithdrawController extends AdminController
if ($user->isRole('lanzu_cs')) {//如果是社区站点角色 if ($user->isRole('lanzu_cs')) {//如果是社区站点角色
$cs = LanzuCsInfo::where('admin_user_id', $user->id)->first(); $cs = LanzuCsInfo::where('admin_user_id', $user->id)->first();
if ($cs) { if ($cs) {
$form->text('amount', '可提现金额')->value(LanzuUserBalance::getBalance($cs->id, 3))->disable();
$form->text('amount', '可提现金额')->value(LanzuUserBalance::getBalance($user->id, 3))->disable();
$form->hidden('cs_id', '提现用户id')->value($cs->id); $form->hidden('cs_id', '提现用户id')->value($cs->id);
$form->text('csInfo.name', '提现用户')->value($cs->name)->disable(); $form->text('csInfo.name', '提现用户')->value($cs->name)->disable();
$form->number('money')->min(0)->max(env('MAX_MONEY')); $form->number('money')->min(0)->max(env('MAX_MONEY'));

2
app/Admin/Controllers/LanzuFinancialRecord.php

@ -58,7 +58,7 @@ class LanzuFinancialRecord extends AdminController
$grid->disableEditButton(); $grid->disableEditButton();
$grid->disableDeleteButton(); $grid->disableDeleteButton();
}); });
} }

2
app/Admin/Controllers/LanzuServiceRewardController.php

@ -33,6 +33,8 @@ class LanzuServiceRewardController extends AdminController
$grid->created_at; $grid->created_at;
$grid->updated_at; $grid->updated_at;
$grid->disableViewButton(); $grid->disableViewButton();
$grid->disableCreateButton();
$grid->disableDeleteButton();
$grid->filter(function (Grid\Filter $filter) { $grid->filter(function (Grid\Filter $filter) {
$filter->equal('id'); $filter->equal('id');

1
app/Models/LanzuUserBalance.php

@ -19,6 +19,7 @@ class LanzuUserBalance extends Model
public static function getBalance($uid, $uType = 0) public static function getBalance($uid, $uType = 0)
{ {
$row = self::where(['source_id' => $uid, 'user_type' => $uType])->first(); $row = self::where(['source_id' => $uid, 'user_type' => $uType])->first();
if ($row) { if ($row) {
return $row->balance; return $row->balance;
} else { } else {

Loading…
Cancel
Save