Browse Source

申请会员

shish 6 years ago
parent
commit
3cf8e1aba5

+ 11 - 7
app/client/controllers/InformUserController.php

@@ -19,19 +19,23 @@ class InformUserController extends BaseController
 	{
 		$get = Yii::$app->request->get();
 		$type = isset($get['type']) ? $get['type'] : 0;
-		
-		$code = stringUtil::getRandNum(5);
-		$msg = "您的验证码:" . $code . "。为了你的帐号安全,验证码不要告诉别人哦";
+		$mobile = isset($get['mobile']) ? $get['mobile'] : 0;
+		if (stringUtil::isMobieNumber($mobile) == false) {
+			util::fail('请填写手机号');
+		}
+
+		$code = stringUtil::getRandNum(4);
+		$msg = "您的验证码:" . $code . "。为了您的帐号安全,验证码不要告诉别人哦";
 		$userId = $this->userId;
-		
-		if ($type == 0) {
+
+		if ($type == 1) {
 			//设置申请会员验证码的缓存
 			SmsService::setApplyMemberCode($userId, $code);
 		} else {
 			util::fail('发送失败');
 		}
-
 		sms::send($mobile, $msg, $this->merchant);
+		util::ok('已发送');
 	}
-	
+
 }

+ 1 - 3
app/client/controllers/UserController.php

@@ -153,9 +153,7 @@ class UserController extends BaseController
 		if (!empty($user)) {
 			util::fail('手机号已经注册过了');
 		}
-		$update['isMember'] = 1;
-		UserService::updateById($userId, $update);
-		UserAssetService::updateByUserId($userId, ['isMember' => 1]);
+		UserService::upgradeToMember($userId,$this->merchantId, $update);
 		util::ok('注册成功');
 	}
 

+ 1 - 1
biz/MQ/services/SmsService.php

@@ -18,7 +18,7 @@ class SmsService extends BaseService
 		$smsTypeList = SmsClass::$smsType;
 		$applyMemberType = $smsTypeList['applyMember']['sign'];
 		$key = 'SMS_' . $applyMemberType . '_' . $userId;
-		Yii::$app->redis->executeCommand('SETEX', [$key, 300, $num]);
+		Yii::$app->redis->executeCommand('SETEX', [$key, 300, $code]);
 	}
 
 	//取申请会员的验证码 shish 2019.12.18

+ 3 - 8
biz/user/services/UserService.php

@@ -237,23 +237,18 @@ class UserService extends BaseService
 		}
 		return $info;
 	}
-	
+
 	//升级成为会员,并更新用户相关信息 shish 2019.9.7
 	public static function upgradeToMember($userId, $merchantId, $data = [])
 	{
-		validate::easyCheck(['mobile'], $data);
 		$data['isMember'] = 1;
 		self::updateById($userId, $data);
 		UserAssetService::updateByUserId($userId, ['isMember' => 1]);
-		
+
 		/**会员数+1**/
 		MerchantAssetService::addMemberNum($merchantId);
-		
-		/**确认有没老客户资产**/
-		$mobile = $data['mobile'];
-		UserOldDataService::import($merchantId, $userId, $mobile);
 	}
-	
+
 	//取消关注 shish 2019.9.8
 	public static function unFocus($userId, $merchantId)
 	{

+ 1 - 1
common/components/sms.php

@@ -3,7 +3,7 @@
 namespace common\components;
 
 use biz\weixin\services\WxOpenService;
-
+use Yii;
 /**
  * 短信接口
  */