员工

app/business/controllers/AdminController.php

@@ -20,4 +20,18 @@ class AdminController extends BaseController
 		util::success($auth);
 	}
 
+	//员工列表 shish 2019.12.9
+	public function actionList()
+	{
+		$get = Yii::$app->request->get();
+		$where['merchantId'] = $this->merchantId;
+		$list = AdminService::getAdminList($where);
+		util::success($list);
+	}
+
+	public function actionAdd()
+	{
+	
+	}
+
 }

app/business/controllers/BaseController.php

@@ -52,7 +52,8 @@ class BaseController extends PublicController
 		if (empty($admin)) {
 			util::fail('没有找到管理员');
 		}
-		$merchantId = AdminToMerchantService::getDefaultMerchant($adminId);
+		$merchantId = 12358;
+		//$merchantId = AdminToMerchantService::getDefaultMerchant($adminId);
 		if (empty($merchantId)) {
 			util::fail('没有找到商家信息');
 		}

biz/admin/classes/AdminClass.php

@@ -2,14 +2,16 @@
 
 namespace biz\admin\classes;
 
+use biz\admin\services\AdminRoleService;
+use biz\user\services\UserService;
 use Yii;
 use biz\base\classes\BaseClass;
 
 class AdminClass extends BaseClass
 {
-
+	
 	public static $baseFile = '\biz\admin\models\Admin';
-
+	
 	//收益通知人
 	public static $noticeAdmin = [
 		//国兰
@@ -18,4 +20,23 @@ class AdminClass extends BaseClass
 		'wx84d95afcb7b594eb' => ['oTFbYvsjwgVwXggwtlM2ESAKwuN8', 'oTFbYvqP6qwdCCkdFB9GYnlzDIUg'],
 	];
 
+	//组合员工基本信息 shish 2019.12.9
+	public static function groupAdminBaseInfo($list)
+	{
+		$roleIdList = array_column($list, 'roleId');
+		$userIdList = array_column($list, 'userId');
+		$userInfo = UserService::getByIds($userIdList, null, 'id');
+		$roleInfo = AdminRoleService::getByIds($roleIdList, null, 'id');
+		$prefix = Yii::$app->params['imgUrl'];
+		foreach ($list as $key => $val) {
+			$roleId = $val['roleId'];
+			$list[$key]['roleName'] = isset($roleInfo[$roleId]['roleName']) ? $roleInfo[$roleId]['roleName'] : '';
+			$userId = $val['userId'];
+			$list[$key]['nickName'] = isset($userInfo[$userId]['userName']) ? $userInfo[$userId]['userName'] : '';
+			$list[$key]['avatarUrl'] = isset($userInfo[$userId]['avatar']) ? $prefix . $userInfo[$userId]['avatar'] : '';
+			$list[$key]['mobile'] = isset($userInfo[$userId]['mobile']) ? $prefix . $userInfo[$userId]['mobile'] : '';
+		}
+		return $list;
+	}
+
 }

biz/admin/services/AdminService.php

@@ -79,4 +79,16 @@ class AdminService extends BaseService
 		return [['endId' => 1, 'endName' => '零售', 'frontUrl' => $front, 'backUrl' => []]];
 	}
 	
+	//员工列表 shish 2019.12.9
+	public static function getAdminList($where)
+	{
+		$data = AdminClass::getList('*', $where, 'addTime DESC');
+		$list = isset($data['list']) && !empty($data['list']) ? $data['list'] : [];
+		if (empty($list)) {
+			return $data;
+		}
+		$data['list'] = AdminClass::groupAdminBaseInfo($list);
+		return $data;
+	}
+	
 }

sql.txt

@@ -7,6 +7,22 @@ ALTER TABLE xhAdmin MODIFY `status` TINYINT NOT NULL DEFAULT 1 COMMENT '状态 0
 ALTER TABLE xhAdmin ADD merchantId INT NOT NULL DEFAULT 0 COMMENT '商家id' AFTER `roleId`;
 DROP TABLE IF EXISTS `xhAdminToMerchant`;
 ALTER TABLE xhAdmin ADD userId INT NOT NULL DEFAULT 0 COMMENT '员工关联的userId' AFTER merchantId;
+ALTER TABLE xhAdmin ADD `addTime` INT NOT NULL DEFAULT 0 COMMENT '添加时间' AFTER `status`;
+ALTER TABLE xhAdmin DROP COLUMN `createTime`;
+ALTER TABLE xhAdmin DROP COLUMN `updateTime`;
+ALTER TABLE xhAdmin DROP COLUMN `province`;
+ALTER TABLE xhAdmin DROP COLUMN `city`;
+ALTER TABLE xhAdmin DROP COLUMN `dist`;
+ALTER TABLE xhAdmin DROP COLUMN `address`;
+ALTER TABLE xhAdmin DROP COLUMN `addLong`;
+ALTER TABLE xhAdmin DROP COLUMN `addLat`;
+ALTER TABLE xhAdmin DROP COLUMN `addPrecision`;
+ALTER TABLE xhAdmin ADD incomeNotice TINYINT NOT NULL DEFAULT 0 COMMENT '收入通知 0不需要 1需要' AFTER `currentShopId`;
+ALTER TABLE xhAdminRole ADD `addTime` INT NOT NULL DEFAULT 0 COMMENT '添加时间' AFTER `merchantId`;
+ALTER TABLE xhAdminRole DROP COLUMN `createTime`;
+ALTER TABLE xhAdminRole DROP COLUMN `updateTime`;
+ALTER TABLE xhAdmin DROP COLUMN `avatar`;
+ALTER TABLE xhAdmin ADD loginTime INT NOT NULL DEFAULT 0 COMMENT '最后登陆时间' AFTER `status`;
 
 2019.12.8 23：06 shish 商品设置
 ALTER TABLE xhGoodsSetting DROP COLUMN `startRiseTime`;