From ed0d2963eff23c8c80f8062b57dd701e8d9eb390 Mon Sep 17 00:00:00 2001
From: weigang <mr.shuixiang@aliyun.com>
Date: Fri, 4 Sep 2020 19:52:48 +0800
Subject: [PATCH] =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E5=85=B3=E8=81=94=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5+=E8=AE=A2=E5=8D=95=E5=88=A0=E9=99=A4=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Constants/v3/OrderState.php                     | 10 ----------
 app/Model/v3/StoreType.php                          |  4 ++--
 app/Service/v3/Implementations/CategoryService.php  |  6 +++---
 app/Service/v3/Implementations/OrderListService.php |  8 +-------
 app/Service/v3/Implementations/SearchService.php    |  4 ++--
 5 files changed, 8 insertions(+), 24 deletions(-)

diff --git a/app/Constants/v3/OrderState.php b/app/Constants/v3/OrderState.php
index 0631422..cc0fb41 100644
--- a/app/Constants/v3/OrderState.php
+++ b/app/Constants/v3/OrderState.php
@@ -75,14 +75,4 @@ class OrderState extends AbstractConstants
      */
     const REFUND = [self::REFUNDING, self::REFUNDED, self::REFUND_REFUSE];
 
-    /**
-     * @Message("已删除")
-     */
-    const DELETED = 1;
-
-    /**
-     * @Message("未删除")
-     */
-    const NOT_DELETED = 2;
-
 }
\ No newline at end of file
diff --git a/app/Model/v3/StoreType.php b/app/Model/v3/StoreType.php
index c6761b5..2d320c2 100644
--- a/app/Model/v3/StoreType.php
+++ b/app/Model/v3/StoreType.php
@@ -26,10 +26,10 @@ class StoreType extends Model
         return $this->hasManyThrough(
             GoodsType::class,
             TypeCorrelation::class,
-            'store_type_id',
+            'category_id',
             'id',
             'id',
-            'goods_type_id'
+            'category_id'
         );
     }
 
diff --git a/app/Service/v3/Implementations/CategoryService.php b/app/Service/v3/Implementations/CategoryService.php
index 4899536..c49de5e 100644
--- a/app/Service/v3/Implementations/CategoryService.php
+++ b/app/Service/v3/Implementations/CategoryService.php
@@ -37,13 +37,13 @@ class CategoryService implements CategoryServiceInterface
 
     public function allForStore($storeId)
     {
-        $goodsTypeIds = Goods::query()->select('goods_type_id')
+        $goodsTypeIds = Goods::query()->select('category_id')
             ->where(['store_id' => $storeId])
-            ->groupBy(['goods_type_id'])
+            ->groupBy(['category_id'])
             ->get()->toArray();
 
         return GoodsType::query()
-            ->whereIn('id', array_column($goodsTypeIds, 'goods_type_id'))
+            ->whereIn('id', array_column($goodsTypeIds, 'category_id'))
             ->orderBy('sort', 'DESC')
             ->orderBy('id', 'DESC')
             ->get()->toArray();
diff --git a/app/Service/v3/Implementations/OrderListService.php b/app/Service/v3/Implementations/OrderListService.php
index bcbc6ed..50dda64 100644
--- a/app/Service/v3/Implementations/OrderListService.php
+++ b/app/Service/v3/Implementations/OrderListService.php
@@ -29,13 +29,7 @@ class OrderListService implements OrderListServiceInterface
     public function onlineByUser($userId, $tab, $page=1, $pagesize=10)
     {
         $builder = OrderMain::query()
-            ->select('id', 'global_order_id', 'money', 'state', 'market_id', 'created_at')
-            ->with(['orderGoods' => function($query) {
-                $query->select(['lanzu_order_goods.id', 'lanzu_order_goods.name', 'lanzu_order_goods.cover_img']);
-            }])
-            ->with(['market' => function($query) {
-                $query->select(['lanzu_market.id', 'lanzu_market.name', 'lanzu_market.tel']);
-            }])
+            ->with(['orderGoods', 'market'])
             ->where([
                 ['user_id','=',$userId],
                 ['type','=',1]
diff --git a/app/Service/v3/Implementations/SearchService.php b/app/Service/v3/Implementations/SearchService.php
index 79f76fb..dcf67ab 100644
--- a/app/Service/v3/Implementations/SearchService.php
+++ b/app/Service/v3/Implementations/SearchService.php
@@ -21,7 +21,7 @@ class SearchService implements \App\Service\v3\Interfaces\SearchServiceInterface
             ->where('inventory', '>', 0);
 
         if (isset($params['type_id']) && $params['type_id']) {
-            $builder->where(['goods_type_id' => $params['type_id']]);
+            $builder->where(['category_id' => $params['type_id']]);
         }
 
         if (isset($params['keyword']) && $params['keyword']) {
@@ -73,7 +73,7 @@ class SearchService implements \App\Service\v3\Interfaces\SearchServiceInterface
         }
 
         if (isset($params['type_id']) && $params['type_id']) {
-            $builder->where(['store_type_id' => $params['type_id']]);
+            $builder->where(['category_id' => $params['type_id']]);
         }
 
         if (isset($params['keyword']) && $params['keyword']) {