zhongchuang
/
admin-api
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

添加：商户支持招商员编辑

This commit is contained in:
wuhui_zzw 2024-02-06 10:17:31 +08:00
parent e716d5dab2
commit 02cd35c95f
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/common/repositories/system/merchant/MerchantRepository.php
View File

@ -829,7 +829,9 @@ class MerchantRepository extends BaseRepository
*/ */
public function adminDetail($id) public function adminDetail($id)
{ {
$data = $this->dao->getWhere(['mer_id' => $id],'*',['merchantType','merchantCategory'])->toArray(); $data = $this->dao->getWhere(['mer_id' => $id],'*',['merchantType','merchantCategory', 'spread' => function ($query) {
$query->field('uid,nickname,avatar');
}])->toArray();
$make = app()->make(MerchantAdminRepository::class); $make = app()->make(MerchantAdminRepository::class);
$data['mer_account'] = $make->merIdByAccount($id); $data['mer_account'] = $make->merIdByAccount($id);
$data['mer_password'] = '***********'; $data['mer_password'] = '***********';

1
app/controller/admin/system/merchant/Merchant.php
View File

@ -209,6 +209,7 @@ class Merchant extends BaseController
['platform_commission',0], ['platform_commission',0],
['avg_consumption',0], ['avg_consumption',0],
'mer_label', 'mer_label',
'spread_uid'
]); ]);
$data['mer_label'] = str_replace('，',',',$data['mer_label']); $data['mer_label'] = str_replace('，',',',$data['mer_label']);
if (!$isUpdate) { if (!$isUpdate) {