shish 6 жил өмнө
parent
commit
6c93c1d43f

+ 27 - 31
biz/merchant/services/MerchantService.php

@@ -19,9 +19,9 @@ use Yii;
 
 class MerchantService extends BaseService
 {
-
+	
 	public static $baseFile = '\biz\merchant\classes\MerchantClass';
-
+	
 	//商家在业务端的权限 shish 2019.11.25
 	public static function getAuthIdList($merchantId, $endId)
 	{
@@ -132,14 +132,14 @@ class MerchantService extends BaseService
 	{
 		return MerchantClass::getMerchantById($id);
 	}
-	
+
 	public static function getCurrentSetId($id)
 	{
 		return MerchantClass::getCurrentSetId($id);
 	}
-	
+
 	//开店公众号授权之后初始化 shish 2020.2.7
-	public static function authInit($data)
+	public static function openShopInit($data)
 	{
 		$merchantId = $data['merchantId'];
 		$platform = $data['platform'];
@@ -152,48 +152,44 @@ class MerchantService extends BaseService
 		$connection = Yii::$app->db;//事务处理
 		$transaction = $connection->beginTransaction();
 		try {
-			//平台使用的公众号
-			if ($platform == 1) {
-	
-			}
-
+			
 			xhWxMenuService::applyInit($merchant);
-
+			
 			//商品、分类、首页幻灯片、门店图片
-
-			//创建管理员
-
+			
 			//初始化微信菜单
 			xhWxMenuService::applyInit($merchant);
 			//微信客户初始化
 			$return = UserService::syncWxAllUser($merchantId);
 			$totalNum = isset($return['total']) ? $return['total'] : 0;
 			MerchantAssetClass::updateByCondition(['merchantId' => $merchantId, ['totalFans' => $totalNum, 'totalUser' => $totalNum]]);
-
+			
 			//创建门店
 			$shopData = ['shopName' => $merchant['merchantName'], 'merchantName' => $merchant['merchantName'], 'merchantId' => $merchantId, 'addTime' => $time, 'createTime' => $date, 'updateTime' => $date];
 			$shopReturn = ShopClass::addShop($shopData);
 			$shopId = $shopReturn['id'];
-
+			
 			//创建管理员角色
 			AdminRoleClass::addAdminRole(['roleName' => '店员', 'merchantId' => $merchantId, 'auth' => '*']);
 			$roleReturn = AdminRoleClass::addAdminRole(['roleName' => '老板', 'merchantId' => $merchantId, 'auth' => '*']);
 			$roleId = $roleReturn['id'];
-
-			//创建管理员
-			$adminData = [
-				'mobile' => 15280215347,
-				'adminName' => '石少华',
-				'password' => password_hash('123456', PASSWORD_BCRYPT),
-				'confirmPassword' => password_hash('123456', PASSWORD_BCRYPT),
-				'merchantId' => $merchantId,
-				'roleId' => $roleId,
-				'defaultShopId' => $shopId,
-				'currentShopId' => $shopId,
-				'super' => 1,
-				'addTime' => $time,
-			];
-			AdminClass::addAdmin($adminData);
+			
+			if ($platform == 1) {
+				//平台使用的公众号创建指定管理员
+				$adminData = [
+					'mobile' => 15280215347,
+					'adminName' => '石少华',
+					'password' => password_hash('123456', PASSWORD_BCRYPT),
+					'confirmPassword' => password_hash('123456', PASSWORD_BCRYPT),
+					'merchantId' => $merchantId,
+					'roleId' => $roleId,
+					'defaultShopId' => $shopId,
+					'currentShopId' => $shopId,
+					'super' => 1,
+					'addTime' => $time,
+				];
+				AdminClass::addAdmin($adminData);
+			}
 		} catch (Exception $e) {
 			$transaction->rollBack();
 		}

+ 1 - 1
common/components/rabbitmq/consumer/openShopInitConsumer.php

@@ -22,7 +22,7 @@ class openShopInitConsumer implements ConsumerInterface
 		$data = unserialize($msg->body);
 		$merchantId = isset($data['merchantId']) ? $data['merchantId'] : 0;
 		$platform = isset($data['platform']) ? $data['platform'] : 0;
-		$return = MerchantService::authInit(['merchantId'=>$merchantId,'platform'=>$platform]);
+		$return = MerchantService::setUpInit(['merchantId'=>$merchantId,'platform'=>$platform]);
 		if (empty($merchantId)) {
 			return ConsumerInterface::MSG_ACK;
 		}

+ 9 - 2
console/controllers/InitController.php

@@ -2,6 +2,7 @@
 
 namespace console\controllers;
 
+use biz\merchant\services\MerchantService;
 use biz\user\services\UserService;
 use common\services\xhAdminService;
 use common\services\xhMerchantAssetService;
@@ -21,6 +22,12 @@ use common\services\xhInitService;
 class InitController extends Controller
 {
 
+	//开店初始化 shish 2020.2.8
+	public function actionOpenShopInit()
+	{
+		MerchantService::openShopInit(['merchantId' => 12362, 'platform' => 1]);
+	}
+	
 	//哪些东西开店时需要初始化!!!!!
 	public function actionFirstInit()
 	{
@@ -28,9 +35,9 @@ class InitController extends Controller
 		//初始化微信菜单
 		//模板消息
 	}
-
+	
 	//二次初始化 shish 2020.1.19
-	public function actionSecondInit($id=0)
+	public function actionSecondInit($id = 0)
 	{
 		$merchant = xhMerchantService::getById($id);
 		if (empty($merchant)) {