Merge branch 'hotfix/follow' into develop

app/crm/model/Follow.php

@@ -36,11 +36,22 @@ class Follow extends Model
      *
      * @var bool
      */
-    public $timestamps = true;
+    public $timestamps = false;
 
-    protected $casts = [
-        'follow_time' => 'timestamp', // 指定序列化格式
-        'updated_at' => 'timestamp', // 指定序列化格式
-        'created_at' => 'timestamp', // 指定序列化格式
-    ];
+    /**
+     * 在保存时手动设置时间戳
+     */
+    protected static function boot()
+    {
+        parent::boot();
+
+        static::creating(function ($model) {
+            $model->created_at = time();
+            $model->updated_at = time();
+        });
+
+        static::updating(function ($model) {
+            $model->updated_at = time();
+        });
+    }
 }

app/crm/service/FollowService.php

@@ -60,7 +60,10 @@ class FollowService
         }
         $follow['picture_full'] = $oss_picture;
 
-        $follow = Util::formatDate($follow,['created_at','updated_at','follow_time']);
+//        $follow = Util::formatDate($follow,['created_at','updated_at','follow_time']);
+        $follow['follow_time'] = empty($follow['follow_time'])?'':date('Y-m-d H:i:s', $follow['follow_time']);
+        $follow['created_at'] = empty($follow['created_at'])?'':date('Y-m-d H:i:s', $follow['created_at']);
+        $follow['updated_at'] = empty($follow['updated_at'])?'':date('Y-m-d H:i:s', $follow['updated_at']);;
 //        $follow = Util::formatDate($follow);
         return $follow;
     }

app/crmAdmin/service/CustomerService.php

@@ -480,6 +480,9 @@ class CustomerService
         $ossservice = new OssService();
         foreach ($follow as $item) {
             $item = Util::formatDate($item,['created_at','updated_at','follow_time']);
+            $item['follow_time'] = empty($item['follow_time'])?'':date('Y-m-d H:i:s', $item['follow_time']);
+            $item['created_at'] = empty($item['created_at'])?'':date('Y-m-d H:i:s', $item['created_at']);
+            $item['updated_at'] = empty($item['updated_at'])?'':date('Y-m-d H:i:s', $item['updated_at']);;
             $item['picture_full'] = empty($item->picture)?'':$ossservice->generatePrivateUrl($item->picture);
         }