名称与头像

biz-ghs/clear/classes/ClearClass.php

@@ -159,7 +159,11 @@ class ClearClass extends BaseClass
         $info['orderList'] = $saleList;
         $info['orderNum'] = count($saleArr);
         $type = $info['type'] ?? 1;
-        $info['operator'] = $type == 1 ? '客户' : '';
+        $operator = $info->ghsShopAdminName ?? '';
+        if ($type == 1) {
+            $operator = '客户';
+        }
+        $info['operator'] = $operator;
         return $info;
     }
 
@@ -176,7 +180,11 @@ class ClearClass extends BaseClass
         $info['orderList'] = $cgList;
         $info['orderNum'] = count($cgArr);
         $type = $info['type'] ?? 1;
-        $info['operator'] = $type == 2 ? '商家' : '';
+        $operator = $info->customShopAdminName ?? '';
+        if ($type == 2) {
+            $operator = '商家';
+        }
+        $info['operator'] = $operator;
         return $info;
     }
 

biz-ghs/clear/services/ClearService.php

@@ -4,6 +4,7 @@ namespace bizGhs\clear\services;
 
 use bizGhs\base\services\BaseService;
 use bizGhs\clear\classes\ClearClass;
+use common\components\imgUtil;
 
 class ClearService extends BaseService
 {
@@ -22,6 +23,7 @@ class ClearService extends BaseService
             //操作人
             $type = $val['type'] ?? 1;
             $data['list'][$key]['operator'] = $type == 1 ? '客户' : '';
+            $data['list'][$key]['avatar'] = imgUtil::groupImg($val['avatar']);
         }
         return $data;
     }