申请试用

app/www/controllers/ApplyController.php

@@ -2,6 +2,7 @@
 
 namespace www\controllers;
 
+use biz\saas\classes\ApplyClass;
 use biz\saas\services\ApplyService;
 use biz\saas\services\RegionService;
 use common\components\util;
@@ -46,12 +47,16 @@ class ApplyController extends BaseController
 		$post = Yii::$app->request->post();
 		$rand = rand(0, 1);
 		$data = ['focus' => 1, 'qrCode' => ''];
+		if (isset($post['oldId']) && !empty($post['oldId'])) {
+			$post['introMerchantId'] = $post['oldId'];
+		}
+		ApplyClass::addApply($post);
 		if ($rand == 0) {
 			$data = ['focus' => 0, 'qrCode' => 'https://ss1.bdstatic.com/70cFuXSh_Q1YnxGkpoWK1HF6hhy/it/u=3602624501,870193918&fm=26&gp=0.jpg'];
 		}
 		util::success($data);
 	}
-	
+
 	//申请状态
 	public function actionApplyStatus()
 	{
@@ -59,7 +64,7 @@ class ApplyController extends BaseController
 		$status = -1;
 		util::success(['status' => $status]);
 	}
-
+	
 	//地图相关信息 shish 2020.1.14
 	public function actionRegionRelate()
 	{

biz/saas/classes/ApplyClass.php

@@ -7,7 +7,26 @@ use biz\base\classes\BaseClass;
 
 class ApplyClass extends BaseClass
 {
-
+	
 	public static $baseFile = '\biz\saas\models\Apply';
+	
+	//添加申请 shish 2020.2.10
+	public static function addApply($data)
+	{
+		$mobile = isset($data['mobile']) ? $data['mobile'] : 0;
+		if (stringUtil::isMobile($mobile) == false) {
+			util::fail('请填写手机号');
+		}
+		$apply = self::getByCondition(['mobile' => $mobile]);
+		if (!empty($apply)) {
+			util::fail('您已经申请过了');
+		}
+		$introMerchantId = isset($data['introMerchantId']) ? $data['introMerchantId'] : 0;
+		//有人邀请
+		if (!empty($introMerchantId)) {
+			
+		}
+		self::add($data);
+	}
 
 }

biz/saas/services/ApplyService.php

@@ -25,21 +25,21 @@ class ApplyService extends BaseService
 		$userIdList = array_column($list, 'userId');
 		$user = UserService::getUserByIds($userIdList);
 		//商家信息
-		$oldList = array_column($list, 'oldId');
-		$newIdList = array_column($list, 'newId');
-		$idList = array_merge($newIdList, $oldList);
+		$oldList = array_column($list, 'introMerchantId');
+		$merchantIdList = array_column($list, 'merchantId');
+		$idList = array_merge($merchantIdList, $oldList);
 		$idList = array_unique(array_filter($idList));
 		$merchant = [];
 		if (!empty($idList)) {
 			$merchant = MerchantService::getMerchantByIds($idList);
 		}
-
+		
 		foreach ($list as $key => $val) {
 			$userId = $val['userId'];
-			$oldId = $val['oldId'];
+			$introMerchantId = $val['introMerchantId'];
 			$list[$key]['userName'] = isset($user[$userId]) ? $user[$userId]['userName'] : '';
 			$list[$key]['userAvatar'] = isset($user[$userId]['avatarUrl']) ? $user[$userId]['avatarUrl'] : '';
-			$list[$key]['oldName'] = isset($merchant[$oldId]['merchantName']) ? $merchant[$oldId]['merchantName'] : '';
+			$list[$key]['oldName'] = isset($merchant[$introMerchantId]['merchantName']) ? $merchant[$introMerchantId]['merchantName'] : '';
 		}
 		$data['list'] = $list;
 		return $data;
@@ -51,23 +51,4 @@ class ApplyService extends BaseService
 	
 	}
 	
-	//添加申请 shish 2019.12.23
-	public static function addApply($data)
-	{
-		$mobile = isset($data['mobile']) ? $data['mobile'] : 0;
-		if (stringUtil::isMobile($mobile) == false) {
-			util::fail('请填写手机号');
-		}
-		$apply = ApplyClass::getByCondition(['mobile' => $mobile]);
-		if (!empty($apply)) {
-			util::fail('您已经申请过了');
-		}
-		$oldId = isset($data['oldId']) ? $data['oldId'] : 0;
-		//有人邀请
-		if (!empty($oldId)) {
-		
-		}
-		ApplyClass::add($data);
-	}
-	
 }

console/controllers/UpgradeController.php

@@ -1074,6 +1074,12 @@ ALTER TABLE `xhTMessage` MODIFY `createTime` DATETIME NOT NULL DEFAULT '0000-00-
 ALTER TABLE `xhTMessage` ADD `addTime` INT NOT NULL DEFAULT 0 COMMENT '添加时间' AFTER `templateId`;";
 		Yii::$app->db->createCommand($sql)->execute();
 
+		//申请信息修改
+		$sql = "ALTER TABLE `xhApply` MODIFY `userId` INT NOT NULL DEFAULT 0 COMMENT '平台userId';
+ALTER TABLE `xhApply` CHANGE `oldId` introMerchantId INT NOT NULL DEFAULT 0 COMMENT '花店介绍人';
+ALTER TABLE `xhApply` CHANGE `newId` merchantId INT NOT NULL DEFAULT 0 COMMENT '新花店id；0表示还没审核通过';";
+		Yii::$app->db->createCommand($sql)->execute();
+		
 	}
 	
 	//重新拉取并保存国兰客户的头像和图片 shish 2020.1.12