lanzu_qsy 6 years ago
parent
commit
b909b4397e
  1. 6
      app/Admin/Controllers/AuthController.php
  2. 6
      app/Admin/Controllers/CouponSettingController.php
  3. 23
      app/Admin/Controllers/CouponTieController.php
  4. 59
      app/Admin/Controllers/HomeController.php
  5. 14
      app/Admin/Controllers/ImsCjdcStoreController.php
  6. 16
      app/Admin/Controllers/LanzuCsWithdrawController.php
  7. 36
      app/Admin/Controllers/LanzuFinancialRecord.php
  8. 32
      app/Admin/Controllers/LanzuMmInfoController.php
  9. 18
      app/Admin/Controllers/LanzuMmWithdrawController.php
  10. 16
      app/Admin/Controllers/LanzuMpInfoController.php
  11. 102
      app/Admin/Controllers/LanzuMpWithdrawController.php
  12. 35
      app/Admin/Controllers/LanzuServiceSpeakerController.php
  13. 16
      app/Admin/Controllers/StoreUserReportController.php

6
app/Admin/Controllers/AuthController.php

@ -13,9 +13,9 @@ class AuthController extends BaseAuthController
$username = $request->post('username');
//校验该帐号状态是否正常
$adu = new AdminUsers();
$adu = $adu->where(['username'=>$username])->first();
if ($adu&&$adu->status==0){
return $this->error('该帐号已被冻结,请联系管理员');
$adu = $adu->where(['username' => $username])->first();
if ($adu && $adu->status == 0) {
return $this->error('该帐号已被冻结,请联系管理员');
}
return parent::postLogin($request);
}

6
app/Admin/Controllers/CouponSettingController.php

@ -27,10 +27,10 @@ class CouponSettingController extends AdminController
$grid->status;
$grid->created_at;
$grid->updated_at->sortable();
$grid->filter(function (Grid\Filter $filter) {
$filter->equal('id');
});
});
}
@ -72,7 +72,7 @@ class CouponSettingController extends AdminController
$form->text('desc');
$form->text('sort');
$form->text('status');
$form->display('created_at');
$form->display('updated_at');
});

23
app/Admin/Controllers/CouponTieController.php

@ -28,7 +28,8 @@ class CouponTieController extends AdminController
});
}
public function CouponTieList(Content $content){
public function CouponTieList(Content $content)
{
$grid = Grid::make(new CouponTie(), function (Grid $grid) {
$grid->id;
$grid->activity->sortable();
@ -41,17 +42,19 @@ class CouponTieController extends AdminController
$grid->actions(new CouponTieEdit());
});
return $content
->title('活动绑定')
->body(new Card($grid));
return $content
->title('活动绑定')
->body(new Card($grid));
}
public function CouponTieForm(Content $content){
public function CouponTieForm(Content $content)
{
return $content
->title('活动绑定')
->body(new Card(new CouponTieForm()), function(Form $form){});
->title('活动绑定')
->body(new Card(new CouponTieForm()), function (Form $form) {
});
}
/**
@ -76,8 +79,8 @@ class CouponTieController extends AdminController
protected function form(Content $content)
{
return $content
->title('活动绑定')
->body(new Card(new CouponTieForm()));
->title('活动绑定')
->body(new Card(new CouponTieForm()));
}
// /**
@ -86,6 +89,6 @@ class CouponTieController extends AdminController
// */
// protected function getMpInfo()
// {
// }
}

59
app/Admin/Controllers/HomeController.php

@ -15,19 +15,20 @@ class HomeController extends Controller
public function index(Content $content)
{
//dd(Admin::user()->roles);
if(Admin::user()->isRole('lanzu_business')){
if (Admin::user()->isRole('lanzu_business')) {
return $this->lanzu_biz($content);
}
if(Admin::user()->isRole('lanzu_mp')){
if (Admin::user()->isRole('lanzu_mp')) {
return $this->lanzu_mp($content);
}
if(Admin::user()->isRole('lanzu_mm')){
if (Admin::user()->isRole('lanzu_mm')) {
return $this->lanzu_mm($content);
}
return $this->default($content);
}
protected function default(Content $content){
protected function default(Content $content)
{
return $content
->header('Dashboard')
->description('Description...')
@ -50,43 +51,45 @@ class HomeController extends Controller
}
protected function lanzu_mp(Content $content){
return $content->header('控制面板')
->description('欢迎回到懒族后台')
->body(function (Row $row) {
$row->column(6, function (Column $column) {
});
protected function lanzu_mp(Content $content)
{
return $content->header('控制面板')
->description('欢迎回到懒族后台')
->body(function (Row $row) {
$row->column(6, function (Column $column) {
});
$row->column(6, function (Column $column) {
$row->column(6, function (Column $column) {
});
});
});
}
protected function lanzu_mm(Content $content){
return $content->header('控制面板')
->description('欢迎回到懒族后台')
->body(function (Row $row) {
$row->column(6, function (Column $column) {
});
protected function lanzu_mm(Content $content)
{
return $content->header('控制面板')
->description('欢迎回到懒族后台')
->body(function (Row $row) {
$row->column(6, function (Column $column) {
});
$row->column(6, function (Column $column) {
$row->column(6, function (Column $column) {
});
});
});
}
protected function lanzu_biz(Content $content)
{
return $content->header('控制面板')
->description('欢迎回到懒族后台')
->body(function (Row $row) {
$row->column(6, function (Column $column) {
});
return $content->header('控制面板')
->description('欢迎回到懒族后台')
->body(function (Row $row) {
$row->column(6, function (Column $column) {
});
$row->column(6, function (Column $column) {
$row->column(6, function (Column $column) {
});
});
});
});
}
}

14
app/Admin/Controllers/ImsCjdcStoreController.php

@ -22,19 +22,19 @@ class ImsCjdcStoreController extends AdminController
*/
protected function grid()
{
$user = Admin::user();
$user = Admin::user();
$builder = new ImsCjdcStore('market');
if ($user->isRole('lanzu_mm')){
if ($user->isRole('lanzu_mm')) {
//如果登陆角色为市场经理,获取市场经理id
$mm = LanzuMmInfo::where(['admin_user_id'=>$user->id])->first();
$builder = modelStore::where(['mm_user_id'=>$mm->id]);
$mm = LanzuMmInfo::where(['admin_user_id' => $user->id])->first();
$builder = modelStore::where(['mm_user_id' => $mm->id]);
}
return Grid::make($builder, function (Grid $grid) {
$grid->id->sortable();
$grid->name;
$grid->column('market.name','所属市场');
$grid->column('market.name', '所属市场');
$grid->tel;
$grid->is_rest('是否休息')->using([1=>'是',2=>'否']);
$grid->is_rest('是否休息')->using([1 => '是', 2 => '否']);
$grid->award_money;
$grid->disableEditButton();
$grid->disableDeleteButton();
@ -42,7 +42,7 @@ class ImsCjdcStoreController extends AdminController
$grid->filter(function (Grid\Filter $filter) {
$filter->like('name')->placeholder('输入店铺名称');
$filter->equal('tel')->placeholder('输入电话');
$filter->like('market.name','市场名称')->placeholder('输入市场名称');
$filter->like('market.name', '市场名称')->placeholder('输入市场名称');
});
});

16
app/Admin/Controllers/LanzuCsWithdrawController.php

@ -40,13 +40,13 @@ class LanzuCsWithdrawController extends AdminController
$grid->disableViewButton();
$grid->disableDeleteButton();
$grid->id->sortable();
$grid->column('csInfo.name','提现用户');
$grid->column('csInfo.name', '提现用户');
$grid->money;
$grid->status('状态')->using([1 => '已同意', -1 => '已拒绝', 0 => '待审核'])->label([1 => 'success', -1 => 'danger', 0 => 'default']);
$grid->is_pay('是否到账')->using(['否', '是']);
$grid->created_at;
$grid->filter(function (Grid\Filter $filter) {
$filter->like('csInfo.name','提现用户');
$filter->like('csInfo.name', '提现用户');
});
});
@ -132,13 +132,13 @@ class LanzuCsWithdrawController extends AdminController
$csw->save();
//添加流水记录
$model = FinancialRecord::getFinancialRecordModel($csInfo->admin_user_id);
$model->user_id = $csInfo->admin_user_id;
$model->user_type = 4;
$model->money = $form->model()->money;
$model = FinancialRecord::getFinancialRecordModel($csInfo->admin_user_id);
$model->user_id = $csInfo->admin_user_id;
$model->user_type = 4;
$model->money = $form->model()->money;
$model->money_type = 104;
$model->desc = '社区站点提现';
$model->comment = '社区站点提现';
$model->desc = '社区站点提现';
$model->comment = '社区站点提现';
$model->save();
} else {
//记录失败日志

36
app/Admin/Controllers/LanzuFinancialRecord.php

@ -9,8 +9,6 @@ use App\Models\FinancialRecord;
use App\Models\FinancialRecord0;
use App\Models\ImsCjdcUser;
use App\Models\LanzuCsInfo;
use App\Models\LanzuMpInfo;
use app\Request;
use Dcat\Admin\Admin;
use Dcat\Admin\Controllers\AdminController;
use Dcat\Admin\Form;
@ -20,38 +18,38 @@ class LanzuFinancialRecord extends AdminController
{
protected function grid()
{
$adu = Admin::user();
$adu = Admin::user();
$builder = new FinancialRecord0();
if ($adu->isRole('lanzu_cs')){
$fr = FinancialRecord::getFinancialRecordModel($adu->id);
if ($adu->isRole('lanzu_cs')) {
$fr = FinancialRecord::getFinancialRecordModel($adu->id);
$builder = $fr;
}else{
} else {
$param = \Request::get('user_id');
if ($param){
$fr = FinancialRecord::getFinancialRecordModel($param);
if ($param) {
$fr = FinancialRecord::getFinancialRecordModel($param);
$builder = $fr;
}
}
return Grid::make($builder,function (Grid $grid) use ($adu){
return Grid::make($builder, function (Grid $grid) use ($adu) {
$grid->id;
$grid->user_id('用户')->display(function (){
if ($this->user_type==1){
$name = ImsCjdcUser::find($this->user_id)->name;
}else{
$grid->user_id('用户')->display(function () {
if ($this->user_type == 1) {
$name = ImsCjdcUser::find($this->user_id)->name;
} else {
$name = AdminUsers::find($this->user_id)->name;
}
return $name;
});
$grid->money('金额');
$grid->desc('说明');
$grid->created_at('创建时间')->display(function ($time){
return date('Y-m-d H:i',$time);
$grid->created_at('创建时间')->display(function ($time) {
return date('Y-m-d H:i', $time);
});
$grid->filter(function (Grid\Filter $filter) use ($adu){
$grid->filter(function (Grid\Filter $filter) use ($adu) {
$filter->equal('id');
if (!$adu->isRole('lanzu_cs')){
$filter->equal('user_id','社区站点')->select(LanzuCsInfo::selectCsInfo());
if (!$adu->isRole('lanzu_cs')) {
$filter->equal('user_id', '社区站点')->select(LanzuCsInfo::selectCsInfo());
}
});
@ -65,7 +63,7 @@ class LanzuFinancialRecord extends AdminController
protected function form()
{
return Form::make(new FinancialRecord0(),function (Form $form){
return Form::make(new FinancialRecord0(), function (Form $form) {
$form->datetime('created_at');
});
}

32
app/Admin/Controllers/LanzuMmInfoController.php

@ -48,8 +48,8 @@ class LanzuMmInfoController extends AdminController
$market = ImsCjdcMarket::find($id);
return $market->name;
});
$grid->column('可提现金额')->display(function (){
return MpBalance::getBalance($this->user_id,0);
$grid->column('可提现金额')->display(function () {
return MpBalance::getBalance($this->user_id, 0);
});
$grid->id_frond->image('', 50, 50);
$grid->id_back->image('', 50, 50);
@ -84,26 +84,26 @@ class LanzuMmInfoController extends AdminController
return Show::make($id, new LanzuMmInfo(), function (Show $show) {
$show->name;
$show->phone;
$show->market_id()->as(function ($id){
$show->market_id()->as(function ($id) {
$market = ImsCjdcMarket::find($id);
return $market->name;
});
$show->id_frond->image();
$show->id_back->image();
$show->id_number;
$show->status()->using([1=>'正常',0=>'禁用']);
$show->created_at()->as(function ($time){
if ($time){
return date('Y-m-d H:i',$time);
}else{
$show->status()->using([1 => '正常', 0 => '禁用']);
$show->created_at()->as(function ($time) {
if ($time) {
return date('Y-m-d H:i', $time);
} else {
return '-';
}
});
$show->updated_at()->as(function ($time){
if ($time){
return date('Y-m-d H:i',$time);
}else{
$show->updated_at()->as(function ($time) {
if ($time) {
return date('Y-m-d H:i', $time);
} else {
return '-';
}
@ -183,10 +183,10 @@ class LanzuMmInfoController extends AdminController
*/
protected function getMarket()
{
$user = Admin::user();
$mp = LanzuMpInfo::where('admin_user_id', $user->id)->first();
$data = [];
if ($mp){
$user = Admin::user();
$mp = LanzuMpInfo::where('admin_user_id', $user->id)->first();
$data = [];
if ($mp) {
$markets = ImsCjdcMarket::where('mp_id', $mp->id)->get();
foreach ($markets as $market) {
$item = [];

18
app/Admin/Controllers/LanzuMmWithdrawController.php

@ -72,7 +72,7 @@ class LanzuMmWithdrawController extends AdminController
return date('Y-m-d H:i', $time);
});
$grid->filter(function (Grid\Filter $filter) {
$filter->like('mmInfo.name','经理名')->placeholder('输入经理名称');
$filter->like('mmInfo.name', '经理名')->placeholder('输入经理名称');
$filter->between('money')->placeholder('输入提现范围值');
});
@ -100,18 +100,18 @@ class LanzuMmWithdrawController extends AdminController
$show->mm_id;
$show->money;
$show->status;
$show->created_at->as(function ($time){
if ($time){
return date('Y-m-d H:i',$time);
}else{
$show->created_at->as(function ($time) {
if ($time) {
return date('Y-m-d H:i', $time);
} else {
return '-';
}
});
$show->updated_at->as(function ($time){
if ($time){
return date('Y-m-d H:i',$time);
}else{
$show->updated_at->as(function ($time) {
if ($time) {
return date('Y-m-d H:i', $time);
} else {
return '-';
}

16
app/Admin/Controllers/LanzuMpInfoController.php

@ -70,8 +70,6 @@ class LanzuMpInfoController extends AdminController
}
/**
* Make a show builder.
*
@ -90,12 +88,12 @@ class LanzuMpInfoController extends AdminController
$show->id_frond()->image();
$show->id_back()->image();
$show->id_number;
$show->status()->using([1=>'正常',0=>'禁用']);
$show->created_at()->as(function ($time){
return date('Y-m-d H:i',$time);
$show->status()->using([1 => '正常', 0 => '禁用']);
$show->created_at()->as(function ($time) {
return date('Y-m-d H:i', $time);
});
$show->updated_at()->as(function ($time){
return date('Y-m-d H:i',$time);
$show->updated_at()->as(function ($time) {
return date('Y-m-d H:i', $time);
});
});
}
@ -169,9 +167,9 @@ class LanzuMpInfoController extends AdminController
public function showData(Content $content)
{
return $content->header('控制面板')
return $content->header('控制面板')
->description('欢迎回到懒族后台')
->body(function (Row $row){
->body(function (Row $row) {
$row->column(4, new \App\Admin\Metrics\Examples\MmInfo());

102
app/Admin/Controllers/LanzuMpWithdrawController.php

@ -12,6 +12,7 @@ use Dcat\Admin\Show;
use Dcat\Admin\Admin;
use Dcat\Admin\Controllers\AdminController;
use App\Models\MpBalance;
class LanzuMpWithdrawController extends AdminController
{
/**
@ -21,25 +22,25 @@ class LanzuMpWithdrawController extends AdminController
*/
protected function grid()
{
$current_user = Admin::user();
$buider = new LanzuMpWithdraw('mpInfo');
$mp_info = LanzuMpInfo::where('admin_user_id', $current_user->id)->first();
$current_user = Admin::user();
$buider = new LanzuMpWithdraw('mpInfo');
$mp_info = LanzuMpInfo::where('admin_user_id', $current_user->id)->first();
if ($mp_info) {
//服务商只能看到自己的提现列表
$buider = modelMpInfo::with('mpInfo')->where('mp_id', $mp_info->id);
}
return Grid::make($buider, function (Grid $grid)use ($current_user) {
return Grid::make($buider, function (Grid $grid) use ($current_user) {
$grid->id->sortable();
$grid->column('mpInfo.name','服务商名字');
$grid->column('mpInfo.name', '服务商名字');
$grid->money;
$grid->status('提现状态')->using([-1=>'拒绝',0=>'审核中',1=>'通过'])
->label([-1=>'danger',0=>'default',1=>'success']);
$grid->column('created_at')->display(function ($time){
return date('Y-m-d H:i',$time);
$grid->status('提现状态')->using([-1 => '拒绝', 0 => '审核中', 1 => '通过'])
->label([-1 => 'danger', 0 => 'default', 1 => 'success']);
$grid->column('created_at')->display(function ($time) {
return date('Y-m-d H:i', $time);
});
$grid->filter(function (Grid\Filter $filter) {
$filter->like('mpInfo.name','服务商')->placeholder('输入服务商名称');
$filter->like('mpInfo.name', '服务商')->placeholder('输入服务商名称');
$filter->between('money');
});
@ -49,7 +50,7 @@ class LanzuMpWithdrawController extends AdminController
$actions->disableQuickEdit();
$actions->disableView();
});
if ($current_user->isRole('lanzu_mp')){
if ($current_user->isRole('lanzu_mp')) {
$grid->disableEditButton();
}
});
@ -67,21 +68,21 @@ class LanzuMpWithdrawController extends AdminController
return Show::make($id, new LanzuMpWithdraw(['mpInfo']), function (Show $show) {
$show->id;
$show->mp_id;
$show->column('服务商名称','mpInfo.name');
$show->column('服务商名称', 'mpInfo.name');
$show->money;
$show->status;
$show->created_at->as(function ($time){
if ($time){
return date('Y-m-d H:i',$time);
}else{
$show->created_at->as(function ($time) {
if ($time) {
return date('Y-m-d H:i', $time);
} else {
return '-';
}
});
$show->updated_at->as(function ($time){
if ($time){
return date('Y-m-d H:i',$time);
}else{
$show->updated_at->as(function ($time) {
if ($time) {
return date('Y-m-d H:i', $time);
} else {
return '-';
}
@ -96,7 +97,8 @@ class LanzuMpWithdrawController extends AdminController
*/
protected function lanzu_bis_form(){
protected function lanzu_bis_form()
{
//管理员或者lanzu_bis操作
return Form::make(new LanzuMpWithdraw(['mpInfo']), function (Form $form) {
$form->footer(function ($footer) {
@ -119,39 +121,39 @@ class LanzuMpWithdrawController extends AdminController
$mpName = $form->model()->mp_info['name'];
$form->display('id');
$form->text('mp_id','服务商ID')->disable();
$form->display('','服务商名')->value($mpName);
$form->text('money','提现金额')->disable()->required();
$form->text('mp_id', '服务商ID')->disable();
$form->display('', '服务商名')->value($mpName);
$form->text('money', '提现金额')->disable()->required();
$form->hidden('is_operated');
$form->saving(function (Form $form) {
$form->is_operated = 1;
});
if($form->model()->is_operated){
if ($form->model()->is_operated) {
$status = '';
if($form->model()->status==1){
if ($form->model()->status == 1) {
$status = '审核通过';
}
if($form->model()->status==-1){
if ($form->model()->status == -1) {
$status = '拒绝';
}
$form->display('','审核状态')->value($status);
$form->display('', '审核状态')->value($status);
$form->disableSubmitButton();
$form->disableResetButton();
}else{
if ($form->isCreating()){
$form->radio('status')->options([1 => '通过审核', -1=> '拒绝'])->default(-1)->disable();
}else{
$form->radio('status')->options([1 => '通过审核', -1=> '拒绝'])->default(-1);
} else {
if ($form->isCreating()) {
$form->radio('status')->options([1 => '通过审核', -1 => '拒绝'])->default(-1)->disable();
} else {
$form->radio('status')->options([1 => '通过审核', -1 => '拒绝'])->default(-1);
}
}
$form->saved(function (Form $form,$result){
if ($form->isEditing()){
if ($form->model()->status==-1){
$form->saved(function (Form $form, $result) {
if ($form->isEditing()) {
if ($form->model()->status == -1) {
//如果服务商提现审核被拒绝,退回服务商的提现金额
MpBalance::returnBalance($form->model()->mp_id,1,$form->model()->money);
MpBalance::returnBalance($form->model()->mp_id, 1, $form->model()->money);
}
}
});
@ -160,21 +162,21 @@ class LanzuMpWithdrawController extends AdminController
protected function form()
{
$current_user = Admin::user();
$current_user = Admin::user();
if(!$current_user->isRole('lanzu_mp')){
if (!$current_user->isRole('lanzu_mp')) {
return $this->lanzu_bis_form();
}
//如果是服务商角色,获取服务商信息
$mp = LanzuMpInfo::where('admin_user_id',$current_user->id)->first();
$mp = LanzuMpInfo::where('admin_user_id', $current_user->id)->first();
//获取服务商可提现金额
$mpb = MpBalance::where('user_id',$mp->id)
->where('user_type',1)->first();
$mpb = MpBalance::where('user_id', $mp->id)
->where('user_type', 1)->first();
$balance = 0;
if($mpb){
if ($mpb) {
$balance = $mpb->balance;
}
return Form::make(new LanzuMpWithdraw(), function (Form $form) use($current_user,$balance,$mpb,$mp) {
return Form::make(new LanzuMpWithdraw(), function (Form $form) use ($current_user, $balance, $mpb, $mp) {
$form->footer(function ($footer) {
@ -190,14 +192,14 @@ class LanzuMpWithdrawController extends AdminController
$form->display('id');
$form->hidden('mp_id')->value($mp->id);
$form->text('balance','当前可提现余额')->value($balance)->disable()->help('当前可提现金额');
$form->number('money','提现金额')->required()->min(0);
$form->text('balance', '当前可提现余额')->value($balance)->disable()->help('当前可提现金额');
$form->number('money', '提现金额')->required()->min(0);
$form->ignore(['balance']);
//添加成功之后,扣减掉可提现金额
$form->saved(function (Form $form,$result)use ($mpb){
if ($form->isCreating()){
if ($result){
$mpb->balance = $mpb->balance-$form->money;
$form->saved(function (Form $form, $result) use ($mpb) {
if ($form->isCreating()) {
if ($result) {
$mpb->balance = $mpb->balance - $form->money;
$mpb->save();
}
}

35
app/Admin/Controllers/LanzuServiceSpeakerController.php

@ -24,14 +24,14 @@ class LanzuServiceSpeakerController extends AdminController
protected function grid()
{
return Grid::make(new LanzuServiceSpeaker(['store']), function (Grid $grid) {
$grid->model()->orderBy('updated_at','desc');
$grid->model()->orderBy('updated_at', 'desc');
$grid->id->sortable();
$grid->column('device_name','设备编号');
$grid->column('store_id','商户ID');
$grid->column('store.name','商户名');
$grid->column('device_name', '设备编号');
$grid->column('store_id', '商户ID');
$grid->column('store.name', '商户名');
$grid->column('is_bind')
->using([0=>'未绑定',1=>'已绑定'])
->label([0=>'danger',1=>'success']);
->using([0 => '未绑定', 1 => '已绑定'])
->label([0 => 'danger', 1 => 'success']);
$grid->created_at;
$grid->updated_at->sortable();
@ -53,18 +53,18 @@ class LanzuServiceSpeakerController extends AdminController
{
return Show::make($id, new LanzuServiceSpeaker(), function (Show $show) {
$show->id;
$show->created_at->as(function ($time){
if ($time){
return date('Y-m-d H:i',$time);
}else{
$show->created_at->as(function ($time) {
if ($time) {
return date('Y-m-d H:i', $time);
} else {
return '-';
}
});
$show->updated_at->as(function ($time){
if ($time){
return date('Y-m-d H:i',$time);
}else{
$show->updated_at->as(function ($time) {
if ($time) {
return date('Y-m-d H:i', $time);
} else {
return '-';
}
@ -81,10 +81,10 @@ class LanzuServiceSpeakerController extends AdminController
{
return Form::make(new LanzuServiceSpeaker(), function (Form $form) {
$form->display('id');
$form->text("device_name",'设备编号')->required();
$form->text("device_name", '设备编号')->required();
//$form->number("store_id",'商户ID')->required();
// $form->select('market_id','所在市场')->options('/api/getAllMarket');
$form->select('store_id','商户')->options(function ($id) {
$form->select('store_id', '商户')->options(function ($id) {
$store = ImsCjdcStore::find($id);
if ($store) {
@ -98,7 +98,8 @@ class LanzuServiceSpeakerController extends AdminController
});
}
public function getAllMarkets(){
public function getAllMarkets()
{
$data = [];
$markets = ImsCjdcMarket::all();
foreach ($markets as $market) {

16
app/Admin/Controllers/StoreUserReportController.php

@ -27,7 +27,7 @@ class StoreUserReportController extends AdminController
$grid->store_id;
$grid->market_id->display(function ($markrtId) {
$market = marketModel::select('id','name')->find($markrtId);
$market = marketModel::select('id', 'name')->find($markrtId);
if (!$market) {
return '<span style="color: red">数据错误</span>';
}
@ -35,23 +35,23 @@ class StoreUserReportController extends AdminController
});
$grid->store_name;
$grid->new_user_total;
$grid->filter(function (Grid\Filter $filter) {
$marketList = [];
$list = marketModel::select('id','name')->get()->toArray();
foreach($list as $value){
$list = marketModel::select('id', 'name')->get()->toArray();
foreach ($list as $value) {
$marketList[$value['id']] = $value['name'];
}
$filter->in('market_id')->multipleSelect($marketList);
$filter->like('store.name','店铺名称');
$filter->like('store.name', '店铺名称');
$filter->whereBetween('time', function ($q) {
$start = $this->input['start'] ?? null;
$end = $this->input['end'] ?? null;
$end = $this->input['end'] ?? null;
if ($start !== null) {
$q->whereRaw("ims_cjdc_store_account.time >= ?",$start);
$q->whereRaw("ims_cjdc_store_account.time >= ?", $start);
}
if ($end !== null) {
$q->whereRaw("ims_cjdc_store_account.time <= ?",$end);
$q->whereRaw("ims_cjdc_store_account.time <= ?", $end);
}
})->datetime();
});

Loading…
Cancel
Save