员工关系

app-ghs/controllers/ShopAdminController.php

@@ -82,7 +82,6 @@ class ShopAdminController extends BaseController
     //员工列表 shish 2019.12.8
     public function actionList()
     {
-        $get = Yii::$app->request->get();
         $where = [];
         $where['shopId'] = $this->shopId;
         $where['delStatus'] = 0;

biz-ghs/shop/services/ShopAdminService.php

@@ -11,6 +11,7 @@ use bizGhs\merchant\classes\ShopClass;
 use bizGhs\merchant\services\MerchantService;
 use bizGhs\user\services\UserService;
 use common\components\error;
+use common\components\imgUtil;
 use common\components\miniUtil;
 use common\components\stringUtil;
 use common\components\util;
@@ -100,32 +101,25 @@ class ShopAdminService extends BaseService
         if (empty($list)) {
             return $data;
         }
-
-        //管理员基础信息
-        $ids = array_column($list, 'adminId');
-        $adminInfo = AdminClass::getByIds($ids, null, 'id');
-        $adminBaseInfo = AdminClass::groupAdminBaseInfo($adminInfo, $sensitive);
-
         $roleIds = array_column($list, 'roleId');
         $roleIds = array_filter(array_unique($roleIds));
         $roleList = AdminRoleClass::getByIds($roleIds, null, 'id');
-
+        $prefix = imgUtil::getPrefix();
         foreach ($list as $key => $val) {
-            $adminId = $val['adminId'];
             $roleId = $val['roleId'];
             $roleName = isset($roleList[$roleId]['roleName']) ? $roleList[$roleId]['roleName'] : '';
             $list[$key]['roleName'] = $roleName;
-            $currentAdmin = isset($adminBaseInfo[$adminId]) ? $adminBaseInfo[$adminId] : [];
-            $list[$key]['adminName'] = isset($currentAdmin['adminName']) ? $currentAdmin['adminName'] : '';
             //帐号状态
             $status = 1;
-            if (isset($currentAdmin['accountStatus']) && $currentAdmin['accountStatus'] == 0) {
-                $status = 0;
-            }
             if (isset($val['status']) && $val['status'] == 0) {
                 $status = 0;
             }
             $list[$key]['status'] = $status;
+            $avatar = $prefix . 'hhb_small.png';
+            if (isset($val['avatar']) && !empty($val['avatar'])) {
+                $avatar = $prefix . $val['avatar'];
+            }
+            $list[$key]['avatar'] = $avatar;
         }
         $data['list'] = $list;
         return $data;

common/config/params.php

@@ -68,19 +68,19 @@ if (getenv('YII_ENV') == 'local') {
     $config['hdDomain'] = $prefixHttp . 'shop.hhb.com';
     $config['hdPtHost'] = $prefixHttp . 'api.pt.hhb.com';
     $config['hdShortHost'] = 'hhb.com';
-    $config['hdImgHost'] = $prefixHttp . 'img.hhb.com';
+    $config['hdImgHost'] = $prefixHttp . 'img.hhb.com/';
 
     $config['ghsHost'] = $prefixHttp . 'api.shop.xhb.com';
     $config['ghsDomain'] = $prefixHttp . 'shop.xhb.com';
     $config['ghsPtHost'] = $prefixHttp . 'api.pt.xhb.com';
     $config['ghsShortHost'] = 'xhb.com';
-    $config['ghsImgHost'] = $prefixHttp . 'img.xhb.com';
+    $config['ghsImgHost'] = $prefixHttp . 'img.xhb.com/';
 
     $config['mallHost'] = $prefixHttp . 'api.shop.the.cn';
     $config['mallDomain'] = $prefixHttp . 'shop.the.cn';
     $config['mallPtHost'] = $prefixHttp . 'api.pt.the.cn';
     $config['mallShortHost'] = 'the.cn';
-    $config['mallImgHost'] = $prefixHttp . 'img.the.cn';
+    $config['mallImgHost'] = $prefixHttp . 'img.the.cn/';
 
     $config['ossBucket'] = 'pic-hhb-cs';
 }

sql.sql

@@ -1709,4 +1709,5 @@ ALTER TABLE xhUser DROP COLUMN `merchantId`;
 ALTER TABLE xhCustom CHANGE `adminId` `userId` INT(11) NOT NULL DEFAULT '0' COMMENT '用户id';
 ALTER TABLE xhCustom ADD UNIQUE INDEX custom(`sjId`,`userId`);
 ALTER TABLE xhShop ADD `cashAccount` VARCHAR(50) NOT NULL DEFAULT '' COMMENT '支付宝提现帐号' AFTER `cancelOrder`;
-ALTER TABLE xhShop ADD `cashName` VARCHAR(20) NOT NULL DEFAULT '' COMMENT '支付宝提现姓名' AFTER `cashAccount`;
+ALTER TABLE xhShop ADD `cashName` VARCHAR(20) NOT NULL DEFAULT '' COMMENT '支付宝提现姓名' AFTER `cashAccount`;
+ALTER TABLE xhShopAdmin ADD avatar VARCHAR(800) NOT NULL DEFAULT '' COMMENT '头像' AFTER `adminId`;