注册成为普通会员

app/mall/controllers/UserController.php

@@ -73,7 +73,6 @@ class UserController extends BaseController
 		$user = $this->user;
 		if (!empty($user) && !empty($user['mobile'])) {
 			$userId = $user['id'];
-			UserAssetService::updateByUserId($userId, ['member' => 0]);
 			util::success(['mobile' => $user['mobile']]);
 		}
 		$cacheKey = 'MALL_MINI_SESSION_KEY_' . $miniOpenId;
@@ -95,7 +94,7 @@ class UserController extends BaseController
 			util::fail('没有获取手机号，请重试');
 		}
 		$userId = $user['id'];
-		UserService::becomeVip($user, $merchant, ['mobile' => $mobile]);
+		UserService::becomeMember($user, $merchant, ['mobile' => $mobile]);
 		util::success(['mobile' => $mobile]);
 	}
 	
@@ -159,7 +158,7 @@ class UserController extends BaseController
 			util::fail('手机号已经注册过了');
 		}
 		$update['mobile'] = $mobile;
-		UserService::becomeVip($this->user, $this->merchant, $update);
+		UserService::becomeMember($this->user, $this->merchant, $update);
 		util::complete('注册成功');
 	}
 	

biz/user/services/UserService.php

@@ -146,26 +146,20 @@ class UserService extends BaseService
 			self::updateById($userId, ['visitTime' => $time]);
 		}
 	}
-	
-	//注册成为会员，并更新用户相关信息 shish 2019.9.7
-	public static function becomeVip($user, $merchant, $data)
+
+	//注册成为普通会员（非VIP），并更新用户相关信息 shish 2019.9.7
+	public static function becomeMember($user, $merchant, $data)
 	{
-		if (isset($user['member']) && $user['member'] == -1) {
-			$data['member'] = 0;
-		}
 		$userId = $user['id'];
 		$merchantId = $merchant['id'];
 		UserClass::updateById($userId, $data);
-		if (isset($user['member']) && $user['member'] == -1) {
-			UserAssetClass::updateByCondition(['userId' => $userId], ['member' => 0]);
-		}
 		//注意成为会员和关注公众号时要去检查是否符合发优惠券条件
 		$userAsset = UserAssetClass::getByUserId($userId);
 		CouponAssetClass::giveCoupon($user, $merchant, $userAsset);
 		//增加会员数
 		MerchantAssetService::addMemberNum($merchantId);
 	}
-	
+
 	//取消关注 shish 2019.9.8
 	public static function unFocus($userId, $merchantId)
 	{