添加角色

app/business/controllers/AdminRoleController.php

@@ -12,12 +12,21 @@ use yii\web\Controller;
 
 class AdminRoleController extends BaseController
 {
-
+	
 	//角色列表 shish 2019.12.9
 	public function actionList()
 	{
 		$list = AdminRoleService::getRoleList($this->merchantId);
 		util::success($list);
 	}
+	
+	//添加员工 shish 2019.12.10
+	public function actionAdd()
+	{
+		$post = Yii::$app->request->post();
+		$post['merchantId'] = $this->merchantId;
+		$respond = AdminRoleService::addRole($post);
+		util::success($respond);
+	}
 
 }

app/business/controllers/BaseController.php

@@ -125,7 +125,7 @@ class BaseController extends PublicController
 		$id = Yii::$app->request->get('id');
 		$service = $this->service;
 		$service::deleteById($id);
-		util::success([], '删除成功');
+		util::ok('删除成功');
 	}
 	
 }

app/business/controllers/GoodsController.php

@@ -86,7 +86,7 @@ class GoodsController extends BaseController
 	public function actionShortUrl()
 	{
 		$id = Yii::$app->request->get('id');
-		util::success(['shortUrl' => 'https://w.url.cn/s/A8iQlgr']);
+		util::success(['shortUrl' => 'https://w.url.cn/s/A8iQl2r']);
 	}
 	
 	//商品说明 shish 2019.12.8

biz/admin/classes/AdminRoleClass.php

@@ -8,9 +8,9 @@ use biz\base\classes\BaseClass;
 
 class AdminRoleClass extends BaseClass
 {
-
+	
 	public static $baseFile = '\biz\admin\models\AdminRole';
-
+	
 	//验证权限 shish 2019.12.9
 	public static function valid($role, $merchantId)
 	{
@@ -21,5 +21,31 @@ class AdminRoleClass extends BaseClass
 			util::fail('没有权限操作');
 		}
 	}
+	
+	//添加角色 shish 2019.12.10
+	public function addRole($data)
+	{
+		$roleName = $data['roleName'];
+		$merchantId = $data['merchantId'];
+		$nameList = self::getNameList($merchantId);
+		if (in_array($roleName, $nameList)) {
+			util::fail('角色已经存在');
+		}
+		$data['addTime'] = time();
+		return self::add($data);
+	}
 
+	//获取商家角色列表 shish 2019.12.10
+	public static function getRoleList($merchantId)
+	{
+		return self::getAllByCondition(['merchantId' => $merchantId], null, '*');
+	}
+	
+	//获取商家所有的角色名称 shish 2019.12.10
+	public static function getNameList($merchantId)
+	{
+		$list = self::getRoleList($merchantId);
+		return !empty($list) ? array_column($list, 'roleName') : [];
+	}
+	
 }

biz/admin/services/AdminRoleService.php

@@ -15,11 +15,17 @@ class AdminRoleService extends BaseService
 	{
 		return AdminRoleClass::valid($role, $merchantId);
 	}
-
+	
 	//角色列表 shish 2019.12.9
 	public static function getRoleList($merchantId)
 	{
-		return AdminRoleClass::getAllByCondition(['merchantId' => $merchantId],null,'*');
+		return AdminRoleClass::getRoleList($merchantId);
 	}
-
+	
+	//添加角色 shish 2019.12.10
+	public static function addRole($data)
+	{
+		return AdminRoleClass::addRole($data);
+	}
+	
 }