wesmiler před 15 hodinami
rodič
revize
d877d61017
2 změnil soubory, kde provedl 5 přidání a 4 odebrání
  1. 3 2
      app/Models/GoodsModel.php
  2. 2 2
      app/Services/Api/GoodsService.php

+ 3 - 2
app/Models/GoodsModel.php

@@ -85,7 +85,8 @@ class GoodsModel extends BaseModel
     public function sku()
     {
         return $this->hasOne(GoodsSkuModel::class, 'id', 'sku_id')
-            ->where(['mark' => 1]);
+            ->where(['status' => 1,'mark' => 1])
+            ->orderBy('sort', 'desc');
     }
 
     /**
@@ -94,7 +95,7 @@ class GoodsModel extends BaseModel
     public function skus()
     {
         return $this->hasMany(GoodsSkuModel::class, 'goods_id', 'id')
-            ->where(['mark' => 1, 'status' => 1])
+            ->where(['status' => 1,'mark' => 1])
             ->orderBy('sort', 'desc');
     }
 }

+ 2 - 2
app/Services/Api/GoodsService.php

@@ -101,7 +101,7 @@ class GoodsService extends BaseService
             unset($where['a.status']);
         }
 
-        $model = $this->model->with(['category','skus'])
+        $model = $this->model->with(['category','sku'])
             ->from('goods as a')
             ->where(function ($query) use ($params) {
                 // 分类
@@ -349,7 +349,7 @@ class GoodsService extends BaseService
             return $data;
         }
 
-        $data = $this->model->with(['skus'])->where(['zone_type'=>$type,'status'=>1,'mark'=>1])
+        $data = $this->model->with(['sku'])->where(['zone_type'=>$type,'status'=>1,'mark'=>1])
             ->select(['id','thumb','price','market_price','sku_type','goods_name','sales','stock','category_id','type','zone_type','is_new','status'])
             ->orderBy('sort','desc')
             ->orderBy('id','asc')