|
|
@@ -86,7 +86,7 @@ class MerchantClass extends BaseClass
|
|
|
$adminId = $data['adminId'];
|
|
|
$merchantId = $merchant['id'];
|
|
|
$mobile = $data['mobile'];
|
|
|
-
|
|
|
+echo 'adminId:'.$adminId.' ';
|
|
|
//生成商家资产
|
|
|
$assetData = [
|
|
|
'balance' => 0,
|
|
|
@@ -173,7 +173,7 @@ class MerchantClass extends BaseClass
|
|
|
$roleReturn = AdminRoleClass::addAdminRole(['roleName' => '老板', 'merchantId' => $merchantId, 'auth' => '*']);
|
|
|
$roleId = $roleReturn['id'];
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
//创建管理员
|
|
|
$adminShop = AdminShopClass::getByCondition(['shopId' => $shopId, 'adminId' => $adminId]);
|
|
|
if (empty($adminShop)) {
|
|
|
@@ -182,8 +182,16 @@ class MerchantClass extends BaseClass
|
|
|
'confirmPassword' => password_hash($mobile, PASSWORD_BCRYPT),
|
|
|
];
|
|
|
AdminClass::updateById($adminId, $adminData);
|
|
|
-
|
|
|
- $shopData = ['adminId' => $adminId, 'shopId' => $shopId, 'merchantId' => $merchantId, 'remind' => 1, 'roleId' => $roleId, 'default' => 1, 'addTime' => $time];
|
|
|
+ $shopData = [
|
|
|
+ 'adminId' => $adminId,
|
|
|
+ 'shopId' => $shopId,
|
|
|
+ 'merchantId' => $merchantId,
|
|
|
+ 'remind' => 1,
|
|
|
+ 'roleId' => $roleId,
|
|
|
+ 'default' => 1,
|
|
|
+ 'addTime' => $time,
|
|
|
+ ];
|
|
|
+ print_r($shopData);
|
|
|
AdminShopClass::add($shopData);
|
|
|
}
|
|
|
|
shish