管理员相关

app/shop/controllers/AdminController.php

@@ -22,17 +22,6 @@ class AdminController extends BaseController
         util::success($auth);
     }
 
-    //员工列表 shish 2019.12.8
-    public function actionList()
-    {
-        $get = Yii::$app->request->get();
-        $where = [];
-        $where['merchantId'] = $this->merchantId;
-        $where['delStatus'] = 0;
-        $list = AdminService::getAdminList($where);
-        util::success($list);
-    }
-
     //添加员工 shish 2019.12.8
     public function actionAdd()
     {
@@ -136,29 +125,6 @@ class AdminController extends BaseController
         util::success($detail);
     }
 
-    //收款通知 shish 2020.1.4
-    public function actionUpdateRemind()
-    {
-        $get = Yii::$app->request->get();
-        $id = isset($get['id']) ? $get['id'] : 0;
-        $remind = isset($get['remind']) && is_numeric($get['remind']) ? $get['remind'] : 0;
-        $admin = AdminService::getAdminById($id);
-        AdminService::valid($admin, $this->merchantId);
-        AdminService::updateById($id, ['remind' => $remind]);
-        util::complete();
-    }
-
-    //启用与停用 shish 2020.1.4
-    public function actionUpdateStatus()
-    {
-        $get = Yii::$app->request->get();
-        $id = isset($get['id']) && is_numeric($get['id']) ? $get['id'] : 0;
-        $status = isset($get['status']) ? $get['status'] : 0;
-        $admin = AdminService::getAdminById($id);
-        AdminService::valid($admin, $this->merchantId);
-        AdminService::updateById($id, ['status' => $status]);
-        util::complete();
-    }
 
     //小程序用户完整信息 shish 2019.12.12
     public function actionMiniFullInfo()

app/shop/controllers/AdminShopController.php

@@ -32,7 +32,7 @@ class AdminShopController extends BaseController
 		$miniCode = isset($respond['miniCode']) ? Yii::$app->params['imgHost'] . $respond['miniCode'] : '';
 		util::success(['miniCode' => $miniCode]);
 	}
-
+	
 	//创建管理员 shish 2020.4.20
 	public function actionGenerateAdmin()
 	{
@@ -40,5 +40,40 @@ class AdminShopController extends BaseController
 		AdminShopService::generateAdmin($post);
 		util::complete();
 	}
+	
+	//收款通知 shish 2020.1.4
+	public function actionUpdateRemind()
+	{
+		$get = Yii::$app->request->get();
+		$id = isset($get['id']) ? $get['id'] : 0;
+		$remind = isset($get['remind']) && is_numeric($get['remind']) ? $get['remind'] : 0;
+		$adminShop = AdminShopService::getByCondition(['shopId' => $this->shopId, 'adminId' => $id]);
+		AdminShopService::valid($adminShop, $this->shopId);
+		AdminShopService::updateByCondition(['shopId' => $this->shopId, 'adminId' => $id], ['remind' => $remind]);
+		util::complete();
+	}
+	
+	//启用与停用 shish 2020.1.4
+	public function actionUpdateStatus()
+	{
+		$get = Yii::$app->request->get();
+		$id = isset($get['id']) && is_numeric($get['id']) ? $get['id'] : 0;
+		$status = isset($get['status']) ? $get['status'] : 0;
+		$adminShop = AdminShopService::getByCondition(['shopId' => $this->shopId, 'adminId' => $id]);
+		AdminShopService::valid($adminShop, $this->shopId);
+		AdminShopService::updateByCondition(['shopId' => $this->shopId, 'adminId' => $id], ['status' => $status]);
+		util::complete();
+	}
 
+	//员工列表 shish 2019.12.8
+	public function actionList()
+	{
+		$get = Yii::$app->request->get();
+		$where = [];
+		$where['shopId'] = $this->shopId;
+		$where['delStatus'] = 0;
+		$list = AdminShopService::getAdminList($where);
+		util::success($list);
+	}
+	
 }

biz/admin/services/AdminShopService.php

@@ -18,9 +18,9 @@ use Yii;
 
 class AdminShopService extends BaseService
 {
-
+	
 	public static $baseFile = '\biz\admin\classes\AdminShopClass';
-
+	
 	///创建管理员关联数据准备 shish 2020.4.17
 	public static function prepareBindAdmin($data)
 	{
@@ -76,5 +76,42 @@ class AdminShopService extends BaseService
 		AdminShopClass::add($addData);
 		AdminShopClass::delBindAdminData($shopId, $recommendAdminId);
 	}
+	
+	//获取管理员 shish 2020.4.21
+	public static function getAdminList($where)
+	{
+		$data = AdminShopClass::getList('*', $where, 'addTime DESC');
+		$list = isset($data['list']) && !empty($data['list']) ? $data['list'] : [];
+		if (empty($list)) {
+			return $data;
+		}
+		
+		$params = [];
+		foreach ($list as $val) {
+			$adminId = $val['adminId'];
+			$params[$adminId] = ['remind' => $val['remind'], 'status' => $val['status']];
+		}
+		
+		//所有的管理员
+		$ids = array_column($list, 'adminId');
+		$newList = AdminClass::getByIds($ids);
+		$newList = AdminClass::groupAdminBaseInfo($newList);
 
+		foreach($newList as $newKey => $newVal){
+			$adminId = $newVal['id'];
+			$newList[$newKey]['remind'] = isset($params[$adminId]['remind']) ? $params[$adminId]['remind'] : 0;
+			$newList[$newKey]['status'] = isset($params[$adminId]['status']) ? $params[$adminId]['status'] : 0;
+		}
+
+		$data['list'] = $newList;
+		return $data;
+	}
+	
+	public static function valid($adminShop, $shopId)
+	{
+		if (isset($adminShop['shopId']) == false || $adminShop['shopId'] != $shopId) {
+			util::fail('不是您的员工，没有权限操作');
+		}
+	}
+	
 }