Merge branch 'feature/tag' into feature/en

app/model/Customer.php

@@ -59,11 +59,18 @@ class Customer extends Model
         return $date->format(Carbon::parse($date)->toDateTimeString());
     }
 
-    public static function getCustomer($customer)
+    /**
+     * @param $customer
+     * @param $request
+     * @param $tag 是否返回客户标签
+     * @return mixed
+     */
+    public static function getCustomer($customer, $request, $tag = false)
     {
         $customer['grade_txt'] = Constants::GRADE[$customer['grade']];
         $customer['magnitude_txt'] = Constants::MAGNITUDE[$customer['magnitude']];
         $customer['sex_txt'] = Constants::SEX[$customer['sex']];
+        $language = $request->user['language'] ?: 'en';
 
         if ($customer['grade']<=2) {
             $customer['follow'] = 0;
@@ -94,6 +101,22 @@ class Customer extends Model
         $customer['channel_name'] = empty($customer['channel_id'])?'':Channel::where(['id'=>$customer['channel_id']])->value('name');
 //        $customer['last_follow'] = $last_follow;
 
+        if ($tag) {
+            foreach ($customer['tags'] as &$tag) {
+                $tag['names'] = unserialize($tag['names']);
+                $tag['name'] = $tag['names'][$language];
+            }
+        }
+
         return $customer;
     }
+
+    /**
+     * 客户的标签
+     */
+    public function tags()
+    {
+        return $this->belongsToMany(Tag::class, 'customer_tag', 'customer_id', 'tag_id')
+            ->withTimestamps(); // 如果需要记录关联时间
+    }
 }

app/model/CustomerTag.php

@@ -0,0 +1,36 @@
+<?php
+
+namespace app\model;
+
+
+use app\util\Util;
+use support\Model;
+use Illuminate\Database\Eloquent\SoftDeletes;
+
+class CustomerTag extends Model
+{
+    /**
+     * The table associated with the model.
+     *
+     * @var string
+     */
+    protected $table = 'customer_tag';
+
+    /**
+     * The primary key associated with the table.
+     *
+     * @var string
+     */
+    protected $primaryKey = 'id';
+
+    //设置黑名单
+    protected $guarded = ['id', 'created_at'];
+
+    /**
+     * Indicates if the model should be timestamped.
+     *
+     * @var bool
+     */
+    public $timestamps = false;
+
+}

app/model/Tag.php

@@ -0,0 +1,55 @@
+<?php
+
+namespace app\model;
+
+
+use app\util\Util;
+use config\constants\Constants;
+use DateTimeInterface;
+use Illuminate\Support\Carbon;
+use support\Model;
+use Illuminate\Database\Eloquent\SoftDeletes;
+
+class Tag extends Model
+{
+    /**
+     * The table associated with the model.
+     *
+     * @var string
+     */
+    protected $table = 'tag';
+
+    /**
+     * The primary key associated with the table.
+     *
+     * @var string
+     */
+    protected $primaryKey = 'id';
+
+    //设置黑名单
+    protected $guarded = ['id','created_at','updated_at'];
+
+    // 指定日期字段存储格式为时间戳
+    protected $dateFormat = 'U';
+
+    /**
+     * Indicates if the model should be timestamped.
+     *
+     * @var bool
+     */
+    public $timestamps = true;
+
+    use SoftDeletes;
+    protected $dates = ['deleted_at'];
+
+    // 定义反向多对一关联
+    public function group()
+    {
+        return $this->belongsTo(TagGroup::class, 'group_id', 'id');
+    }
+
+    public function customers()
+    {
+        return $this->belongsToMany(Customer::class, 'customer_tag', 'tag_id', 'customer_id');
+    }
+}

app/model/TagGroup.php

@@ -0,0 +1,50 @@
+<?php
+
+namespace app\model;
+
+
+use app\util\Util;
+use config\constants\Constants;
+use DateTimeInterface;
+use Illuminate\Support\Carbon;
+use support\Model;
+use Illuminate\Database\Eloquent\SoftDeletes;
+
+class TagGroup extends Model
+{
+    /**
+     * The table associated with the model.
+     *
+     * @var string
+     */
+    protected $table = 'tag_group';
+
+    /**
+     * The primary key associated with the table.
+     *
+     * @var string
+     */
+    protected $primaryKey = 'id';
+
+    //设置黑名单
+    protected $guarded = ['id','created_at','updated_at'];
+
+    // 指定日期字段存储格式为时间戳
+    protected $dateFormat = 'U';
+
+    /**
+     * Indicates if the model should be timestamped.
+     *
+     * @var bool
+     */
+    public $timestamps = true;
+
+    use SoftDeletes;
+    protected $dates = ['deleted_at'];
+
+    // 定义与 Tag 的一对多关系
+    public function tags()
+    {
+        return $this->hasMany(Tag::class, 'group_id', 'id');
+    }
+}