|
|
@@ -254,14 +254,9 @@ class MerchantService extends BaseService
|
|
|
//套餐
|
|
|
$setIdList = array_column($list, 'setId');
|
|
|
$set = SetMealService::getSetByIds($setIdList);
|
|
|
-
|
|
|
//拓展
|
|
|
$ext = MerchantExtendService::getExtendByMerchantIds($merchantIdList);
|
|
|
-
|
|
|
foreach ($list as $key => $val) {
|
|
|
- $adminId = $val['adminId'];
|
|
|
- $merchantId = $val['id'];
|
|
|
- $setId = $val['setId'];
|
|
|
$val['adminName'] = '';
|
|
|
$val['city'] = '厦门';
|
|
|
$val['credit'] = '良好';
|