From fc72a1f63b96074aaf4b77d6cd47f6943fd48ed5 Mon Sep 17 00:00:00 2001 From: weigang Date: Mon, 27 Jul 2020 15:35:25 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9sevice=E4=BC=A0=E5=8F=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Controller/ServiceEvaluateController.php | 2 +- app/Service/ServiceEvaluateService.php | 11 ++--------- app/Service/ServiceEvaluateServiceInterface.php | 4 +--- 3 files changed, 4 insertions(+), 13 deletions(-) diff --git a/app/Controller/ServiceEvaluateController.php b/app/Controller/ServiceEvaluateController.php index 8440f30..8b759fb 100644 --- a/app/Controller/ServiceEvaluateController.php +++ b/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); } diff --git a/app/Service/ServiceEvaluateService.php b/app/Service/ServiceEvaluateService.php index 13d26b3..99b8328 100644 --- a/app/Service/ServiceEvaluateService.php +++ b/app/Service/ServiceEvaluateService.php @@ -11,16 +11,8 @@ 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'] = Db::table('ims_cjdc_user') ->where(['id' => $data['user_id']]) ->value('join_time'); @@ -46,6 +38,7 @@ class ServiceEvaluateService implements ServiceEvaluateServiceInterface return $res; } + public function getQuickEvaluate() { $data = (object)null; diff --git a/app/Service/ServiceEvaluateServiceInterface.php b/app/Service/ServiceEvaluateServiceInterface.php index 97ecbd6..b01f435 100644 --- a/app/Service/ServiceEvaluateServiceInterface.php +++ b/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); From a29976bfc1335a3213b72edc61f6ba2472814867 Mon Sep 17 00:00:00 2001 From: "DESKTOP-GG6FIN9\\Administrator" <15040771@qq.com> Date: Mon, 27 Jul 2020 17:04:27 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E8=AF=84=E8=AE=BA=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Controller/ServiceEvaluateController.php | 6 +++--- app/Service/ServiceEvaluateService.php | 7 +++++++ 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/app/Controller/ServiceEvaluateController.php b/app/Controller/ServiceEvaluateController.php index 8440f30..edc7ab5 100644 --- a/app/Controller/ServiceEvaluateController.php +++ b/app/Controller/ServiceEvaluateController.php @@ -45,10 +45,10 @@ class ServiceEvaluateController extends BaseController //根据用户iD 获取服务专员详细信息 $service_personnel_id = $this->request->input('service_personnel_id', 0); $res = $this->evaluateService->getPersonnelInfo($service_personnel_id); - //如果存在服务专员则获取默认快捷评价 + //如果存在服务专员则获取配置信息 if(!empty($res)) { - $quick_evaluate = $this->evaluateService->getQuickEvaluate(); - $res->quick_evaluate = $quick_evaluate; + $config = $this->evaluateService->getQuickEvaluate(); + $res->config = $config; } return $this->success($res); } diff --git a/app/Service/ServiceEvaluateService.php b/app/Service/ServiceEvaluateService.php index d7cf885..675feb2 100644 --- a/app/Service/ServiceEvaluateService.php +++ b/app/Service/ServiceEvaluateService.php @@ -51,14 +51,21 @@ class ServiceEvaluateService implements ServiceEvaluateServiceInterface public function getQuickEvaluate() { $data = (object)null; + //获取快速评论标题 $obj1 = (object)null; $obj1->title1 = '服务态度超好'; $obj1->title2 = '服务态度一般般'; $data->quick_evaluate_title = $obj1; + //获取快速评论内容 $obj2 = (object)null; $obj2->content1 = '超级细心'; $obj2->content2 = '马马虎虎'; $data->quick_evaluate_content = $obj2; + //获取评论长度限制参数 + $obj3 = (object)null; + $obj3->min_length = 15; + $obj3->max_length = 150; + $data->length = $obj3; return $data; } From 6d51d44f90945508eec2ce33393ca8d5e21a4ed9 Mon Sep 17 00:00:00 2001 From: weigang Date: Mon, 27 Jul 2020 17:29:39 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=98=AF=E5=90=A6?= =?UTF-8?q?=E6=96=B0=E7=94=A8=E6=88=B7=E7=9A=84=E6=A0=87=E8=AF=86=E4=BB=A5?= =?UTF-8?q?=E5=8F=8A=E8=AE=A1=E7=AE=97=E5=B9=B3=E5=9D=87=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Model/ServiceEvaluate.php | 2 +- app/Model/Users.php | 8 ++++++++ app/Service/ServiceEvaluateService.php | 21 ++++++++++++++++++--- config/autoload/server.php | 7 +++++++ 4 files changed, 34 insertions(+), 4 deletions(-) create mode 100644 app/Model/Users.php diff --git a/app/Model/ServiceEvaluate.php b/app/Model/ServiceEvaluate.php index 8d1e89a..82ee480 100644 --- a/app/Model/ServiceEvaluate.php +++ b/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']; /** * 默认值 diff --git a/app/Model/Users.php b/app/Model/Users.php new file mode 100644 index 0000000..2a8d910 --- /dev/null +++ b/app/Model/Users.php @@ -0,0 +1,8 @@ +where(['id' => $data['user_id']]) - ->value('join_time'); + // 当前用户是否今日新注册并第一次提交评论 + $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); + return ServiceEvaluate::create($data); } diff --git a/config/autoload/server.php b/config/autoload/server.php index d6211cc..e0e6cd8 100644 --- a/config/autoload/server.php +++ b/config/autoload/server.php @@ -36,10 +36,17 @@ return [ 'max_request' => 100000, 'socket_buffer_size' => 2 * 1024 * 1024, 'buffer_output_size' => 2 * 1024 * 1024, + // Task Worker 数量，根据您的服务器配置而配置适当的数量 + 'task_worker_num' => 8, + // 因为 `Task` 主要处理无法协程化的方法，所以这里推荐设为 `false`，避免协程下出现数据混淆的情况 + 'task_enable_coroutine' => false, ], 'callbacks' => [ SwooleEvent::ON_WORKER_START => [Hyperf\Framework\Bootstrap\WorkerStartCallback::class, 'onWorkerStart'], SwooleEvent::ON_PIPE_MESSAGE => [Hyperf\Framework\Bootstrap\PipeMessageCallback::class, 'onPipeMessage'], SwooleEvent::ON_WORKER_EXIT => [Hyperf\Framework\Bootstrap\WorkerExitCallback::class, 'onWorkerExit'], + // Task callbacks + SwooleEvent::ON_TASK => [Hyperf\Framework\Bootstrap\TaskCallback::class, 'onTask'], + SwooleEvent::ON_FINISH => [Hyperf\Framework\Bootstrap\FinishCallback::class, 'onFinish'], ], ];