|
|
@@ -22,7 +22,7 @@ class AdminShopService extends BaseService
|
|
|
{
|
|
|
|
|
|
public static $baseFile = '\biz\admin\classes\AdminShopClass';
|
|
|
-
|
|
|
+
|
|
|
///创建管理员生成小程序 shish 2020.4.17
|
|
|
public static function prepareBindAdmin($data)
|
|
|
{
|
|
|
@@ -36,7 +36,7 @@ class AdminShopService extends BaseService
|
|
|
$imgUrl = miniUtil::generateUnlimitedMiniCode($merchant, $page, $scene, $isOpen);
|
|
|
return ['miniCode' => $imgUrl];
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
public static function generateAdmin($data)
|
|
|
{
|
|
|
$recommendAdminId = isset($data['recommendAdminId']) ? $data['recommendAdminId'] : 0;
|
|
|
@@ -61,8 +61,11 @@ class AdminShopService extends BaseService
|
|
|
util::fail('添加管理员时请选择角色');
|
|
|
}
|
|
|
$admin = AdminClass::getById($adminId);
|
|
|
+ if (empty($admin)) {
|
|
|
+ util::fail('没有找到管理员信息');
|
|
|
+ }
|
|
|
if (isset($admin['subscribe']) == false || $admin['subscribe'] != 1) {
|
|
|
- util::fail('请关注公众号');
|
|
|
+ util::fail('请关注公众号' + $admin['id']);
|
|
|
}
|
|
|
$roleId = $bindData['roleId'];
|
|
|
$remind = isset($bindData['remind']) ? $bindData['remind'] : 0;
|
|
|
@@ -113,7 +116,7 @@ class AdminShopService extends BaseService
|
|
|
$data['list'] = $list;
|
|
|
return $data;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
//获取要通知的管理员 shish 2020.4.28
|
|
|
public static function getNoticeAdminList($shopId)
|
|
|
{
|
shish