From 09a6ecc9c4cc0901e550c63c22f7e5d0c724d411 Mon Sep 17 00:00:00 2001
From: liangyuyan <1103300295@qq.com>
Date: Wed, 9 Sep 2020 19:54:50 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=88=86=E7=B1=BB=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E4=B8=8A=E7=BA=A7=E5=88=86=E7=B1=BB=E9=97=AE=E9=A2=98=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Admin/Controllers/v3/CategoryController.php | 2 +-
 app/Console/Commands/MigrateMarketData.php      | 3 ++-
 app/Models/v3/Category.php                      | 5 +++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/Admin/Controllers/v3/CategoryController.php b/app/Admin/Controllers/v3/CategoryController.php
index d25c101..2e96381 100644
--- a/app/Admin/Controllers/v3/CategoryController.php
+++ b/app/Admin/Controllers/v3/CategoryController.php
@@ -49,7 +49,7 @@ class CategoryController extends AdminController
         return Form::make(new Category(),function (Form $form){
 
             // 只查一级
-            $parentList = Category::getArray([['parent_id','=',0]],[0=>'顶级']);
+            $parentList = Category::getArray([['parent_id','=',0]],['顶级'=>0]);
 
             $form->select('parent_id')->default(0)->options($parentList);
             $form->text('title')->required();
diff --git a/app/Console/Commands/MigrateMarketData.php b/app/Console/Commands/MigrateMarketData.php
index d6f4b75..f36d224 100644
--- a/app/Console/Commands/MigrateMarketData.php
+++ b/app/Console/Commands/MigrateMarketData.php
@@ -40,7 +40,7 @@ class MigrateMarketData extends Command
     {
 
         // get old data from old table
-        $oldData = DB::table('ims_cjdc_market')->get();
+        $oldData = DB::table('ims_cjdc_market_new')->get();
 
         $bar = $this->output->createProgressBar(count($oldData));
         $bar->start();
@@ -49,6 +49,7 @@ class MigrateMarketData extends Command
         foreach ($oldData as $key => $value) {
             $coordinates = explode(',', $value->coordinates);
             $newData[] = [
+                'id' => $value->id,
                 'mp_id' => $value->mp_id ?? 0,
                 'name' => $value->name ?? '',
                 'logo' => $value->logo ?? '',
diff --git a/app/Models/v3/Category.php b/app/Models/v3/Category.php
index 6b89145..b9d2dcc 100644
--- a/app/Models/v3/Category.php
+++ b/app/Models/v3/Category.php
@@ -56,9 +56,10 @@ class Category extends Model
         if(count($where) > 0){
             $model->where($where);
         }
-        $list = $model->pluck('title','id')->toArray();
+        $list = $model->pluck('id','title')->toArray();
         if(!empty($options)){
-           return array_merge($options,$list);
+           $new =  array_merge($options,$list);
+           return array_flip($new);
         }else{
             return $list;
         }

From 28604db40f774b9d852c60b8c561f7a0a9a1d02a Mon Sep 17 00:00:00 2001
From: liangyuyan <1103300295@qq.com>
Date: Wed, 9 Sep 2020 20:12:57 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=9B=B4=E6=8D=A2=E6=95=B4=E5=90=88?=
 =?UTF-8?q?=E6=95=B0=E7=BB=84=E7=9A=84=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Models/v3/Category.php      |  2 +-
 app/Models/v3/CouponSetting.php |  7 ++++---
 app/Models/v3/GoodsCategory.php |  5 +++--
 app/Models/v3/Market.php        | 11 ++++++-----
 4 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/app/Models/v3/Category.php b/app/Models/v3/Category.php
index b9d2dcc..7e4950b 100644
--- a/app/Models/v3/Category.php
+++ b/app/Models/v3/Category.php
@@ -61,7 +61,7 @@ class Category extends Model
            $new =  array_merge($options,$list);
            return array_flip($new);
         }else{
-            return $list;
+            return array_flip($list);
         }
     }
 
diff --git a/app/Models/v3/CouponSetting.php b/app/Models/v3/CouponSetting.php
index 85f3737..83528ab 100644
--- a/app/Models/v3/CouponSetting.php
+++ b/app/Models/v3/CouponSetting.php
@@ -41,11 +41,12 @@ class CouponSetting extends Model
         if(!empty($where)){
             $model->where($where);
         }
-        $list = $model->pluck('name','id')->toArray();
+        $list = $model->pluck('id','name')->toArray();
         if(!empty($options)){
-           return array_merge($options,$list);
+            $new =  array_merge($options,$list);
+           return array_flip($new);
         }else{
-            return $list;
+            return array_flip($list);
         }
     }
 
diff --git a/app/Models/v3/GoodsCategory.php b/app/Models/v3/GoodsCategory.php
index cb3fad2..fb0c086 100644
--- a/app/Models/v3/GoodsCategory.php
+++ b/app/Models/v3/GoodsCategory.php
@@ -40,9 +40,10 @@ class GoodsCategory extends Model
         if(count($where) > 0){
             $model->where($where);
         }
-        $list = $model->pluck('title','id')->toArray();
+        $list = $model->pluck('id','title')->toArray();
         if(!empty($options)){
-           return array_merge($options,$list);
+            $new =  array_merge($options,$list);
+            return array_flip($new);
         }else{
             return $list;
         }
diff --git a/app/Models/v3/Market.php b/app/Models/v3/Market.php
index 0177002..31c6352 100644
--- a/app/Models/v3/Market.php
+++ b/app/Models/v3/Market.php
@@ -34,17 +34,18 @@ class Market extends Model
      */
     public static function getMarketArray($where = [], $options = [])
     {
-        $model = self::where('status',1)
-            ->whereNull('deleted_at');
+        $model = self::whereNull('deleted_at');
+            // ->where('status',1)
 
         if(!empty($where)){
             $model->where($where);
         }
-        $list = $model->pluck('name','id')->toArray();
+        $list = $model->pluck('id','name')->toArray();
         if(!empty($options)){
-        return array_merge($options,$list);
+            $new =  array_merge($options,$list);
+            return array_flip($new);
         }else{
-            return $list;
+            return array_flip($list);
         }
     }