From 7963cd01efb5616c89f3f05923c822207705eb91 Mon Sep 17 00:00:00 2001 From: Jerry Yan <792602257@qq.com> Date: Wed, 19 Mar 2025 16:49:27 +0800 Subject: [PATCH] =?UTF-8?q?=E9=BB=98=E8=AE=A4=E9=9C=80=E8=A6=81=E5=AE=A1?= =?UTF-8?q?=E6=A0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/controller/InspectionShare.php | 2 +- .../src/controller/UserShare.php | 46 +++++++++---------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/plugs/think-plugs-ticket/src/controller/InspectionShare.php b/plugs/think-plugs-ticket/src/controller/InspectionShare.php index 5a586ba..6539d35 100644 --- a/plugs/think-plugs-ticket/src/controller/InspectionShare.php +++ b/plugs/think-plugs-ticket/src/controller/InspectionShare.php @@ -93,7 +93,7 @@ class InspectionShare extends Controller 'lat' => $share->ticket_lat, 'lng' => $share->ticket_lng, 'imgs' => $share->imgs, - 'status' => 0, + 'status' => -1, // 先审核 ]); $ticket->source = $share; $ticket->save(); diff --git a/plugs/think-plugs-ticket/src/controller/UserShare.php b/plugs/think-plugs-ticket/src/controller/UserShare.php index f529661..0d043ad 100644 --- a/plugs/think-plugs-ticket/src/controller/UserShare.php +++ b/plugs/think-plugs-ticket/src/controller/UserShare.php @@ -73,9 +73,9 @@ class UserShare extends Controller 'point_aware.require' => '奖励积分不能为空', 'point_aware.number' => '奖励积分必须为数字', ]); - $userShare = TicketUserShare::mk()->where(['id' => $basic_data['id']])->findOrEmpty(); - if ($userShare->isEmpty()) $this->error('用户随手拍不存在!'); - if ($userShare->status !== 0) $this->error('用户随手拍已处理!'); + $share = TicketUserShare::mk()->where(['id' => $basic_data['id']])->findOrEmpty(); + if ($share->isEmpty()) $this->error('用户随手拍不存在!'); + if ($share->status !== 0) $this->error('用户随手拍已处理!'); $ticket_id = null; $result = "已形成工单交由专人处理"; switch ($basic_data['_type']) { @@ -87,19 +87,19 @@ class UserShare extends Controller 'source_type' => 1, 'type_id' => $data['type_id'], 'user_type' => 'user', - 'user_id' => $userShare->user_id, - 'title' => $userShare->title, - 'content' => $userShare->content, - 'ticket_region' => $userShare->ticket_region, - 'ticket_address' => $userShare->ticket_address, - 'contact_name' => $userShare->contact_name, - 'contact_phone' => $userShare->contact_phone, - 'lat' => $userShare->lat, - 'lng' => $userShare->lng, - 'imgs' => $userShare->imgs, - 'status' => 0, + 'user_id' => $share->user_id, + 'title' => $share->title, + 'content' => $share->content, + 'ticket_region' => $share->ticket_region, + 'ticket_address' => $share->ticket_address, + 'contact_name' => $share->contact_name, + 'contact_phone' => $share->contact_phone, + 'lat' => $share->ticket_lat, + 'lng' => $share->ticket_lng, + 'imgs' => $share->imgs, + 'status' => -1, ]); - $ticket->source = $userShare; + $ticket->source = $share; $ticket->save(); $ticket_id = $ticket->id; break; @@ -110,7 +110,7 @@ class UserShare extends Controller $ticket = TicketTicket::mk()->where(['id' => $data['ticket_id']])->findOrEmpty(); if ($ticket->isEmpty()) $this->error('工单不存在!'); $ticket_id = $data['ticket_id']; - $ticket->source = $userShare; + $ticket->source = $share; $ticket->save(); break; case 'skip': @@ -119,14 +119,14 @@ class UserShare extends Controller default: $this->error('参数错误'); } - $userShare->linked_ticket_id = $ticket_id; - $userShare->response = $basic_data['content']; - $userShare->point_aware = $basic_data['point_aware']; - UserPointService::addUserPoint($userShare->user_id, $basic_data['point_aware'], '用户随手拍奖励积分'); - $userShare->status = 1; - $userShare->save(); + $share->linked_ticket_id = $ticket_id; + $share->response = $basic_data['content']; + $share->point_aware = $basic_data['point_aware']; + UserPointService::addUserPoint($share->user_id, $basic_data['point_aware'], '用户随手拍奖励积分'); + $share->status = 1; + $share->save(); $adminInfo = $this->request->session('user'); - $userShare->logs()->save([ + $share->logs()->save([ 'op_name' => $adminInfo["username"], 'content' => $basic_data['content'], 'result' => $result,