From c7ab9c6213eea17e06274478c2287f843c36d17f Mon Sep 17 00:00:00 2001
From: liangyuyan <1103300295@qq.com>
Date: Sat, 5 Sep 2020 21:17:51 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B4=97ims=5Fcjdc=5Faccount=E8=A1=A8=E8=B4=A6?=
 =?UTF-8?q?=E5=8F=B7=E7=9A=84=E5=BA=97=E9=93=BAid=E5=92=8Crole=E5=88=B0?=
 =?UTF-8?q?=E6=96=B0=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Admin/Controllers/v3/StoreController.php |  7 +-
 app/Console/Commands/setStoreUsers.php       | 71 ++++++++++++++++++++
 2 files changed, 77 insertions(+), 1 deletion(-)
 create mode 100644 app/Console/Commands/setStoreUsers.php

diff --git a/app/Admin/Controllers/v3/StoreController.php b/app/Admin/Controllers/v3/StoreController.php
index bc94785..8181bcf 100644
--- a/app/Admin/Controllers/v3/StoreController.php
+++ b/app/Admin/Controllers/v3/StoreController.php
@@ -48,6 +48,7 @@ class StoreController extends AdminController
             // 搜索
             $grid->filter(function (Grid\Filter $filter) {
                 $filter->equal('id');
+                $filter->like('name');
             });
 
             // 每页10条
@@ -169,8 +170,9 @@ class StoreController extends AdminController
                 $form->image('fm_img')->required();
                 $form->select('admin_id')->options($userList)->required();/*需要优化 一个用户只能绑定一家店铺*/
                 $form->select('user_id')->options($userList)->required();/*需要优化 一个用户只能绑定一家店铺*/
+                $form->time('time1')->format('HH:mm');
                 $form->timeRange('time1','time2','营业时间段一')->required();
-                $form->timeRange('time3','time4','营业时间段二')
+                $form->timeRange('time3','time4','营业时间段二')->format('HH:mm')
                     ->rules('after:time2',['after'=>'选择的时间必须比时间段一结束时间大']);
             });
             $form->column(12, function (Form $form) {
@@ -215,6 +217,9 @@ class StoreController extends AdminController
                     $store->save();
                     // 剪裁图片
                     // $form->image('cash_code_img')->crop(270, 270, [5, 5]);
+
+                    //店长账号
+
                 }
             });
 
diff --git a/app/Console/Commands/setStoreUsers.php b/app/Console/Commands/setStoreUsers.php
new file mode 100644
index 0000000..bde3aa8
--- /dev/null
+++ b/app/Console/Commands/setStoreUsers.php
@@ -0,0 +1,71 @@
+<?php
+
+namespace App\Console\Commands;
+
+use Illuminate\Console\Command;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Schema;
+
+class setStoreUsers extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'migrateData:setStoreUsers';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Command 店铺的账号表整理';
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     *  店铺的登录账号，店长、店员
+     *  将旧账号表的关联的店铺id和角色洗到新的店铺账号表
+     * @return int
+     */
+    public function handle()
+    {
+        // 如果表不存在则创建
+        if(!Schema::hasTable('lanzu_store_users')){
+            Schema::create('lanzu_store_users',function (Blueprint $table){
+                $table->id();
+            });
+        }
+        $account = DB::table('ims_cjdc_account')->get();
+        $bar = $this->output->createProgressBar(count($account));
+        $bar->start();
+
+        foreach ($account as $ka => $va){
+            $data = [];
+            $storeUsers = DB::table('lanzu_store_users')->find($va->uid);
+            if(!empty($storeUsers)){
+                $data =[
+                    'user_category'=>$va->role,
+                    'store_id'=>$va->storeid
+                ];
+                DB::table('lanzu_store_users')->where('id',$va->uid)->update($data);
+            }
+            $bar->advance();
+        }
+
+        $bar->finish();
+
+        return 0;
+    }
+}