合并店长后台添加的客户

biz/user/classes/UserClass.php

@@ -375,9 +375,9 @@ class UserClass extends BaseClass
 					UserAssetClass::updateByUserId($retainUserId, $addData);
 				}
 			}
-			
+
 			//删除用户
-			$clearData = ['openId' => '', 'miniOpenId' => '', 'unionId' => '', 'alipayId' => '', 'merchantId' => 0];
+			$clearData = ['openId' => '', 'miniOpenId' => '', 'unionId' => '', 'alipayId' => '', 'merchantId' => 0, 'mobile' => ''];
 			self::updateById($delUserId, $clearData);
 			UserAssetClass::updateByUserId($delUserId, ['merchantId' => 0]);
 			//如果有支付宝信息则清除支付宝用户
@@ -533,7 +533,7 @@ class UserClass extends BaseClass
 			default:
 				throw new \Exception('未知来源的用户');
 		}
-
+		
 		//支付宝暂时获取不到很多客户信息不进行更新
 		if ($source == $userSource['alipay']['name']) {
 			if (!empty($user)) {

biz/user/services/UserService.php

@@ -146,7 +146,7 @@ class UserService extends BaseService
 			self::updateById($userId, ['visitTime' => $time]);
 		}
 	}
-
+	
 	//注册成为普通会员（非VIP），并更新用户相关信息 shish 2019.9.7
 	public static function becomeMember($user, $merchant, $data)
 	{
@@ -156,10 +156,22 @@ class UserService extends BaseService
 		//注意成为会员和关注公众号时要去检查是否符合发优惠券条件
 		$userAsset = UserAssetClass::getByUserId($userId);
 		CouponAssetClass::giveCoupon($user, $merchant, $userAsset);
+		
+		//合并店长后台添加的客户
+		$mobile = isset($data['mobile']) ? $data['mobile'] : '';
+		if (!empty($mobile)) {
+			$hasUser = UserClass::getByCondition(['merchantId' => $merchantId, 'mobile' => $mobile]);
+			$userSource = UserClass::$userSourceId;
+			$systemId = $userSource['system']['id'];
+			if (!empty($hasUser) && $hasUser['sourceType'] == $systemId) {
+				UserClass::mergeUser($hasUser, $user);
+			}
+		}
+
 		//增加会员数
 		MerchantAssetService::addMemberNum($merchantId);
 	}
-
+	
 	//取消关注 shish 2019.9.8
 	public static function unFocus($userId, $merchantId)
 	{
@@ -213,7 +225,7 @@ class UserService extends BaseService
 		//merchantId $source $realName $member $growth $balance $mobile
 		//必传参数
 		validate::easyCheck(['merchantId', 'mobile'], $data);
-
+		
 		$merchantId = $data['merchantId'];
 		$source = 'system';
 		$mobile = $data['mobile'];
@@ -249,11 +261,11 @@ class UserService extends BaseService
 		UserIntegralService::increaseToUpgrade(0, $growth, 0, $userId, $merchantId, $extend);
 		return $user;
 	}
-
+	
 	//合并用户 shish 2020.5.12
 	public static function mergeUser($delUser, $retainUser)
 	{
 		return UserClass::mergeUser($delUser, $retainUser);
 	}
-
+	
 }