管理员名称 商家名称

biz/merchant/classes/MerchantClass.php

@@ -140,16 +140,16 @@ class MerchantClass extends BaseClass
 			'addTime' => $time,
 			'createTime' => $date,
 			'updateTime' => $date,
-			'shopProvince'=> isset($data['shopProvince']) ? $data['shopProvince'] : '',
-			'shopCity'=> isset($data['shopCity']) ? $data['shopCity'] : '',
-			'shopDist'=> isset($data['shopDist']) ? $data['shopDist'] : '',
-			'shopAddress'=> isset($data['shopAddress']) ? $data['shopAddress'] : '',
+			'shopProvince' => isset($data['shopProvince']) ? $data['shopProvince'] : '',
+			'shopCity' => isset($data['shopCity']) ? $data['shopCity'] : '',
+			'shopDist' => isset($data['shopDist']) ? $data['shopDist'] : '',
+			'shopAddress' => isset($data['shopAddress']) ? $data['shopAddress'] : '',
 		];
 		$shopReturn = ShopClass::addShop($shopData);
 		$shopId = $shopReturn['id'];
 		//设置商家默认门店
-		MerchantClass::updateById($merchantId,['defaultShopId' => $shopId]);
-
+		MerchantClass::updateById($merchantId, ['defaultShopId' => $shopId]);
+		
 		//创建管理员角色
 		$hasRole = AdminRoleClass::getByCondition(['merchantId' => $merchantId, 'roleName' => '老板']);
 		if (empty($hasRole)) {
@@ -163,10 +163,10 @@ class MerchantClass extends BaseClass
 		$admin = AdminClass::getByCondition(['merchantId' => $merchantId, 'mobile' => $mobile]);
 		if (empty($admin)) {
 			$adminData = [
-				'mobile' => 15280215347,
-				'adminName' => '石少华',
-				'password' => password_hash('123456', PASSWORD_BCRYPT),
-				'confirmPassword' => password_hash('123456', PASSWORD_BCRYPT),
+				'mobile' => $mobile,
+				'adminName' => $data['adminName'],
+				'password' => password_hash($mobile, PASSWORD_BCRYPT),
+				'confirmPassword' => password_hash($mobile, PASSWORD_BCRYPT),
 				'merchantId' => $merchantId,
 				'roleId' => $roleId,
 				'defaultShopId' => $shopId,

biz/merchant/services/MerchantService.php

@@ -206,16 +206,17 @@ class MerchantService extends BaseService
 		}
 		$data = [
 			'merchantName' => $merchantName,
-			'mobile' => '15280215347',
+			'mobile' => '17189513228',
 			'province' => '福建',
 			'city' => '厦门',
 			'dist' => '思明区',
 			'address' => '上湖社126号',
 			'floor' => '306室',
 			'alipayAccount' => 'shishaohua8879@sina.com',
-			'alipayAccountName' => '石少华'
+			'alipayAccountName' => '石少华',
+			'adminName' => '石头',
 		];
 		return MerchantClass::generateMerchant($data);
 	}
-	
+
 }

biz/saas/services/ApplyService.php

@@ -6,6 +6,7 @@ use biz\base\services\BaseService;
 use biz\merchant\classes\MerchantClass;
 use biz\merchant\services\MerchantService;
 use biz\saas\classes\ApplyClass;
+use biz\user\classes\UserClass;
 use biz\user\services\UserService;
 use common\components\stringUtil;
 use common\components\util;
@@ -46,7 +47,7 @@ class ApplyService extends BaseService
 		$data['list'] = $list;
 		return $data;
 	}
-	
+
 	//审核通过
 	public static function pass($id)
 	{
@@ -55,7 +56,10 @@ class ApplyService extends BaseService
 			util::fail('没有找到申请记录');
 		}
 		$apply['merchantName'] = isset($apply['name']) ? $apply['name'] : '';
+		$userId = $apply['userId'];
+		$user = UserClass::getById($userId);
+		$apply['adminName'] = isset($user['userName']) ? $user['userName'] : '';
 		return MerchantClass::generateMerchant($apply);
 	}
-	
+
 }