diff --git a/app/common/controller/NotifyController.php b/app/common/controller/NotifyController.php index f6e728e..9e4fffb 100644 --- a/app/common/controller/NotifyController.php +++ b/app/common/controller/NotifyController.php @@ -126,7 +126,7 @@ class NotifyController try { $data = $request->post(); - var_dump('飞书事件回调:'.$data); + var_dump($data); return json($data); } catch (\Throwable $e) { diff --git a/app/common/service/UserService.php b/app/common/service/UserService.php index 69fb2f4..1d5dab4 100644 --- a/app/common/service/UserService.php +++ b/app/common/service/UserService.php @@ -54,6 +54,7 @@ class UserService $ossservice = new OssService(); return [ 'id' => $user->id, + 'sn' => $user->sn, 'name' => $user->name, 'position' => $user->position, 'socialize' => $user->socialize, @@ -62,10 +63,11 @@ class UserService 'country_id' => $user->country_id, 'country_txt' => Country::where('id',$user->country_id)->value('cn_addr'), 'avatar' => $user->avatar, - 'avatar_full' => (!empty($user->avatar))?$ossservice->generatePrivateUrl($user->avatar):'', + 'avatar_full' => $user->avatar, 'phone' => $user->phone, 'corp_name' => $corp_name, 'email' => $user->email, + 'sex' => $user->sex, 'status' => $user->status, 'roles' => $user->roles->pluck('name') ]; diff --git a/app/crm/service/CustomerService.php b/app/crm/service/CustomerService.php index 0e5ca8f..b54eeab 100644 --- a/app/crm/service/CustomerService.php +++ b/app/crm/service/CustomerService.php @@ -110,6 +110,7 @@ class CustomerService public static function getCustomer($customer, $language = 'zh_CN', $tag = false) { $customer['grade_txt'] = Util::language($language, Constants::GRADE_EN[$customer['grade']], Constants::GRADE_ZH[$customer['grade']], Constants::GRADE_RU[$customer['grade']]); + $customer['magnitude'] = ($customer['magnitude']==0)?1:$customer['magnitude']; $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']]); diff --git a/config/constants/Constants.php b/config/constants/Constants.php index 6797078..fa0dd81 100644 --- a/config/constants/Constants.php +++ b/config/constants/Constants.php @@ -71,14 +71,14 @@ class Constants ]; //客户重要性 - public const CUSTOMER_MAGNITUDE_INITIAL = 0; // 金牌商机 - public const CUSTOMER_MAGNITUDE_COMMUNICATE = 1; // 银牌商机 - public const CUSTOMER_MAGNITUDE_PLAN = 2; // 铜牌商机 + public const CUSTOMER_MAGNITUDE_INITIAL = 1; // 金牌商机 + public const CUSTOMER_MAGNITUDE_COMMUNICATE = 2; // 银牌商机 + public const CUSTOMER_MAGNITUDE_PLAN = 3; // 铜牌商机 public const MAGNITUDE = [ - self::CUSTOMER_MAGNITUDE_INITIAL => '金牌商机', - self::CUSTOMER_MAGNITUDE_COMMUNICATE => '银牌商机', - self::CUSTOMER_MAGNITUDE_PLAN => '铜牌商机', + self::CUSTOMER_MAGNITUDE_INITIAL => '💛金牌商机', + self::CUSTOMER_MAGNITUDE_COMMUNICATE => '🤍银牌商机', + self::CUSTOMER_MAGNITUDE_PLAN => '🧡铜牌商机', ]; public const MAGNITUDE_EN = [ self::CUSTOMER_MAGNITUDE_INITIAL => 'Gold Medal',