只要注册了手机号就发券

biz/coupon/classes/CouponAssetClass.php

@@ -28,7 +28,7 @@ class CouponAssetClass extends BaseClass
 		//商家开启注册会员送券
 		if (isset($asset['switch']) && $asset['switch'] == 1) {
 			//客户没有消费过 且没有领过优惠券 且登陆了手机号 且关注了公众号
-			if ($userAsset['getCouponNum'] == 0 && $userAsset['totalBuyNum'] == 0 && $user['subscribe'] == 1 && !empty($user['mobile'])) {
+			if ($userAsset['getCouponNum'] == 0 && $userAsset['totalBuyNum'] == 0 && !empty($user['mobile'])) {
 				$duration = $asset['duration'];
 				$deadline = $time + $duration * 86400;
 				$amount = $asset['amount'];

biz/user/services/UserService.php

@@ -157,19 +157,20 @@ class UserService extends BaseService
 			$hasUser = UserClass::getByCondition(['merchantId' => $merchantId, 'mobile' => $mobile]);
 			$userSource = UserClass::$userSourceId;
 			$systemId = $userSource['system']['id'];
-			Yii::info($hasUser['sourceType'].' -- '.$systemId);
+			Yii::info($hasUser['sourceType'] . ' -- ' . $systemId);
 			if (!empty($hasUser) && $hasUser['sourceType'] == $systemId) {
 				UserClass::mergeUser($hasUser, $user);
 			}
 		}
-
+		
 		//合并之后再更新信息
 		$userId = $user['id'];
 		UserClass::updateById($userId, $data);
 		//注意成为会员和关注公众号时要去检查是否符合发优惠券条件
 		$userAsset = UserAssetClass::getByUserId($userId);
+		$user['mobile'] = $mobile;
 		CouponAssetClass::giveCoupon($user, $merchant, $userAsset);
-
+		
 		//增加会员数
 		MerchantAssetService::addMemberNum($merchantId);
 	}

console/controllers/UpgradeController.php

@@ -1475,11 +1475,9 @@ UPDATE `xhUserAsset` SET `member`=0 WHERE `member`=-1;";
 		$list = MerchantService::getAllByCondition(['id>' => 0], null, '*');
 		if (!empty($list)) {
 			foreach ($list as $key => $merchant) {
-				
 				//更新商家的logo和二维码
 				$id = $merchant['id'];
 				$this->actionUpdateImg($id);
-				
 			}
 		}