审核通过后的优化

biz/merchant/classes/MerchantClass.php

@@ -4,6 +4,7 @@ namespace biz\merchant\classes;
 
 use biz\ad\classes\AdClass;
 use biz\admin\classes\AdminRoleClass;
+use biz\admin\classes\AdminShopClass;
 use biz\coupon\classes\CouponAssetClass;
 use biz\goods\classes\CategoryClass;
 use biz\goods\classes\GoodsSettingClass;
@@ -64,16 +65,17 @@ class MerchantClass extends BaseClass
 		$data['status'] = 0;//待审核
 		$data['createTime'] = $date;
 		$data['updateTime'] = $date;
-		$data['shopLat'] = (string)0;
-		$data['shopLong'] = (string)0;
+		$data['shopLat'] = isset($data['lat']) ? $data['lat'] : (string)0;
+		$data['shopLong'] = isset($data['long']) ? $data['long'] : (string)0;
 		$data['shopPrecision'] = (string)0;
 		$data['adminId'] = 0;
 		$data['wxToken'] = stringUtil::buildWxToken(0);
 		$data['shopPhotoList'] = isset($data['shopPhotoList']) ? $data['shopPhotoList'] : '';
 		$data['merchantName'] = isset($data['merchantName']) ? $data['merchantName'] : '';
-		$data['shopProvince'] = isset($data['shopProvince']) ? $data['shopProvince'] : '';
-		$data['shopCity'] = isset($data['shopCity']) ? $data['shopCity'] : '';
-		$data['shopDist'] = isset($data['shopDist']) ? $data['shopDist'] : '';
+		$data['shopProvince'] = isset($data['province']) ? $data['province'] : '';
+		$data['shopCity'] = isset($data['city']) ? $data['city'] : '';
+		$data['shopDist'] = isset($data['dist']) ? $data['dist'] : '';
+		$data['shopAddress'] = isset($data['address']) ? $data['address'] : '';
 		$data['alipayAccount'] = isset($data['alipayAccount']) ? $data['alipayAccount'] : '';
 		$data['alipayAccountName'] = isset($data['alipayAccountName']) ? $data['alipayAccountName'] : '';
 		//默认设置为代理商
@@ -81,7 +83,7 @@ class MerchantClass extends BaseClass
 		//申请表的id去掉，商家有自己的id
 		unset($data['id']);
 		$merchant = self::add($data);
-
+		$adminId = $data['adminId'];
 		$merchantId = $merchant['id'];
 		$mobile = $data['mobile'];
 		
@@ -130,9 +132,9 @@ class MerchantClass extends BaseClass
 			'updateTime' => $date,
 		];
 		MerchantExtendClass::add($extendData);
-
-		MerchantInitClass::add(['merchantId'=>$merchantId]);
-
+		
+		MerchantInitClass::add(['merchantId' => $merchantId]);
+		
 		//商家商品配置信息
 		$setData = [
 			'merchantId' => $merchantId,
@@ -141,11 +143,10 @@ class MerchantClass extends BaseClass
 			'addTime' => time(),
 		];
 		GoodsSettingClass::add($setData);
-
+		
 		//创建门店
 		$shopData = [
 			'shopName' => $merchant['merchantName'],
-			'merchantName' => $merchant['merchantName'],
 			'merchantId' => $merchantId,
 			'addTime' => $time,
 			'createTime' => $date,
@@ -166,7 +167,7 @@ class MerchantClass extends BaseClass
 		MerchantClass::updateById($merchantId, ['defaultShopId' => $shopId]);
 		
 		//创建管理员角色
-		$hasRole = AdminRoleClass::getByCondition(['merchantId' => $merchantId, 'roleName' => '老板']);
+		$hasRole = AdminRoleClass::getByCondition(['merchantId' => $merchantId]);
 		if (empty($hasRole)) {
 			AdminRoleClass::addAdminRole(['roleName' => '店员', 'merchantId' => $merchantId, 'auth' => '*']);
 			$roleReturn = AdminRoleClass::addAdminRole(['roleName' => '老板', 'merchantId' => $merchantId, 'auth' => '*']);
@@ -174,21 +175,17 @@ class MerchantClass extends BaseClass
 		}
 		
 		//创建管理员
+		$adminShop = AdminShopClass::getByCondition(['shopId' => $shopId, 'adminId' => $adminId]);
 		$admin = AdminClass::getByCondition(['merchantId' => $merchantId, 'mobile' => $mobile]);
-		if (empty($admin)) {
+		if (empty($adminShop)) {
 			$adminData = [
-				'mobile' => $mobile,
-				'adminName' => $data['adminName'],
-				'password' => password_hash('123456', PASSWORD_BCRYPT),
+				'password' => password_hash($mobile, PASSWORD_BCRYPT),
 				'confirmPassword' => password_hash($mobile, PASSWORD_BCRYPT),
-				'merchantId' => $merchantId,
-				'roleId' => $roleId,
-				'defaultShopId' => $shopId,
-				'currentShopId' => $shopId,
-				'super' => 1,
-				'addTime' => $time,
 			];
-			AdminClass::addAdmin($adminData);
+			AdminClass::updateById($adminId, $adminData);
+			
+			$shopData = ['adminId' => $adminId, 'shopId' => $shopId, 'merchantId' => $merchantId, 'remind' => 1, 'roleId' => $roleId, 'default' => 1, 'addTime' => $time];
+			AdminShopClass::add($shopData);
 		}
 
 		//商品和分类初始化
@@ -200,8 +197,6 @@ class MerchantClass extends BaseClass
 		//优惠券资产与配置信息初始化
 		CouponAssetClass::add(['merchantId' => $merchantId, 'switch' => 1]);
 
-		//微信支付和支付宝支付
-
 		return $merchant;
 	}
 	

biz/saas/services/ApplyService.php

@@ -2,6 +2,7 @@
 
 namespace biz\saas\services;
 
+use biz\admin\classes\AdminClass;
 use biz\base\services\BaseService;
 use biz\merchant\classes\MerchantClass;
 use biz\merchant\services\MerchantService;
@@ -56,16 +57,16 @@ 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'] : '';
+		$adminId = $apply['adminId'];
+		$admin = AdminClass::getById($adminId);
+		$apply['adminName'] = isset($admin['adminName']) ? $admin['adminName'] : '';
 		return MerchantClass::generateMerchant($apply);
 	}
-
+	
 	//新增推荐 shish 2020.2.27
 	public static function addApply($data)
 	{
 		return ApplyClass::addApply($data);
 	}
-
+	
 }