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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
mkm 2023-04-06 10:18:02 +08:00
commit 7f35cdc98f
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/common/repositories/store/product/SpuRepository.php
View File

@ -27,6 +27,7 @@ use app\common\repositories\store\StoreSeckillActiveRepository;
use app\common\repositories\user\UserVisitRepository; use app\common\repositories\user\UserVisitRepository;
use app\common\model\system\supplychain\SupplyChainLinkMerchant; use app\common\model\system\supplychain\SupplyChainLinkMerchant;
use think\facade\Queue; use think\facade\Queue;
use think\facade\Db;
class SpuRepository extends BaseRepository class SpuRepository extends BaseRepository
{ {
@ -167,7 +168,11 @@ class SpuRepository extends BaseRepository
// 只获取当前供应链内商户的商品 // 只获取当前供应链内商户的商品
$query->whereIn('S.mer_id', $MerListId); $query->whereIn('S.mer_id', $MerListId);
} }
// 搜索镇
if(isset($where['street_id']) && !empty($where['street_id'])){
$mer_ids = Db::table('eb_merchant_address')->where('street_id',$where['street_id'])->column('mer_id');
$query->whereIn('S.mer_id', $mer_ids);
}
$productMake = app()->make(ProductRepository::class); $productMake = app()->make(ProductRepository::class);
$count = $query->count(); $count = $query->count();

3
app/controller/api/store/product/StoreSpu.php
View File

@ -58,7 +58,8 @@ class StoreSpu extends BaseController
'product_ids', 'product_ids',
'mer_id', 'mer_id',
'merchant_category_id', 'merchant_category_id',
'is_good' 'is_good',
'street_id'
]); ]);
$where['is_gift_bag'] = 0; $where['is_gift_bag'] = 0;