Browse Source

优化市场经理可见商户

master
lanzu_qinsheng 5 years ago
parent
commit
04a42fcb5d
  1. 2
      app/Admin/Controllers/LanzuCsWithdrawController.php
  2. 9
      app/Admin/Controllers/LanzuFinancialRecord.php
  3. 15
      app/Admin/Controllers/v3/StoreController.php

2
app/Admin/Controllers/LanzuCsWithdrawController.php

@ -146,7 +146,7 @@ class LanzuCsWithdrawController extends AdminController
if (!$csInfo) { if (!$csInfo) {
return $form->error('社区站点不存在或已删除'); return $form->error('社区站点不存在或已删除');
} }
$data = []; $data = [];
$user = ImsCjdcUser::find($csInfo->user_id); $user = ImsCjdcUser::find($csInfo->user_id);
$data['openid'] = $user->openid; $data['openid'] = $user->openid;

9
app/Admin/Controllers/LanzuFinancialRecord.php

@ -42,10 +42,15 @@ class LanzuFinancialRecord extends AdminController
if ($this->user_type == 1) { if ($this->user_type == 1) {
$name = ImsCjdcUser::find($this->user_id)->name; $name = ImsCjdcUser::find($this->user_id)->name;
} else { } else {
$name = AdminUsers::find($this->user_id)->name;
if ($this->user_id){
$name = AdminUsers::find($this->user_id)->name;
}else{
$name = '<span style="color: #ff0000">数据错误</span>';
}
} }
return $name; return $name;
});
})->style('danger');
$grid->money('金额'); $grid->money('金额');
$grid->desc('说明'); $grid->desc('说明');
$grid->created_at('创建时间')->display(function ($time) { $grid->created_at('创建时间')->display(function ($time) {

15
app/Admin/Controllers/v3/StoreController.php

@ -3,6 +3,8 @@
namespace App\Admin\Controllers\v3; namespace App\Admin\Controllers\v3;
use App\Admin\Repositories\v3\Store; use App\Admin\Repositories\v3\Store;
use App\Models\LanzuMmInfo;
use Dcat\Admin\Admin;
use Dcat\Admin\Form; use Dcat\Admin\Form;
use Dcat\Admin\Grid; use Dcat\Admin\Grid;
use Dcat\Admin\Show; use Dcat\Admin\Show;
@ -26,7 +28,14 @@ class StoreController extends AdminController
*/ */
protected function grid() protected function grid()
{ {
return Grid::make(new Store(), function (Grid $grid) {
$user = Admin::user();
$builder = new Store();
if ($user->isRole('lanzu_mm')) {
//如果登陆角色为市场经理,获取市场经理id
$mm = LanzuMmInfo::where(['admin_user_id' => $user->id])->first();
$builder = StoreModel::where(['mm_user_id' => $mm->user_id]);
}
return Grid::make($builder, function (Grid $grid) {
$grid->model()->orderBy('id','desc'); $grid->model()->orderBy('id','desc');
$grid->id->sortable(); $grid->id->sortable();
$grid->logo_url->image('',50); $grid->logo_url->image('',50);
@ -141,7 +150,7 @@ class StoreController extends AdminController
$userList = UserModel::getUserArray(); $userList = UserModel::getUserArray();
// 绑定了店铺的用户 // 绑定了店铺的用户
$userHas = StoreModel::pluck('admin_id')->toArray(); $userHas = StoreModel::pluck('admin_id')->toArray();
foreach($userList as $ku => $uv){ foreach($userList as $ku => $uv){
if($ku != 0 && in_array($ku,$userHas)){ if($ku != 0 && in_array($ku,$userHas)){
unset($userList[$ku]); unset($userList[$ku]);
@ -277,7 +286,7 @@ class StoreController extends AdminController
for ($i = 0; $i < $length; ++$i) { for ($i = 0; $i < $length; ++$i) {
$hash .= $seed[mt_rand(0, $max)]; $hash .= $seed[mt_rand(0, $max)];
} }
return $hash; return $hash;
} }
} }
Loading…
Cancel
Save