|
|
@@ -151,6 +151,7 @@ class UserService extends BaseService
|
|
|
public static function becomeMember($user, $merchant, $data)
|
|
|
{
|
|
|
//合并店长后台添加的客户
|
|
|
+ $merchantId = $merchant['id'];
|
|
|
$mobile = isset($data['mobile']) ? $data['mobile'] : '';
|
|
|
if (!empty($mobile)) {
|
|
|
$hasUser = UserClass::getByCondition(['merchantId' => $merchantId, 'mobile' => $mobile]);
|
|
|
@@ -164,7 +165,6 @@ class UserService extends BaseService
|
|
|
|
|
|
//合并之后再更新信息
|
|
|
$userId = $user['id'];
|
|
|
- $merchantId = $merchant['id'];
|
|
|
UserClass::updateById($userId, $data);
|
|
|
//注意成为会员和关注公众号时要去检查是否符合发优惠券条件
|
|
|
$userAsset = UserAssetClass::getByUserId($userId);
|
shish