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

更新店铺查询条件

Browse Source
This commit is contained in:
yaooo 2023-09-04 12:03:39 +08:00
parent 1200f9ebef
commit a5ae312fc3
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
app/common/model/system/merchant/Merchant.php
View File

@ -39,17 +39,17 @@ class Merchant extends BaseModel
//定义店铺类型code //定义店铺类型code
const TypeCode = [ const TypeCode = [
'TypeStore', //镇街店铺 'TypeStore' => 'TypeStore', //镇街店铺
'TypeCloudWarehouse', //镇级云仓 'TypeCloudWarehouse' => 'TypeCloudWarehouse', //镇级云仓
'TypeSupplyChain', //市级供应链 'TypeSupplyChain' => 'TypeSupplyChain', //市级供应链
'TypePlatform', //市级里海云 'TypePlatform' => 'TypePlatform', //市级里海云
'TypeTeamServer', //小组服务团 'TypeTeamServer' => 'TypeTeamServer', //小组服务团
'TypeVillageServer', //村服务团队 'TypeVillageServer' => 'TypeVillageServer', //村服务团队
'TypeTownServer', //镇服务团队 'TypeTownServer' => 'TypeTownServer', //镇服务团队
'TypeTownSupplyChain', //镇级供应链 'TypeTownSupplyChain' => 'TypeTownSupplyChain', //镇级供应链
'TypeFamousSpecialties', //名优特产 'TypeFamousSpecialties' => 'TypeFamousSpecialties', //名优特产
'TypeLocalCuisine', //当地美食 'TypeLocalCuisine' => 'TypeLocalCuisine', //当地美食
'TypeFeaturedCultural', //特色文旅 'TypeFeaturedCultural' => 'TypeFeaturedCultural', //特色文旅
]; ];
const TypeMap = [ const TypeMap = [

2
app/common/repositories/system/merchant/MerchantTypeRepository.php
View File

@ -68,7 +68,7 @@ class MerchantTypeRepository extends BaseRepository
// unset($merTypeIds[$k]); // unset($merTypeIds[$k]);
// } // }
// } // }
$queryBuilder = $queryBuilder->where('type_code', '<>', 'TypeSupplyChain'); $queryBuilder = $queryBuilder->where('type_code', '<>', Merchant::TypeCode['TypeSupplyChain']);
} }
$merTypeIds = $queryBuilder->fetchSql(false)->column('mer_type_id'); $merTypeIds = $queryBuilder->fetchSql(false)->column('mer_type_id');
$query = MerchantType::getDB()->when(!$getAll, function ($query) use ($merTypeIds) { $query = MerchantType::getDB()->when(!$getAll, function ($query) use ($merTypeIds) {