Merge branch 'phoenix' into develop

# Conflicts:
#	app/Admin/Controllers/v3/StoreController.php
#	app/Admin/routes.php

app/Admin/Actions/Grid/GoodsCopy.php → app/Admin/Actions/Grid/v3/GoodsCopy.php

@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Admin\Actions\Grid;
+namespace App\Admin\Actions\Grid\v3;
 
 use Dcat\Admin\Grid\RowAction;
 use Dcat\Admin\Widgets\Modal;
-use App\Admin\Forms\GoodsCopyForm;
+use App\Admin\Forms\v3\GoodsCopyForm;
 
 class GoodsCopy extends RowAction
 {

app/Admin/Controllers/v3/CategoryController.php

@@ -11,7 +11,7 @@ use Dcat\Admin\Tree;
 use Dcat\Admin\Controllers\AdminController;
 use Dcat\Admin\Show;
 use Dcat\Admin\Widgets\Card;
-use App\Admin\Forms\CategoryTieForm;
+use App\Admin\Forms\v3\CategoryTieForm;
 use App\Libs\SsdbClient;
 
 class CategoryController extends AdminController

app/Admin/Controllers/v3/GoodsController.php

@@ -2,7 +2,7 @@
 
 namespace App\Admin\Controllers\v3;
 
-use App\Admin\Actions\Grid\GoodsCopy;
+use App\Admin\Actions\Grid\v3\GoodsCopy;
 use App\Admin\Repositories\v3\Goods;
 use Dcat\Admin\Form;
 use Dcat\Admin\Grid;
@@ -12,9 +12,7 @@ use App\Models\v3\Category as CategoryModel;
 use App\Models\v3\Store as StoreModel;
 use Dcat\Admin\Form\NestedForm;
 use App\Models\v3\Goods as GoodsModel;
-use App\Models\v3\GoodsBanners as GoodsBannersModel;
 use App\Models\v3\Market as MarketModel;
-use Dcat\Admin\Grid\Displayers\Actions;
 use App\Models\v3\GoodsCategory as GoodsCategoryModel;
 
 class GoodsController extends AdminController

app/Admin/Controllers/v3/LanzuEmployeesController.php

@@ -0,0 +1,92 @@
+<?php
+
+namespace App\Admin\Controllers\v3;
+
+use App\Admin\Repositories\v3\LanzuEmployees;
+use Dcat\Admin\Form;
+use Dcat\Admin\Grid;
+use Dcat\Admin\Show;
+use Dcat\Admin\Controllers\AdminController;
+use App\Models\v3\LanzuEmployees as EmployeesModel;
+use App\Models\v3\User as UserModel;
+use App\Models\v3\Store as StoreModel;
+
+class LanzuEmployeesController extends AdminController
+{
+    /**
+     * Make a grid builder.
+     *
+     * @return Grid
+     */
+    protected function grid()
+    {
+        return Grid::make(new LanzuEmployees(), function (Grid $grid) {
+            $grid->column('id')->sortable();
+            $grid->column('market_id');
+            $grid->column('user_id')->display(function($userId){
+                $item = UserModel::getUserInfo($userId,'real_name');
+                return empty($item) ? '' : $$item['real_name'];
+            });
+            $grid->column('store_id')->display(function($storeId){
+                $item = StoreModel::getStoreInfo($storeId,'real_name');
+                return empty($item) ? '' : $$item['real_name'];
+            });
+            
+            $grid->column('role')->display(function($role){
+                return $role;
+            });
+            $grid->column('status')->select(EmployeesModel::$_STATUS);
+        
+            $grid->filter(function (Grid\Filter $filter) {
+                $filter->equal('id');
+        
+            });
+            $grid->model()->orderBy('id','desc');
+            // 每页10条
+            $grid->paginate(10);
+        });
+    }
+
+    /**
+     * Make a show builder.
+     *
+     * @param mixed $id
+     *
+     * @return Show
+     */
+    protected function detail($id)
+    {
+        return Show::make($id, new LanzuEmployees(), function (Show $show) {
+            $show->field('id');
+            $show->field('user_id');
+            $show->field('store_id');
+            $show->field('market_id');
+            $show->field('role');
+            $show->field('status');
+            $show->field('note');
+            $show->field('created_at');
+            $show->field('updated_at');
+        });
+    }
+
+    /**
+     * Make a form builder.
+     *
+     * @return Form
+     */
+    protected function form()
+    {
+        return Form::make(new LanzuEmployees(), function (Form $form) {
+            $form->display('id');
+            $form->text('user_id');
+            $form->text('store_id');
+            $form->text('market_id');
+            $form->text('role');
+            $form->text('status');
+            $form->text('note');
+        
+            $form->display('created_at');
+            $form->display('updated_at');
+        });
+    }
+}

app/Admin/Controllers/v3/ServicePersonnelController.php

@@ -47,7 +47,7 @@ class ServicePersonnelController extends AdminController
             });
             // 每页10条
             $grid->paginate(10);
-            $grid->disableDeleteButton();
+            // $grid->disableDeleteButton();
         });
     }
 
@@ -116,7 +116,7 @@ class ServicePersonnelController extends AdminController
                 $form->hidden('id');
                 $form->text('name')->required();
                 $form->text('tel')->required();
-                $form->image('head_url')->required();
+                $form->image('head_url');
             });
             $form->column(6,function(Form $form) use($marketList,$userList){
                 $form->select('type')->options(ServicePersonnelModel::$_TYPE)->required();
@@ -130,7 +130,7 @@ class ServicePersonnelController extends AdminController
             $form->saved(function(Form $form){
                 $id = $form->getKey();
                 
-                if($form->isCreating && !empty($id)){
+                if($form->isCreating() && !empty($id)){
                     $model = ServicePersonnelModel::find($id);
                     $qrCode = new WeChatQrCode();
                     // 生成专员二维码

app/Admin/Controllers/v3/StoreController.php

@@ -36,14 +36,19 @@ class StoreController extends AdminController
             $builder = StoreModel::where(['mm_user_id' => $mm->user_id]);
         }
         return Grid::make($builder, function (Grid $grid) {
+            // 查询市场
+            $marketList = MarketModel::getMarketArray();
+            // 查询一级分类
+            // $categoryList = CategoryModel::getArray([['parent_id','=',0]]);
+
             $grid->model()->orderBy('id','desc');
             $grid->id->sortable();
             $grid->logo_url->image('',50);
             $grid->name;
 
-            $grid->market_id->display(function ($marketId){
-                $market = MarketModel::getMarketInfo($marketId,'name');
-                return empty($market) ? '' : $market->name;
+            $grid->market_id->display(function ($marketId) use($marketList){
+                // $market = MarketModel::getMarketInfo($marketId,'name');
+                return isset($marketList[$marketId]) ? $marketList[$marketId] : '';
             });
             $grid->mm_user_id->display(function ($mmUserId){
                 $mmUser = MminfoModel::getMmInfo($mmUserId,'name');
@@ -74,9 +79,10 @@ class StoreController extends AdminController
 
             $grid->actions([new StoreSetTime()]);
             // 搜索
-            $grid->filter(function (Grid\Filter $filter) {
+            $grid->filter(function (Grid\Filter $filter) use($marketList){
                 $filter->equal('id');
                 $filter->like('name');
+                $filter->equal('market_id')->select($marketList);
             });
 
             // 每页10条

app/Admin/Forms/GoodsNewCopyForm.php

@@ -73,10 +73,12 @@ class GoodsNewCopyForm extends Form
                     ];
                     GoodsBannerModel::insert($banners);
                 }
+            }else{
+                return $this->error('修改失败');
             };
         }
 
-        return $this->success('修改成功', '/goods');
+        return $this->error('修改成功');
     }
 
     /**

app/Admin/Forms/CategoryTieForm.php → app/Admin/Forms/v3/CategoryTieForm.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Admin\Forms;
+namespace App\Admin\Forms\v3;
 
 use Dcat\Admin\Widgets\Form;
 use Symfony\Component\HttpFoundation\Response;

app/Admin/Forms/GoodsCopyForm.php → app/Admin/Forms/v3/GoodsCopyForm.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Admin\Forms;
+namespace App\Admin\Forms\v3;
 
 use Dcat\Admin\Widgets\Form;
 use Symfony\Component\HttpFoundation\Response;

app/Admin/Repositories/v3/LanzuEmployees.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace App\Admin\Repositories\v3;
+
+use App\Models\v3\LanzuEmployees as Model;
+use Dcat\Admin\Repositories\EloquentRepository;
+
+class LanzuEmployees extends EloquentRepository
+{
+    /**
+     * Model.
+     *
+     * @var string
+     */
+    protected $eloquentClass = Model::class;
+}

app/Admin/routes.php

@@ -67,14 +67,16 @@ Route::group([
     $router->any('/detail', 'ImsCjdcOrderMainController@orderDetail');
     $router->any('/order_goods_refund', 'ImsCjdcOrderMainController@orderGoodsRefund');
 
-    $router->resource('/horseman', 'LanzuServiceHorsemanController');
     $router->any('ops/files', 'v3\FileController@handle');
 
-    // 服务站专员
+    // 服务人员
     $router->resource('/service_personnel', 'v3\ServicePersonnelController');
+    $router->resource('/horseman', 'LanzuServiceHorsemanController');
 
-    //地区
-    $router->any('/api/area', 'LanzuArea@getArea');
+    // 懒族员工
+    $router->resource('/employees', 'v3\LanzuEmployeesController');
 
+	//地区
+    $router->any('/api/area', 'LanzuArea@getArea');
 });
 

app/Console/Commands/MigrateStore.php

@@ -41,8 +41,8 @@ class MigrateStore extends Command
     {
         $oldTableName = 'ims_cjdc_store_new';
         $newTableName = 'lanzu_store_new';
-        $storeImgPath = 'QR_code/code_store_img/wx_store_';/* 商户小程序码 */
-        $storePayPath = 'QR_code/code_pay_img/wx_pay_';/* 收银二维码 */
+        // $storeImgPath = 'QR_code/code_store_img/wx_store_';/* 商户小程序码 */
+        // $storePayPath = 'QR_code/code_pay_img/wx_pay_';/* 收银二维码 */
         // 判断表是否存在
         if(!Schema::hasTable($oldTableName)){
            var_dump('旧表不存在');
@@ -106,10 +106,10 @@ class MigrateStore extends Command
 
                 'introduction'=> strip_tags($value->details),
 
-                'store_applet_img' => $storeImgPath.$storeId.'.jpg',
-                'cash_code_img' =>  $storePayPath.$storeId.'.jpg',
+                'store_applet_img' => '',
+                'cash_code_img' =>  '',
 
-                'created_at' => strtotime($value->sq_time),
+                'created_at' => $value->time_add ?strtotime($value->time_add) : 0,
                 'updated_at' => time(),
             ];
            

app/Models/v3/LanzuEmployees.php

@@ -0,0 +1,70 @@
+<?php
+
+namespace App\Models\v3;
+
+use Dcat\Admin\Traits\HasDateTimeFormatter;
+use Illuminate\Database\Eloquent\SoftDeletes;
+use Illuminate\Database\Eloquent\Model;
+
+class LanzuEmployees extends Model
+{
+	use HasDateTimeFormatter;
+    use SoftDeletes;
+
+    protected $table = 'lanzu_employees';
+    protected $dateFormat = 'U';
+
+    /* 查询记录数 limit */
+    protected $perPage = 10;
+
+    public static $_TYPE= [''];
+    public static $_STATUS = [-1=>'离职',0=>'禁用',1=>'正常'];
+
+    protected $appends = [
+        'is_rest_text',
+        'is_open_text'
+    ];
+
+    public function getTypeTextAttribute($value)
+    {
+        $value = $value ? $value : $this->type;
+        return isset(self::$_TYPE[$value]) ? self::$_TYPE[$value] : '';
+    }
+    public function getIsRestTextAttribute($value)
+    {
+        $value = $value ? $value : $this->status;
+        return isset(self::$_STATUS[$value]) ? self::$_STATUS[$value] : '';
+    }
+    
+    /**
+     * 根据id获取单条信息
+     * @param int $id
+     * @param string $field
+     * @return string
+     */
+    public static function getInfo($id,$field = '*')
+    {
+        return self::select($field)->find($id);
+    }
+
+    /**
+     * 获取数组
+     * id为键
+     * @return array
+     */
+    public static function getArray($where = [], $options = [])
+    {
+        $model = self::whereNull('deleted_at');
+
+        if(!empty($where)){
+            $model->where($where);
+        }
+        $list = $model->pluck('id','user_id')->toArray();
+        if(!empty($options)){
+            $new =  array_merge($options,$list);
+            return array_flip($new);
+        }else{
+            return array_flip($list);
+        }
+    }
+}

resources/lang/zh-CN/lanzu-employees.php

@@ -0,0 +1,18 @@
+<?php 
+return [
+    'labels' => [
+        'LanzuEmployees' => '懒族员工',
+        'lanzuEmployees' => '懒族员工',
+        'lanzu_employees' => '懒族员工',
+    ],
+    'fields' => [
+        'user_id' => '用户懒ID',
+        'store_id' => '店铺',
+        'market_id' => '服务站ID',
+        'role' => '用户角色',
+        'status' => '状态',
+        'note' => '备注',
+    ],
+    'options' => [
+    ],
+];