|
|
@@ -101,7 +101,7 @@ class ProductDao extends BaseDao
|
|
101
|
101
|
* @param array $where
|
|
102
|
102
|
* @return mixed
|
|
103
|
103
|
*/
|
|
104
|
|
- public function search(?int $merId, array $where)
|
|
|
104
|
+ public function search(?int $merId, array $where, string $source = 'api')
|
|
105
|
105
|
{
|
|
106
|
106
|
|
|
107
|
107
|
$query = isset($where['soft']) ? $this->getModel()::onlyTrashed() : $this->getModel()::where('product_id','>',0);
|
|
|
@@ -167,8 +167,12 @@ class ProductDao extends BaseDao
|
|
167
|
167
|
}, function ($query) use ($where) {
|
|
168
|
168
|
$query->order('rank DESC ,create_time DESC');
|
|
169
|
169
|
});
|
|
170
|
|
- },function ($query){
|
|
171
|
|
- $query->order('sort DESC')->orderRaw("RAND()");
|
|
|
170
|
+ },function ($query) use ($source){
|
|
|
171
|
+ if ($source === 'admin') {
|
|
|
172
|
+ $query->order('sort DESC')->order('create_time DESC');
|
|
|
173
|
+ } else {
|
|
|
174
|
+ $query->order('sort DESC')->orderRaw("RAND()");
|
|
|
175
|
+ }
|
|
172
|
176
|
});
|
|
173
|
177
|
return $query;
|
|
174
|
178
|
}
|