From ed479e026f409377039a78613af7405dff6afaec Mon Sep 17 00:00:00 2001 From: "WIN-C27C5MSVTPO\\16961" <1696136552@qq.com> Date: Thu, 24 Jul 2025 13:42:17 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9B=BD=E5=AE=B6=E7=AD=9B=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controller/AreaController.php | 3 ++- app/controller/CarTypeController.php | 3 ++- app/controller/CustomerController.php | 28 +++++++++++++++++++-------- app/controller/TagGroupController.php | 3 ++- app/controller/UserController.php | 4 +++- app/model/Channel.php | 2 +- app/model/Customer.php | 3 ++- 7 files changed, 32 insertions(+), 14 deletions(-) diff --git a/app/controller/AreaController.php b/app/controller/AreaController.php index 9c05547..d7e802b 100644 --- a/app/controller/AreaController.php +++ b/app/controller/AreaController.php @@ -60,7 +60,8 @@ class AreaController $list = Country::get()->toArray(); $name = 'en_addr'; //$language = $request->user['language']; - $language = 'zh_CN'; + //$language = 'zh_CN'; + $language = $request->language; if($language == 'zh_CN'){ $name = 'cn_addr'; } diff --git a/app/controller/CarTypeController.php b/app/controller/CarTypeController.php index a8442ca..351a5bb 100644 --- a/app/controller/CarTypeController.php +++ b/app/controller/CarTypeController.php @@ -18,7 +18,8 @@ class CarTypeController $list = CarType::getAll(); //$language = $request->user['language']; - $language = 'zh_CN'; + //$language = 'zh_CN'; + $language = $request->language; if($language == 'en'){ foreach ($list as &$value) { $value['name'] = $value['name_en']; diff --git a/app/controller/CustomerController.php b/app/controller/CustomerController.php index dddcedd..f2dda65 100644 --- a/app/controller/CustomerController.php +++ b/app/controller/CustomerController.php @@ -33,7 +33,8 @@ class CustomerController $gradeConstants = Constants::GRADE_EN; //$language = $request->user['language']; - $language = 'zh_CN'; + //$language = 'zh_CN'; + $language = $request->language; if($language == 'zh_CN'){ $gradeConstants = Constants::GRADE; }elseif ($language == 'ru'){ @@ -58,7 +59,8 @@ class CustomerController $grade = []; $magnitudeConstants = Constants::MAGNITUDE_EN; //$language = $request->user['language']; - $language = 'zh_CN'; + //$language = 'zh_CN'; + $language = $request->language; if($language == 'zh_CN'){ $magnitudeConstants = Constants::MAGNITUDE; }elseif ($language == 'ru'){ @@ -83,7 +85,8 @@ class CustomerController $list = Channel::getAll(); //$language = $request->user['language']; - $language = 'zh_CN'; + //$language = 'zh_CN'; + $language = $request->language; if($language != 'zh_CN'){ foreach ($list as &$value) { $value['name'] = $value['name_en']; @@ -147,6 +150,7 @@ class CustomerController $keyword = $request->input('keyword', ''); //follow_last $follow_last = $request->input('follow_last', ''); //最后跟进：1:当天跟进客户，2:近三天跟进客户，3:近七天跟进客户 $tagId = $request->input('tag_id', ''); //打有某个标签的客户 + $countryId = $request->input('country_id', ''); //打有某个标签的客户 $seas = $request->input('seas', ''); //公海客户 $where = []; @@ -161,6 +165,9 @@ class CustomerController }else{ $where[] = ['user_id', $userId]; } + if (!empty($countryId)){ + $where[] = ['country_id', $countryId]; + } //验证权限 // if ($request->user['role'] != 1) { // $where[] =['user_id',$userId] ; @@ -187,12 +194,17 @@ class CustomerController $query = Customer::with('tags')->where($where) ->orderBy('crm_customer.id', 'desc'); if(!empty($tagId)){ -// $query->with(['tags' => function($query) use ($tagId){ + //查询有$tagId 里任意一个标签的客户 +// $query->whereHas('tags', function($query) use ($tagId){ // $query->where('tag.id', $tagId); -// }]); - $query->whereHas('tags', function($query) use ($tagId){ - $query->where('tag.id', $tagId); - }); +// }); + + //查询有$tagId 里所有标签的客户 + foreach ($tagId as $id) { + $query->whereHas('tags', function($query) use ($id){ + $query->where('tag.id', $id); + }); + } } if (!Util::isEmpty($keyword)) { $query->where(function ($query) use ($keyword) { diff --git a/app/controller/TagGroupController.php b/app/controller/TagGroupController.php index e91eb82..c7add6e 100644 --- a/app/controller/TagGroupController.php +++ b/app/controller/TagGroupController.php @@ -17,7 +17,8 @@ class TagGroupController $list = TagGroup::with('tags')->get(); $languageArr = Constants::LANGUAGE; // $language = $request->user['language']; - $language = 'zh_CN'; + //$language = 'zh_CN'; + $language = $request->language; foreach ($list as &$item) { $item['names'] = unserialize($item['names']); if (in_array($language, $languageArr)) { diff --git a/app/controller/UserController.php b/app/controller/UserController.php index a325f4a..c90a478 100644 --- a/app/controller/UserController.php +++ b/app/controller/UserController.php @@ -78,6 +78,7 @@ class UserController unset($result['password']); $result['token'] = $token; // $result['feishu_openid'] = FeishuUser::where('user_id', $userId)->value('open_id'); + $result['feishu_openid'] = $result['openid']??''; if (!Util::isEmpty($language)) { User::where('id', $userId) @@ -243,7 +244,8 @@ class UserController ->first(); $user->toArray(); unset($user->password); - $user['feishu_openid'] = FeishuUser::where('user_id', $userId)->value('open_id'); +// $user['feishu_openid'] = FeishuUser::where('user_id', $userId)->value('open_id'); + $user['feishu_openid'] = $user['openid']??''; $user['country_name'] = Country::where('id', $user['country_id'])->value('cn_addr'); $ossservice = new \app\service\OssService(); $user['avatar_url'] = $user['avatar'] ? $ossservice->generatePrivateUrl($user['avatar']) : ''; diff --git a/app/model/Channel.php b/app/model/Channel.php index 74ee009..c76ffc8 100644 --- a/app/model/Channel.php +++ b/app/model/Channel.php @@ -11,7 +11,7 @@ class Channel extends Model * * @var string */ - protected $table = 'channel'; + protected $table = 'inquiry_channel'; /** * The primary key associated with the table. diff --git a/app/model/Customer.php b/app/model/Customer.php index b0a6e88..81960c4 100644 --- a/app/model/Customer.php +++ b/app/model/Customer.php @@ -68,7 +68,8 @@ class Customer extends Model public static function getCustomer($customer, $request, $tag = false) { //$language = $request->user['language'] ?: 'en'; - $language = 'zh_CN'; + //$language = 'zh_CN'; + $language = $request->language; $customer['grade_txt'] = Util::language($language, Constants::GRADE_EN[$customer['grade']], Constants::GRADE[$customer['grade']], Constants::GRADE_RU[$customer['grade']]); $customer['magnitude_txt'] = Util::language($language, Constants::MAGNITUDE_EN[$customer['magnitude']], Constants::MAGNITUDE[$customer['magnitude']], Constants::MAGNITUDE_RU[$customer['magnitude']]); $customer['sex_txt'] = Util::language($language, Constants::SEX_EN[$customer['sex']], Constants::SEX[$customer['sex']], Constants::SEX_RU[$customer['sex']]);