发优惠券条件

app/mall/controllers/UserController.php

@@ -92,7 +92,7 @@ class UserController extends BaseController
 		$arr = Json::decode($result);
 		$mobile = isset($arr['purePhoneNumber']) ? $arr['purePhoneNumber'] : '';
 		$userId = $user['id'];
-		UserService::becomeVip($userId, $merchantId, ['mobile' => $mobile]);
+		UserService::becomeVip($user, $merchant, ['mobile' => $mobile]);
 		util::success(['mobile' => $mobile]);
 	}
 	
@@ -156,7 +156,7 @@ class UserController extends BaseController
 			util::fail('手机号已经注册过了');
 		}
 		$update['mobile'] = $mobile;
-		UserService::becomeVip($userId, $this->merchantId, $update);
+		UserService::becomeVip($this->user, $this->merchant, $update);
 		util::complete('注册成功');
 	}
 	

biz/coupon/classes/CouponAssetClass.php

@@ -24,15 +24,11 @@ class CouponAssetClass extends BaseClass
 		$asset = self::getByCondition(['merchantId' => $merchantId]);
 		$time = time();
 		$date = date("Y-m-d H:i:s");
-		echo '<pre>';
-		print_r($userAsset);
-		print_r($user);
-		print_r($asset);
-		
+
 		//商家开启注册会员送券
 		if (isset($asset['switch']) && $asset['switch'] == 1) {
-			//客户没有消费过且没有领过优惠券
-			if ($userAsset['getCouponNum'] == 0 && $userAsset['totalBuyNum'] == 0) {
+			//客户没有消费过 且没有领过优惠券 且登陆了手机号 且关注了公众号
+			if ($userAsset['getCouponNum'] == 0 && $userAsset['totalBuyNum'] == 0 && $user['subscribe'] == 1 && !empty($user['mobile'])) {
 				$duration = $asset['duration'];
 				$deadline = $time + $duration * 86400;
 				$amount = $asset['amount'];

biz/user/services/UserService.php

@@ -143,14 +143,20 @@ class UserService extends BaseService
 	}
 	
 	//注册成为会员，并更新用户相关信息 shish 2019.9.7
-	public static function becomeVip($userId, $merchantId, $data)
+	public static function becomeVip($user, $merchant, $data)
 	{
 		$data['member'] = 0;
+		$userId = $user['id'];
+		$merchantId = $merchant['id'];
 		self::updateById($userId, $data);
 		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)
 	{