diff --git a/app/controller/CustomerController.php b/app/controller/CustomerController.php index 0f1e638..b81414f 100644 --- a/app/controller/CustomerController.php +++ b/app/controller/CustomerController.php @@ -555,7 +555,8 @@ class CustomerController { Log::info('send follow start',$request->all()); $user_sn = Util::getParam($request, 'user_sn'); //用户sn - $user_email = Util::getParam($request, 'user_email'); //邮箱 +// $user_email = Util::getParam($request, 'user_email'); //邮箱 + $uid = Util::getParam($request, 'uid'); //邮箱 $sn = Util::getParam($request, 'order_no'); //客户sn验证客户唯一性 $channel_id = Util::getParam($request, 'channel_id'); //渠道 $country_id = Util::getParam($request, 'country_id'); //国家 @@ -570,27 +571,25 @@ class CustomerController if (Util::isEmpty($user_sn)) { return Util::fail([], '用户sn不能为空'); } - if (Util::isEmpty($user_email)) { - return Util::fail([], '用户邮箱不能为空'); - } if (Util::isEmpty($sn)) { return Util::fail([], '客户sn不能为空'); } - $user = UserService::updateSn($user_sn, $user_email); +// $user = UserService::updateSn($user_sn, $user_email); - if(!$user){ - return Util::fail($user, $user_email.'用户不存在'); - } +// if(!$user){ +// return Util::fail($user, $user_email.'用户不存在'); +// } $res = Customer::firstOrCreate( ['sn' => $sn], [ - 'user_id' => $user->id, + 'user_sn' => $user_sn, + 'uid' => $uid, 'channel_id' => $channel_id, 'country_id' => $country_id, 'magnitude' => $magnitude, - 'describe' => $describe, + 'desc_collect' => $describe, 'phone' => $phone, 'email' => $email, 'WhatsApp' => $WhatsApp, diff --git a/app/service/UserService.php b/app/service/UserService.php index b934a91..197021a 100644 --- a/app/service/UserService.php +++ b/app/service/UserService.php @@ -17,7 +17,6 @@ class UserService $user = User::first() ->where('email',$email) ->first(); - return $user; if(!$user){ return false; }