Merge branch 'service_evaluate' into develop

app/Listener/ValidatorFactoryResolvedListener.php

@@ -37,5 +37,10 @@ class ValidatorFactoryResolvedListener implements ListenerInterface
 
         });
 
+        // 注册了 strlen 验证器规则
+        $validatorFactory->extend('strlen', function ($attribute, $value, $parameters, $validator) {
+            return strlen($value)>=$parameters[0] && strlen($value)<=$parameters[1];
+        });
+
     }
 }

app/Request/EvaluateRequest.php

@@ -25,7 +25,7 @@ class EvaluateRequest extends FormRequest
             'c_attitude' => 'required|nonempty|integer',
             'c_service' => 'required|nonempty|integer',
             'c_quality' => 'required|nonempty|integer',
-            'content' => 'required|nonempty|between:15,150',
+            'content' => 'required|nonempty|strlen:15,150',
             'user_id' => 'required|nonempty|integer|exists:ims_cjdc_user,id',
             'service_personnel_id' => 'required|nonempty|integer|exists:lanzu_service_personnel,id',
             'market_id' => 'required|nonempty|integer|exists:ims_cjdc_market,id',

app/Service/ServiceEvaluateService.php

@@ -41,8 +41,7 @@ class ServiceEvaluateService implements ServiceEvaluateServiceInterface
                 ['user_id','=',$user_id],
                 ['status','=',1]
             ])
-            ->select('id')
-            ->first();
+            ->exists();
         return $res;
     }
 
@@ -65,14 +64,14 @@ class ServiceEvaluateService implements ServiceEvaluateServiceInterface
     public function getEvaluateList($data)
     {
         //踩坑 paginate 只能接收int型参数
-        $par_page = $data['par_page'] > 0 ? intval($data['par_page']) : '6';
+        $per_page = isset($data['per_page']) && $data['per_page'] > 0 ? intval($data['per_page']) : 6;
         //查询评论列表 按照创建时间降序排序
         $res = Db::table('lanzu_service_evaluate as e')
             ->join('ims_cjdc_user as u','u.id','=','e.user_id')
             ->where(['e.service_personnel_id'=>$data['service_personnel_id']])
             ->select('e.*','u.name','u.img')
             ->orderBy('created_at','desc')
-            ->paginate($par_page);
+            ->paginate($per_page);
         return $res;
     }