|
|
@@ -24,6 +24,7 @@ trait OrderTrait
|
|
|
$adminInfo = AdminClass::getAdminByIds($adminIds, null, 'id');
|
|
|
foreach ($list as $k => $val) {
|
|
|
$adminId = $val['adminId'] ?? 0;
|
|
|
+ //不能取admin里的nam
|
|
|
$list[$k]['adminName'] = $val['shopAdminName'] ?? '';
|
|
|
$list[$k]['nickName'] = $adminInfo[$adminId]['name'] ?? '';
|
|
|
$list[$k]['avatar'] = $adminInfo[$adminId]['avatar'] ?? '';
|
|
|
@@ -36,6 +37,7 @@ trait OrderTrait
|
|
|
{
|
|
|
$adminId = $data['adminId'] ?? 0;
|
|
|
$adminInfo = AdminClass::getAdminById($adminId);
|
|
|
+ //不能取admin里的nam
|
|
|
$data['adminName'] = $data['shopAdminName'] ?? '';
|
|
|
$data['nickName'] = $adminInfo['name'] ?? '';
|
|
|
$data['avatar'] = $adminInfo['avatar'] ?? '';
|