mkm/shop-php
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://gitea.lihaink.cn/mkm/shop-php into dev

Browse Source
This commit is contained in:
yaooo 2023-09-28 15:43:42 +08:00
commit 019ae88296
1 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
app/common/repositories/store/product/ProductRepository.php
View File

@ -1323,19 +1323,17 @@ class ProductRepository extends BaseRepository
->where('mer_id',$merId); ->where('mer_id',$merId);
$data = []; $data = [];
$count = $query->count(); $count = $query->count();
// if ($count < 3) {
if ($count < 3) { // $productIds[] = $productId;
$productIds[] = $productId; // $data = $this->dao->getSearch([])
$data = $this->dao->getSearch([]) // ->where($this->dao->productShow())
->where($this->dao->productShow()) // ->whereNotIn('product_id',$productIds)
->whereNotIn('product_id',$productIds) // ->where('mer_id', $merId)
->where('mer_id', $merId) // ->field('mer_id,product_id,store_name,image,price,is_show,status,is_gift_bag,is_good,sales,create_time')
->field('mer_id,product_id,store_name,image,price,is_show,status,is_gift_bag,is_good,sales,create_time') // ->order('sort DESC,create_time DESC')
->order('sort DESC,create_time DESC') // ->limit((3 - $count))
->limit((3 - $count)) // ->select()->toArray();
->select()->toArray(); // }
}
if ($count > 0 ){ if ($count > 0 ){
$count = $count > 3 ? 3 : $count; $count = $count > 3 ? 3 : $count;
$res = $query->setOption('field',[])->field('mer_id,product_id,store_name,image,price,is_show,status,is_gift_bag,is_good,sales,create_time') $res = $query->setOption('field',[])->field('mer_id,product_id,store_name,image,price,is_show,status,is_gift_bag,is_good,sales,create_time')