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

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;
-
 }

app/Model/v3/Banner.php

@@ -10,11 +10,28 @@ class Banner extends Model
 {
     use SoftDeletes;
     protected $table = 'lanzu_banners';
+    
+    protected $appends = [
+        'cover_url'
+    ];
 
     protected $visible = [
-        'id', 'cover', 'cover_type', 'title', 'subtitle', 'path', 'path_type', 'bg_color'
+        'id', 'cover_type', 'title', 'subtitle', 'path', 'path_type', 'bg_color','cover_url'
     ];
 
+    public function getCoverUrlAttribute(){
+        return $this->imageUrl($this->cover);
+    }
+
+    public function imageUrl($value)
+    {
+        if(strripos($value,"http") === false){
+            return env('OSS_IMG_HOST').'/'.$value;
+        }else{
+            return $value;
+        }
+    }
+
     protected function boot(): void
     {
         parent::boot();
@@ -22,4 +39,6 @@ class Banner extends Model
             return $builder->where(['status' => 1])->orderBy('sort', 'desc');
         });
     }
+
+    
 }

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'
         );
     }
 

app/Service/v3/Implementations/BannerService.php

@@ -11,7 +11,7 @@ class BannerService implements BannerServiceInterface
     {
         return Banner::query()
             ->where(['type' => $type])
-            ->whereIn('market_id', [0,$marketId])
+            ->whereJsonContains('market_ids', [(string)$marketId])
             ->get()->toArray();
     }
 }

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();

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]

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']) {