From 14ed81440e7bb91d64ba138b11030cdd4cf4f14b Mon Sep 17 00:00:00 2001
From: liangyuyan <1103300295@qq.com>
Date: Fri, 4 Sep 2020 11:07:42 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E6=96=87=E4=BB=B6=E6=8D=A2=E5=88=B0?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=A4=B9v3-=E4=BF=AE=E6=94=B9=E8=B7=AF?=
 =?UTF-8?q?=E7=94=B1=E5=92=8C=E5=91=BD=E5=90=8D=E7=A9=BA=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Admin/Common/StoreQRCode.php              | 14 +++---
 app/Admin/Controllers/v3/BannerController.php |  9 ++--
 .../Controllers/v3/CategoryController.php     |  4 +-
 app/Admin/Controllers/v3/GoodsController.php  | 12 ++---
 app/Admin/Controllers/v3/StoreController.php  | 20 ++++----
 app/Admin/Repositories/v3/Banner.php          |  4 +-
 app/Admin/Repositories/v3/Goods.php           |  4 +-
 app/Admin/Repositories/v3/Store.php           |  4 +-
 app/Admin/routes.php                          | 12 ++---
 app/Models/v3/Banner.php                      |  2 +-
 app/Models/v3/Category.php                    |  2 +-
 app/Models/v3/CouponSetting.php               | 16 -------
 app/Models/v3/CouponTie.php                   | 15 ------
 app/Models/v3/Goods.php                       |  7 ++-
 app/Models/v3/GoodsBanners.php                |  2 +-
 app/Models/v3/LanzuMmInfo.php                 | 46 -------------------
 .../v3/{ImsCjdcMarket.php => Market.php}      |  4 +-
 app/Models/v3/Store.php                       |  4 +-
 app/Models/v3/{ImsCjdcUser.php => User.php}   |  9 +---
 resources/lang/zh-CN/goods.php                |  2 +-
 resources/lang/zh-CN/store.php                |  4 +-
 21 files changed, 55 insertions(+), 141 deletions(-)
 delete mode 100644 app/Models/v3/CouponSetting.php
 delete mode 100644 app/Models/v3/CouponTie.php
 delete mode 100644 app/Models/v3/LanzuMmInfo.php
 rename app/Models/v3/{ImsCjdcMarket.php => Market.php} (95%)
 rename app/Models/v3/{ImsCjdcUser.php => User.php} (93%)

diff --git a/app/Admin/Common/StoreQRCode.php b/app/Admin/Common/StoreQRCode.php
index bb40c95..7f639bb 100644
--- a/app/Admin/Common/StoreQRCode.php
+++ b/app/Admin/Common/StoreQRCode.php
@@ -48,16 +48,16 @@ class StoreQRCode extends AdminController
      */
     public function SetPayWeChatCode($id)
     {
-        $isCREATE = env('IS_CREATE_WECHAT_MINI_QR_CODE',1);
-        if($isCREATE == 0){
+        // $isCREATE = env('IS_CREATE_WECHAT_MINI_QR_CODE',1);
+        // if($isCREATE == 0){
             $codeStore = $this->images->createQrCode($id,'zh_cjdianc/pages/seller/fukuan');
             $storeImgPath = 'QR_code/code_minipay_img/wx_minipay_'.$id.'.jpg';
-        }else{
-            $codeStore = $this->images->createWeChatQrCode('?scene='.$id,'zh_cjdianc/pages/seller/fukuan');
-            $storeImgPath = 'QR_code/code_pay_img/wx_pay_'.$id.'.jpg';
-            // 裁剪
+        // }else{
+        //     $codeStore = $this->images->createWeChatQrCode('?scene='.$id,'zh_cjdianc/pages/seller/fukuan');
+        //     $storeImgPath = 'QR_code/code_pay_img/wx_pay_'.$id.'.jpg';
+        //     // 裁剪
 
-        }
+        // }
 
         // 裁剪测试
         // $this->imageManager->make()->resize(270,270)->insert($codeStore);
diff --git a/app/Admin/Controllers/v3/BannerController.php b/app/Admin/Controllers/v3/BannerController.php
index f6d7856..2ab494c 100644
--- a/app/Admin/Controllers/v3/BannerController.php
+++ b/app/Admin/Controllers/v3/BannerController.php
@@ -1,14 +1,14 @@
 <?php
 
-namespace App\Admin\Controllers;
+namespace App\Admin\Controllers\v3;
 
-use App\Admin\Repositories\Banner;
+use App\Admin\Repositories\v3\Banner;
 use Dcat\Admin\Form;
 use Dcat\Admin\Grid;
 use Dcat\Admin\Show;
 use Dcat\Admin\Controllers\AdminController;
 use App\Models\ImsCjdcMarket as MarketModel;
-use App\Models\Banner as BannerModel;
+use App\Models\v3\Banner as BannerModel;
 
 class BannerController extends AdminController
 {
@@ -38,7 +38,8 @@ class BannerController extends AdminController
                 return isset(BannerModel::$_type[$type]) ? BannerModel::$_type[$type] : '';
             });
             $grid->column('sort')->sortable();
-            $grid->column('status')->using(BannerModel::$_status)->label(['default' => 'primary',1 => 'primary', 0 => 'danger']);
+            $grid->column('status')->switch();
+            // ->using(BannerModel::$_status)->label(['default' => 'primary',1 => 'primary', 0 => 'danger']);
 
             $grid->filter(function (Grid\Filter $filter) {
                 $filter->equal('id');
diff --git a/app/Admin/Controllers/v3/CategoryController.php b/app/Admin/Controllers/v3/CategoryController.php
index ab0ffe9..3d61bca 100644
--- a/app/Admin/Controllers/v3/CategoryController.php
+++ b/app/Admin/Controllers/v3/CategoryController.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Admin\Controllers;
+namespace App\Admin\Controllers\v3;
 
-use App\Models\Category;
+use App\Models\v3\Category;
 use Dcat\Admin\Form;
 use Dcat\Admin\Layout\Row;
 use Dcat\Admin\Layout\Content;
diff --git a/app/Admin/Controllers/v3/GoodsController.php b/app/Admin/Controllers/v3/GoodsController.php
index a37f175..d5ba4d5 100644
--- a/app/Admin/Controllers/v3/GoodsController.php
+++ b/app/Admin/Controllers/v3/GoodsController.php
@@ -1,17 +1,17 @@
 <?php
 
-namespace App\Admin\Controllers;
+namespace App\Admin\Controllers\v3;
 
-use App\Admin\Repositories\Goods;
+use App\Admin\Repositories\v3\Goods;
 use Dcat\Admin\Form;
 use Dcat\Admin\Grid;
 use Dcat\Admin\Show;
 use Dcat\Admin\Controllers\AdminController;
-use App\Models\Category as CategoryModel;
-use App\Models\Store as StoreModel;
+use App\Models\v3\Category as CategoryModel;
+use App\Models\v3\Store as StoreModel;
 use Dcat\Admin\Form\NestedForm;
-use App\Models\Goods as GoodsModel;
-use App\Models\ImsCjdcMarket as MarketModel;
+use App\Models\v3\Goods as GoodsModel;
+use App\Models\v3\Market as MarketModel;
 
 class GoodsController extends AdminController
 {
diff --git a/app/Admin/Controllers/v3/StoreController.php b/app/Admin/Controllers/v3/StoreController.php
index 2c4420b..ff08d63 100644
--- a/app/Admin/Controllers/v3/StoreController.php
+++ b/app/Admin/Controllers/v3/StoreController.php
@@ -1,20 +1,18 @@
 <?php
 
-namespace App\Admin\Controllers;
+namespace App\Admin\Controllers\v3;
 
-use App\Admin\Repositories\Store;
+use App\Admin\Repositories\v3\Store;
 use Dcat\Admin\Form;
 use Dcat\Admin\Grid;
 use Dcat\Admin\Show;
 use Dcat\Admin\Controllers\AdminController;
-use App\Models\StoreType as StoreTypeModel;
 use App\Models\LanzuMmInfo as MminfoModel;
-use App\Models\ImsCjdcMarket as MarketModel;
+use App\Models\v3\Market as MarketModel;
 use App\Admin\Common\StoreQRCode;
-use App\Admin\Repositories\StoreType;
-use App\Models\Store as StoreModel;
-use App\Models\ImsCjdcUser as UserModel;
-use App\Models\Category as CategoryModel;
+use App\Models\v3\Store as StoreModel;
+use App\Models\v3\User as UserModel;
+use App\Models\v3\Category as CategoryModel;
 
 class StoreController extends AdminController
 {
@@ -115,15 +113,15 @@ class StoreController extends AdminController
             // 查询市场
             $marketList = MarketModel::getMarket();
             // 查询一级分类
-            $storeTypeList = CategoryModel::getCategoryArray([['parent_id','=',0]]);
+            $categoryList = CategoryModel::getCategoryArray([['parent_id','=',0]]);
             // 用户
             $userList = UserModel::getUserArray();
 
-            $form->column(6, function (Form $form) use($mmList,$marketList,$storeTypeList){
+            $form->column(6, function (Form $form) use($mmList,$marketList,$categoryList){
                 $form->hidden('id');
                 $form->select('mm_user_id')->options($mmList);
                 $form->select('market_id')->required()->options($marketList);
-                $form->select('store_type_id')->required()->options($storeTypeList);
+                $form->select('category_id')->options($categoryList);
                 $form->text('name')->required()->maxLength(50);
                 $form->image('logo')->required();
                 $form->mobile('tel');
diff --git a/app/Admin/Repositories/v3/Banner.php b/app/Admin/Repositories/v3/Banner.php
index 18d3ba7..7f2bb8c 100644
--- a/app/Admin/Repositories/v3/Banner.php
+++ b/app/Admin/Repositories/v3/Banner.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Admin\Repositories;
+namespace App\Admin\Repositories\v3;
 
-use App\Models\Banner as Model;
+use App\Models\v3\Banner as Model;
 use Dcat\Admin\Repositories\EloquentRepository;
 
 class Banner extends EloquentRepository
diff --git a/app/Admin/Repositories/v3/Goods.php b/app/Admin/Repositories/v3/Goods.php
index eb756da..50641ec 100644
--- a/app/Admin/Repositories/v3/Goods.php
+++ b/app/Admin/Repositories/v3/Goods.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Admin\Repositories;
+namespace App\Admin\Repositories\v3;
 
-use App\Models\Goods as Model;
+use App\Models\v3\Goods as Model;
 use Dcat\Admin\Repositories\EloquentRepository;
 
 class Goods extends EloquentRepository
diff --git a/app/Admin/Repositories/v3/Store.php b/app/Admin/Repositories/v3/Store.php
index 80bcdc8..daa2d0f 100644
--- a/app/Admin/Repositories/v3/Store.php
+++ b/app/Admin/Repositories/v3/Store.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Admin\Repositories;
+namespace App\Admin\Repositories\v3;
 
-use App\Models\Store as Model;
+use App\Models\v3\Store as Model;
 use Dcat\Admin\Repositories\EloquentRepository;
 
 class Store extends EloquentRepository
diff --git a/app/Admin/routes.php b/app/Admin/routes.php
index 1e6ddf4..2f4919f 100644
--- a/app/Admin/routes.php
+++ b/app/Admin/routes.php
@@ -45,14 +45,14 @@ Route::group([
     $router->resource('/storeUserReport', 'StoreUserReportController');
 
     // 分类
-    $router->resource('/category', 'CategoryController');
-    $router->get('/category/TieForm', 'CategoryTieController@CategoryTieForm');
+    $router->resource('/category', 'v3\CategoryController');
+    $router->get('/category/TieForm', 'v3\CategoryTieController@CategoryTieForm');
 
     // 店铺
-    $router->resource('/store', 'StoreController');
+    $router->resource('/store', 'v3\StoreController');
     // 商品
-    $router->resource('/goods', 'GoodsController');
+    $router->resource('/goods', 'v3\GoodsController');
     // banner
-    $router->resource('/banner', 'BannerController');
-    
+    $router->resource('/banner', 'v3\BannerController');
 });
+
diff --git a/app/Models/v3/Banner.php b/app/Models/v3/Banner.php
index 3237a3a..7631409 100644
--- a/app/Models/v3/Banner.php
+++ b/app/Models/v3/Banner.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Models;
+namespace App\Models\v3;
 
 use Dcat\Admin\Traits\HasDateTimeFormatter;
 use Illuminate\Database\Eloquent\SoftDeletes;
diff --git a/app/Models/v3/Category.php b/app/Models/v3/Category.php
index 8c2d07e..5f4a950 100644
--- a/app/Models/v3/Category.php
+++ b/app/Models/v3/Category.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Models;
+namespace App\Models\v3;
 
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Dcat\Admin\Traits\ModelTree;
diff --git a/app/Models/v3/CouponSetting.php b/app/Models/v3/CouponSetting.php
deleted file mode 100644
index cf3889c..0000000
--- a/app/Models/v3/CouponSetting.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-namespace App\Models;
-
-use Dcat\Admin\Traits\HasDateTimeFormatter;
-use Illuminate\Database\Eloquent\SoftDeletes;
-use Illuminate\Database\Eloquent\Model;
-
-class CouponSetting extends Model
-{
-	use HasDateTimeFormatter;
-    // use SoftDeletes;
-
-    protected $table = 'ims_system_coupon_setting';
-    
-}
diff --git a/app/Models/v3/CouponTie.php b/app/Models/v3/CouponTie.php
deleted file mode 100644
index 9eca791..0000000
--- a/app/Models/v3/CouponTie.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-namespace App\Models;
-
-use Dcat\Admin\Traits\HasDateTimeFormatter;
-
-use Illuminate\Database\Eloquent\Model;
-
-class CouponTie extends Model
-{
-	use HasDateTimeFormatter;
-    // protected $table = 'ims_system_coupon_user';
-    protected $dateFormat = 'U';
-
-}
diff --git a/app/Models/v3/Goods.php b/app/Models/v3/Goods.php
index 74b8906..e411d86 100644
--- a/app/Models/v3/Goods.php
+++ b/app/Models/v3/Goods.php
@@ -1,11 +1,10 @@
 <?php
 
-namespace App\Models;
+namespace App\Models\v3;
 
 use Dcat\Admin\Traits\HasDateTimeFormatter;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Database\Eloquent\Model;
-use App\Models\Store as StoreModel;
 
 class Goods extends Model
 {
@@ -31,11 +30,11 @@ class Goods extends Model
     }
 
     public function ImageBanners(){
-        return $this->hasMany('\App\Models\GoodsBanners','goods_id','id')->where('type',1);
+        return $this->hasMany('\App\Models\v3\GoodsBanners','goods_id','id')->where('type',1);
     }
 
     public function VideoBanners(){
-        return $this->hasMany('\App\Models\GoodsBanners','goods_id','id')->where('type',2);
+        return $this->hasMany('\App\Models\v3\GoodsBanners','goods_id','id')->where('type',2);
 
     }
 
diff --git a/app/Models/v3/GoodsBanners.php b/app/Models/v3/GoodsBanners.php
index 8afe7fd..21dfc7d 100644
--- a/app/Models/v3/GoodsBanners.php
+++ b/app/Models/v3/GoodsBanners.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Models;
+namespace App\Models\v3;
 
 use Dcat\Admin\Traits\HasDateTimeFormatter;
 use Illuminate\Database\Eloquent\SoftDeletes;
diff --git a/app/Models/v3/LanzuMmInfo.php b/app/Models/v3/LanzuMmInfo.php
deleted file mode 100644
index 58af3f5..0000000
--- a/app/Models/v3/LanzuMmInfo.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-
-namespace App\Models;
-
-use Dcat\Admin\Traits\HasDateTimeFormatter;
-
-use Illuminate\Database\Eloquent\Model;
-
-class LanzuMmInfo extends Model
-{
-	use HasDateTimeFormatter;
-    protected $table = 'lanzu_mm_info';
-    protected $dateFormat = 'U';
-
-    public function Withdraw()
-    {
-        return $this->hasOne('\App\Models\LanzuMmWithdraw','mm_id','id');
-    }
-
-    /**
-     * 获取市场经理(只搜索状态为正常的经理)
-     * id为键，name为值
-    */
-    public static function getMmInfoArray()
-    {
-        $list = self::select('id','name')
-            ->where('status',2)
-            ->whereNull('deleted_at')
-            ->get();
-        $array = [];
-        if(count($list) > 0){
-            foreach ($list as $key => $value){
-                $array[$value->id] = $value->name;
-            }
-        }
-        return $array;
-    }
-
-    /**
-     * 根据id获取单条记录
-     */
-    public static function getMmInfo($id,$field = '*')
-    {
-        return self::select($field)->find($id);
-    }
-}
diff --git a/app/Models/v3/ImsCjdcMarket.php b/app/Models/v3/Market.php
similarity index 95%
rename from app/Models/v3/ImsCjdcMarket.php
rename to app/Models/v3/Market.php
index 91bee9e..e4a1788 100644
--- a/app/Models/v3/ImsCjdcMarket.php
+++ b/app/Models/v3/Market.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace App\Models;
+namespace App\Models\v3;
 
 use Dcat\Admin\Traits\HasDateTimeFormatter;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Database\Eloquent\Model;
 
-class ImsCjdcMarket extends Model
+class Market extends Model
 {
 	use HasDateTimeFormatter;
     use SoftDeletes;
diff --git a/app/Models/v3/Store.php b/app/Models/v3/Store.php
index 80f65c1..abac462 100644
--- a/app/Models/v3/Store.php
+++ b/app/Models/v3/Store.php
@@ -1,12 +1,10 @@
 <?php
 
-namespace App\Models;
+namespace App\Models\v3;
 
 use Dcat\Admin\Traits\HasDateTimeFormatter;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Database\Eloquent\Model;
-use App\Models\ImsCjdcMarket as MarketModel;
-use App\Models\StoreType as StoreTypeModel;
 
 class Store extends Model
 {
diff --git a/app/Models/v3/ImsCjdcUser.php b/app/Models/v3/User.php
similarity index 93%
rename from app/Models/v3/ImsCjdcUser.php
rename to app/Models/v3/User.php
index 8a4a844..f0b9fbc 100644
--- a/app/Models/v3/ImsCjdcUser.php
+++ b/app/Models/v3/User.php
@@ -1,19 +1,14 @@
 <?php
 
-
-namespace App\Models;
-
-
-
+namespace App\Models\v3;
 
 use Illuminate\Database\Eloquent\Model;
 
-class ImsCjdcUser extends Model
+class User extends Model
 {
     protected $table = 'lanzu_user';
     protected $dateFormat = 'U';
 
-    
     /**
      * 获取单个用户信息
      * @param int $id
diff --git a/resources/lang/zh-CN/goods.php b/resources/lang/zh-CN/goods.php
index 62d80a4..8aedc2d 100644
--- a/resources/lang/zh-CN/goods.php
+++ b/resources/lang/zh-CN/goods.php
@@ -6,7 +6,7 @@ return [
     ],
     'fields' => [
         'name' => '商品名称',
-        'goods_type_id' => '商品所属分类',
+        'category_id' => '商品所属分类',
         'store_id' => '所属商家',
         'cover_img' => '封面图',
         'cover_img_url' => '封面图',
diff --git a/resources/lang/zh-CN/store.php b/resources/lang/zh-CN/store.php
index e7954f0..06158de 100644
--- a/resources/lang/zh-CN/store.php
+++ b/resources/lang/zh-CN/store.php
@@ -21,8 +21,8 @@ return [
         'introduction' => '商家简介',
         'coordinates' => '经纬度',
         'business_license' => '营业资质',
-        'store_type_id' => '店铺所属分类',
-        'store_type_name' => '店铺分类',
+        'category_id' => '店铺所属分类',
+        'category_name' => '店铺分类',
         'is_open' => '开启门店',
         'sort' => '排序',
         'user_id' => '提现用户',