Merge branch 'phoenix' of http://120.24.33.109:11081/hyzjshwo/lanzu_api_hyperf into phoenix

# Conflicts:
#	config/autoload/dependencies.php
#	config/routes.php

app/Controller/v3/CategoryController.php

@@ -0,0 +1,21 @@
+<?php
+
+namespace App\Controller\v3;
+
+use App\Controller\BaseController;
+use App\Service\v3\Interfaces\CategoryServiceInterface;
+use Hyperf\Di\Annotation\Inject;
+
+class CategoryController extends BaseController
+{
+    /**
+     * @Inject
+     * @var CategoryServiceInterface
+     */
+    protected $categoryService;
+
+    public function all()
+    {
+        return $this->success($this->categoryService->all());
+    }
+}

app/Model/v3/GoodsType.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace App\Model\v3;
+
+use App\Model\Model;
+use Hyperf\Database\Model\Builder;
+use Hyperf\Database\Model\SoftDeletes;
+
+class GoodsType extends Model
+{
+    use SoftDeletes;
+
+    protected $table = 'lanzu_goods_type';
+
+    protected function boot(): void
+    {
+        parent::boot();
+        static::addGlobalScope('status', function (Builder $builder) {
+            $builder->where(['status' => 1]);
+        });
+    }
+
+}

app/Model/v3/StoreType.php

@@ -0,0 +1,36 @@
+<?php
+
+namespace App\Model\v3;
+
+use App\Model\Model;
+use Hyperf\Database\Model\Builder;
+use Hyperf\Database\Model\SoftDeletes;
+
+class StoreType extends Model
+{
+    use SoftDeletes;
+
+    protected $table = 'lanzu_store_type';
+
+    protected function boot(): void
+    {
+        parent::boot();
+        static::addGlobalScope('status', function (Builder $builder) {
+            $builder->where(['status' => 1]);
+        });
+    }
+
+    public function goodsTypes()
+    {
+        // firstKey是中间表联当前表的列，secondKey是远程表对应中间表的列，localKey是当前表关联中间表的列，secondLocalKey是中间表关联远程表的列
+        return $this->hasManyThrough(
+            GoodsType::class,
+            TypeCorrelation::class,
+            'store_type_id',
+            'id',
+            'id',
+            'goods_type_id'
+        );
+    }
+
+}

app/Model/v3/TypeCorrelation.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace App\Model\v3;
+
+use App\Model\Model;
+
+class TypeCorrelation extends Model
+{
+    protected $table = 'lanzu_type_correlation';
+}

app/Service/v3/Implementations/CategoryService.php

@@ -0,0 +1,33 @@
+<?php
+
+namespace App\Service\v3\Implementations;
+
+use App\Model\v3\StoreType;
+use App\Service\v3\Interfaces\CategoryServiceInterface;
+
+class CategoryService implements CategoryServiceInterface
+{
+
+    public function do()
+    {
+        // TODO: Implement do() method.
+    }
+
+    public function check()
+    {
+        // TODO: Implement check() method.
+    }
+
+    public function undo()
+    {
+        // TODO: Implement undo() method.
+    }
+
+    public function all()
+    {
+        return StoreType::query()
+            ->with('goodsTypes')
+            ->get()
+            ->toArray();
+    }
+}

app/Service/v3/Implementations/SmsAliSendService.php

@@ -69,7 +69,7 @@ class SmsAliSendService implements SmsSendServiceInterface
     {
         // TODO: Implement undo() method.
     }
-    
+
     public function doVerifyCode($tel, $code)
     {
         $params = ['user_name' => '疯狂的水叔叔', 'market_name' => '验证码', 'money' => $code];

app/Service/v3/Interfaces/CategoryServiceInterface.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace App\Service\v3\Interfaces;
+
+interface CategoryServiceInterface
+{
+
+    public function do();
+    public function check();
+    public function undo();
+    public function all();
+
+}

config/autoload/dependencies.php

@@ -43,4 +43,5 @@ return [
     \App\Service\v3\Interfaces\OnlineOrderServiceInterface::class => \App\Service\v3\Implementations\OnlineOnlineOrderService::class,
     \App\Service\v3\Interfaces\DistributionPriceServiceInterface::class => \App\Service\v3\Implementations\DistributionPriceService::class,
     \App\Service\v3\Interfaces\AppointmentTimeServiceInterface::class => \App\Service\v3\Implementations\AppointmentTimeService::class,
+    \App\Service\v3\Interfaces\CategoryServiceInterface::class => \App\Service\v3\Implementations\CategoryService::class,
 ];

config/routes.php

@@ -81,8 +81,9 @@ Router::addGroup('/v3/', function () {
     Router::post('home/appletIndex', 'App\Controller\v3\HomeController@appletIndex');
     Router::post('goods/detail', 'App\Controller\v3\GoodsController@detail');
     Router::post('goodsRecommend/getByTabsForAppletIndex', 'App\Controller\v3\GoodsRecommendController@getByTabsForAppletIndex');
-	Router::post('onlineOrder/confirm', 'App\Controller\v3\OnlineOrderController@do');
+    Router::post('onlineOrder/confirm', 'App\Controller\v3\OnlineOrderController@do');
     Router::post('distributionPrice/get', 'App\Controller\v3\DistributionPriceController@do');
+    Router::post('category/all', 'App\Controller\v3\CategoryController@all');
 },['middleware' => [\App\Middleware\Auth\ApiMiddleware::class]]);
 
 // 需要登录的路由