Merge branch 'qs_local_mp' into develop

# Conflicts:
#	app/Admin/routes.php

app/Admin/Controllers/HomeController.php

@@ -58,11 +58,12 @@ class HomeController extends Controller
         return $content->header('控制面板')
             ->description('欢迎回到懒族后台')
             ->body(function (Row $row) {
-                $row->column(6, function (Column $column) {
+                $row->column(4, function (Column $column) {
+                    $column->row(new Examples\Community\TotalAmount(Admin::user()->id,1));
                 });
 
-                $row->column(6, function (Column $column) {
-
+                $row->column(4, function (Column $column) {
+                    $column->row(new Examples\ServiceCard\TotalMm());
                 });
             });
     }
@@ -72,11 +73,12 @@ class HomeController extends Controller
         return $content->header('控制面板')
             ->description('欢迎回到懒族后台')
             ->body(function (Row $row) {
-                $row->column(6, function (Column $column) {
+                $row->column(3, function (Column $column) {
+                    $column->row(new Examples\Community\TotalAmount(Admin::user()->id,2));
                 });
 
-                $row->column(6, function (Column $column) {
-
+                $row->column(3, function (Column $column) {
+                    $column->row(new Examples\ServiceCard\TotalStore());
                 });
             });
     }
@@ -86,6 +88,10 @@ class HomeController extends Controller
         return $content->header('控制面板')
             ->description('欢迎回到懒族后台')
             ->body(function (Row $row) {
+                $row->column(4, function (Column $column) {
+                    $column->row(new Examples\ServiceCard\TotalMp());
+                });
+
                 $row->column(4, function (Column $column) {
                     $column->row(new Examples\Community\TotalCommunity());
                 });
@@ -93,6 +99,7 @@ class HomeController extends Controller
                 $row->column(4, function (Column $column) {
                     $column->row(new Examples\Community\TotalUser());
                 });
+
             });
     }
 
@@ -106,7 +113,7 @@ class HomeController extends Controller
                 });
 
                 $row->column(4, function (Column $column) {
-                    $column->row(new Examples\Community\TotalAmount());
+                    $column->row(new Examples\Community\TotalAmount(Admin::user()->id,3));
                 });
             });
     }

app/Admin/Controllers/ImsCjdcStoreController.php

@@ -27,9 +27,9 @@ class ImsCjdcStoreController extends AdminController
         if ($user->isRole('lanzu_mm')) {
             //如果登陆角色为市场经理,获取市场经理id
             $mm      = LanzuMmInfo::where(['admin_user_id' => $user->id])->first();
-            $builder = modelStore::where(['mm_user_id' => $mm->id]);
+            $builder = modelStore::with('market')->where(['mm_user_id' => $mm->id]);
         }
-        return Grid::make($builder, function (Grid $grid) {
+        return Grid::make($builder, function (Grid $grid) use ($user) {
             $grid->id->sortable();
             $grid->name;
             $grid->column('market.name', '所属市场');
@@ -39,6 +39,9 @@ class ImsCjdcStoreController extends AdminController
             $grid->disableEditButton();
             $grid->disableDeleteButton();
             $grid->disableCreateButton();
+            if ($user->isRole('lanzu_mm')){
+                $grid->showCreateButton();
+            }
             $grid->filter(function (Grid\Filter $filter) {
                 $filter->like('name')->placeholder('输入店铺名称');
                 $filter->equal('tel')->placeholder('输入电话');

app/Admin/Controllers/LanzuFinancialRecord.php

@@ -19,21 +19,22 @@ class LanzuFinancialRecord extends AdminController
     protected function grid()
     {
         $adu     = Admin::user();
+        $type =  \Request::get('type');
         $builder = new FinancialRecord0();
-        $builder = $builder::where('user_type',4);
+        $builder = $builder::where('user_type',$type);
 
-        if ($adu->isRole('lanzu_cs')) {
+        if ($adu->isRole('lanzu_cs')||$adu->isRole('lanzu_mp')||$adu->isRole('lanzu_mm')) {
             $fr      = FinancialRecord::getFinancialRecordModel($adu->id);
-            $builder = $fr->where('user_id',$adu->id)->where('user_type',4);
-        } else {
+            $builder = $fr->where('user_id',$adu->id)->where('user_type',$type);
+        }else {
             $param = \Request::get('user_id');
             if ($param) {
                 $fr      = FinancialRecord::getFinancialRecordModel($param);
-                $builder = $fr::where('user_type',4);
+                $builder = $fr::where('user_type',$type);
             }
         }
 
-        return Grid::make($builder, function (Grid $grid) use ($adu) {
+        return Grid::make($builder, function (Grid $grid) use ($adu,$type) {
             $grid->id;
             $grid->user_id('用户')->display(function () {
                 if ($this->user_type == 1) {
@@ -48,9 +49,9 @@ class LanzuFinancialRecord extends AdminController
             $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,$type) {
                 $filter->equal('id');
-                if (!$adu->isRole('lanzu_cs')) {
+                if (!$adu->isRole('lanzu_cs')&&$type==4) {
                     $filter->equal('user_id', '社区站点')->select(LanzuCsInfo::selectCsInfo());
                 }
 

app/Admin/Controllers/LanzuMmInfoController.php

@@ -50,7 +50,7 @@ class LanzuMmInfoController extends AdminController
                 return $market->name;
             });
             $grid->column('可提现金额')->display(function () {
-                return MpBalance::getBalance($this->user_id, 0);
+                return MpBalance::getBalance($this->admin_user_id, 2);
             });
             $grid->id_frond->image('', 50, 50);
             $grid->id_back->image('', 50, 50);

app/Admin/Controllers/LanzuMmWithdrawController.php

@@ -68,7 +68,7 @@ class LanzuMmWithdrawController extends AdminController
             $grid->money;
             $grid->status('提现状态')->using([-1 => '拒绝', 0 => '审核中', 1 => '通过'])
                 ->label([-1 => 'danger', 0 => 'default', 1 => 'success']);
-            $grid->is_pay('是否到账')->using([0 => '否', 1 => '是']);
+            $grid->is_pay('是否到账')->using([0 => '否', 1 => '是'])->label([0 => 'danger', 1 => 'success']);
             $grid->created_at('提现时间')->display(function ($time) {
                 return date('Y-m-d H:i', $time);
             });

app/Admin/Metrics/Examples/Community/TotalAmount.php

@@ -3,16 +3,25 @@
 namespace App\Admin\Metrics\Examples\Community;
 
 use App\Models\LanzuUserBalance;
-use Dcat\Admin\Admin;
 use Dcat\Admin\Widgets\Metrics\Card;
 
 class TotalAmount extends Card
 {
+    protected $uid;
+    protected $uType;
+
+    public function __construct($uid, $uType)
+    {
+        $this->uid   = $uid;
+        $this->uType =$uType;
+        parent::__construct('可提现金额(元)');
+    }
+
     protected function init()
     {
         parent::init();
-        $this->title = '可提现金额';
-        $this->content(LanzuUserBalance::getBalance(Admin::user()->id,3));
+        $this->content(LanzuUserBalance::getBalance($this->uid, $this->uType));
+
     }
 
     /**

app/Admin/Metrics/Examples/ServiceCard/TotalMm.php

@@ -0,0 +1,33 @@
+<?php
+
+namespace App\Admin\Metrics\Examples\ServiceCard;
+
+
+use App\Models\LanzuMmInfo;
+use App\Models\LanzuMpInfo;
+use Dcat\Admin\Widgets\Metrics\Card;
+
+class TotalMm extends Card
+{
+    protected function init()
+    {
+        parent::init();
+        $this->title = '市场经理数';
+
+        $this->content(LanzuMmInfo::getMmInfoCount());
+    }
+
+    /**
+     * 渲染卡片内容
+     * @return string
+     */
+    public function renderContent()
+    {
+        $content = parent::renderContent();
+        return <<<HTML
+<div class="d-flex justify-content-between align-items-center mt-1" style="margin-bottom: 2px">
+    <h2 class="ml-1 font-large-1">{$content}</h2>
+</div>
+HTML;
+    }
+}

app/Admin/Metrics/Examples/ServiceCard/TotalMp.php

@@ -0,0 +1,32 @@
+<?php
+
+
+namespace App\Admin\Metrics\Examples\ServiceCard;
+
+
+use App\Models\LanzuMpInfo;
+use Dcat\Admin\Widgets\Metrics\Card;
+
+class TotalMp extends Card
+{
+    protected function init()
+    {
+        parent::init();
+        $this->title = '服务商量数';
+        $this->content(LanzuMpInfo::count());
+    }
+
+    /**
+     * 渲染卡片内容
+     * @return string
+     */
+    public function renderContent()
+    {
+        $content = parent::renderContent();
+        return <<<HTML
+<div class="d-flex justify-content-between align-items-center mt-1" style="margin-bottom: 2px">
+    <h2 class="ml-1 font-large-1">{$content}</h2>
+</div>
+HTML;
+    }
+}

app/Admin/Metrics/Examples/ServiceCard/TotalStore.php

@@ -0,0 +1,43 @@
+<?php
+
+
+namespace App\Admin\Metrics\Examples\ServiceCard;
+
+
+use App\Models\LanzuMmInfo;
+use App\Models\LanzuStore;
+use Dcat\Admin\Admin;
+use Dcat\Admin\Widgets\Metrics\Card;
+
+class TotalStore extends Card
+{
+
+    protected function init()
+    {
+        parent::init();
+        $this->title = '商户数';
+        $aud = Admin::user();
+        $count = 0;
+        if ($aud->isRole('lanzu_mm')){
+            $mm = LanzuMmInfo::where('admin_user_id',$aud->id)->first();
+            if ($mm){
+                $count =  LanzuStore::where('mm_user_id',$mm->user_id)->count();
+            }
+        }elseif($aud->isRole('lanzu_mp')){
+            $count = 0;
+        }else{
+            $count =  LanzuStore::count();
+        }
+        $this->content($count);
+    }
+
+    public function renderContent()
+    {
+        $content = parent::renderContent();
+        return <<<HTML
+<div class="d-flex justify-content-between align-items-center mt-1" style="margin-bottom: 2px">
+    <h2 class="ml-1 font-large-1">{$content}</h2>
+</div>
+HTML;
+    }
+}

app/Admin/routes.php

@@ -43,5 +43,6 @@ Route::group([
     $router->any('/api/stores', 'LanzuServiceSpeakerController@getStores');
     //统计店铺新增用户
     $router->resource('/storeUserReport', 'StoreUserReportController');
+
     $router->any('/test', 'Test@test');
 });

app/Models/ImsCjdcStore.php

@@ -10,7 +10,7 @@ use App\Models\StoreAccount;
 class ImsCjdcStore extends Model
 {
 	use HasDateTimeFormatter;
-    protected $table = 'ims_cjdc_store';
+    protected $table = 'lanzu_store';
     public $timestamps = false;
     public function market(){
         return $this->hasOne('\App\Models\ImsCjdcMarket','id','market_id');

app/Models/LanzuMmInfo.php

@@ -2,6 +2,7 @@
 
 namespace App\Models;
 
+use Dcat\Admin\Admin;
 use Dcat\Admin\Traits\HasDateTimeFormatter;
 
 use Illuminate\Database\Eloquent\Model;
@@ -16,4 +17,21 @@ class LanzuMmInfo extends Model
     {
         return $this->hasOne('\App\Models\LanzuMmWithdraw','mm_id','id');
     }
+
+    public static function getMmInfoCount()
+    {
+        $adu = Admin::user();
+        if ($adu->isRole('lanzu_mp')){
+            $mpInfo = LanzuMpInfo::where('admin_user_id',$adu->id)->select('id')->first();
+            if ($mpInfo){
+                $ids = ImsCjdcMarket::where('mp_id',$mpInfo->id)->get()->pluck('id');
+                $count = self::whereIn('market_id',$ids)->count();
+                return $count;
+            }else{
+                return 0;
+            }
+        }else{
+            return self::count();
+        }
+    }
 }

app/Models/LanzuStore.php

@@ -9,6 +9,6 @@ use Illuminate\Database\Eloquent\Model;
 class LanzuStore extends Model
 {
 	use HasDateTimeFormatter;
-    protected $table = 'ims_cjdc_store';
+    protected $table = 'lanzu_store';
     protected $dateFormat = 'U';
 }