Merge branch 'service_evaluate' into develop

app/Controller/ServiceEvaluateController.php

@@ -32,7 +32,7 @@ class ServiceEvaluateController extends BaseController
     {
         // TODO 数据保存失败的返回处理
         // TODO 自定义验证用户、市场、服务人员ID
-        $ret = $this->evaluateService->evaluate();
+        $ret = $this->evaluateService->evaluate($this->request->all());
         return $this->success($ret);
 
     }

app/Model/ServiceEvaluate.php

@@ -12,7 +12,7 @@ class ServiceEvaluate extends Model
     /**
      * @var array 允许插入的属性
      */
-    protected $fillable = ['user_id', 'user_created_at', 'service_personnel_id', 'market_id', 'c_attitude', 'c_service', 'c_quality', 'content'];
+    protected $fillable = ['user_id', 'user_created_at', 'service_personnel_id', 'market_id', 'c_attitude', 'c_service', 'c_quality', 'c_average', 'content', 'is_new_user'];
 
     /**
      * 默认值

app/Model/Users.php

@@ -0,0 +1,8 @@
+<?php
+
+namespace App\Model;
+
+class Users extends Model
+{
+    protected $table = 'ims_cjdc_user';
+}

app/Service/ServiceEvaluateService.php

@@ -3,6 +3,7 @@
 namespace App\Service;
 
 use App\Model\ServiceEvaluate;
+use App\Model\Users;
 use Hyperf\DbConnection\Db;
 use Hyperf\HttpServer\Contract\RequestInterface;
 use Hyperf\Di\Annotation\Inject;
@@ -11,19 +12,25 @@ use Hyperf\Paginator\Paginator;
 class ServiceEvaluateService implements ServiceEvaluateServiceInterface
 {
 
-    /**
-     * @Inject
-     * @var RequestInterface
-     */
-    private $request;
-
-    public function evaluate()
+    public function evaluate($data)
     {
-        $data = $this->request->all();
+        // 当前用户是否今日新注册并第一次提交评论
+        $data['user_created_at'] = Users::where(['id' => $data['user_id']])->value('join_time');
+        $evaluateExist = ServiceEvaluate::where(['user_id' => $data['user_id']])->exists();
+
+        $data['is_new_user'] = 0;
+        if (
+            !$evaluateExist
+            && $data['user_created_at']>=strtotime(date('Y-m-d 00:00:00'))
+            && $data['user_created_at']<=strtotime(date('Y-m-d 23:59:59'))
+        ) {
+            $data['is_new_user'] = 1;
+        }
+
+        // 计算评分平均分
+        $score = $data['c_attitude'] + $data['c_service'] + $data['c_quality'];
+        $data['c_average'] = round($score/3, 1);
 
-        $data['user_created_at'] = Db::table('ims_cjdc_user')
-            ->where(['id' => $data['user_id']])
-            ->value('join_time');
         return ServiceEvaluate::create($data);
     }
 
@@ -48,6 +55,7 @@ class ServiceEvaluateService implements ServiceEvaluateServiceInterface
         return $res;
     }
 
+
     public function getQuickEvaluate()
     {
         $data  = (object)null;

app/Service/ServiceEvaluateServiceInterface.php

@@ -2,12 +2,10 @@
 
 namespace App\Service;
 
-use Hyperf\HttpServer\Contract\RequestInterface;
-
 interface ServiceEvaluateServiceInterface
 {
 
-    public function evaluate();
+    public function evaluate($data);
 
     public function getPersonnelInfo($service_personnel_id);