diff --git a/app/controller/api/store/product/StoreMicro.php b/app/controller/api/store/product/StoreMicro.php index 1965420a..5bac9ff1 100644 --- a/app/controller/api/store/product/StoreMicro.php +++ b/app/controller/api/store/product/StoreMicro.php @@ -10,8 +10,11 @@ class StoreMicro extends BaseController { function seach_bar_code($mer_id,$code='',$name=''){ $category_id=Db::name('merchant')->where('mer_id',$mer_id)->value('category_id'); - $typePlatformId = Db::name('MerchantType')->where('type_code', Merchant::TypeCode['TypePlatform'])->value('mer_type_id'); - $platformMerId = app()->make(MerchantDao::class)->getValidMerchant(['category_id' => $category_id, 'type_id' => $typePlatformId], 'mer_id')->value('mer_id'); + $typePlatformId = Db::name('MerchantType')->where('type_code', 'in',[Merchant::TypePlatform,Merchant::TypeTownSupplyChain])->column('mer_type_id'); + $platformMerId = app()->make(MerchantDao::class)->getValidMerchant(['category_id' => $category_id])->whereIn('type_id',$typePlatformId)->value('mer_id'); + if($platformMerId==null){ + return app('json')->fail('没有市级供应链或者镇级供应链'); + } $productWhere = ['is_show' => 1, 'status' => 1, 'mer_status' => 1, 'is_del' => 0]; if($code!=''){ if (strlen($code) != 13) { @@ -21,7 +24,7 @@ class StoreMicro extends BaseController $product_id_arr=implode(',',$product_id_arr); $find=Db::name('store_product')->where('product_id',$product_id_arr)->where($productWhere)->select(); }else{ - $find=Db::name('store_product')->where('mer_id',$platformMerId)->where('store_name','like','%'.$name.'%')->where($productWhere)->select(); + $find=Db::name('store_product')->whereIn('mer_id',$platformMerId)->where('store_name','like','%'.$name.'%')->where($productWhere)->select(); } if (count($find)==0){ if($code!=''){