1

app/Service/TaskService.php

@@ -118,29 +118,41 @@ public function gpt_callback($data = [])
      */
      */
     public function prompt_callback($data = [])
     public function prompt_callback($data = [])
     {
     {
-        $credentials = Arr::only($data, ['user_id', 'task_id', 'result_img', 'prompt_id']);
+        $credentials = Arr::only($data, ['user_id', 'task_id', 'result_img', 'prompt_id', 'message']);
         # 必须字段
         # 必须字段
         $prompt_id = $credentials['prompt_id'];
         $prompt_id = $credentials['prompt_id'];
         $user_id = $credentials['user_id'];
         $user_id = $credentials['user_id'];
         $task_id = $credentials['task_id'];
         $task_id = $credentials['task_id'];
         $result_img = $credentials['result_img'];
         $result_img = $credentials['result_img'];
+        $message = $credentials['message'] ?? '';
         # 判断必须字段
         # 判断必须字段
         if (empty($user_id) || empty($task_id) || empty($result_img) || empty($prompt_id)) {
         if (empty($user_id) || empty($task_id) || empty($result_img) || empty($prompt_id)) {
             throw new UserException('指令回调缺少参数');
             throw new UserException('指令回调缺少参数');
         }
         }
-        # 更新
-        $res = PromptTask::query()->where('id', $prompt_id)->where('user_id', $user_id)
-            ->where('task_id', $task_id)->update(['result_img' => $result_img,]);
-        #
-        $list = [
-            'user_id' => $user_id,
-            'task_id' => $task_id,
-            'prompt_id' => $prompt_id,
-            'result_img' => $result_img,
-            'callback' => config('common.img_download_callback'),
-        ];
-        # redis队列插入任务--转存图片
-        Redis::rpush('discord_img_download', json_encode($list));
+        # 如果存在message,则提交失败信息
+        if ($message) {
+            $res = PromptTask::query()->where('id', $prompt_id)->where('user_id', $user_id)
+                ->where('task_id', $task_id)->first();
+            if ($res->message) {
+                $res->message = $res->message . ',' . $message;
+            } else {
+                $res->message = $message;
+            }
+            $res->save();
+        } else {
+            # 更新
+            $res = PromptTask::query()->where('id', $prompt_id)->where('user_id', $user_id)
+                ->where('task_id', $task_id)->update(['result_img' => $result_img,]);
+            $list = [
+                'user_id' => $user_id,
+                'task_id' => $task_id,
+                'prompt_id' => $prompt_id,
+                'result_img' => $result_img,
+                'callback' => config('common.img_download_callback'),
+            ];
+            # redis队列插入任务--转存图片
+            Redis::rpush('discord_img_download', json_encode($list));
+        }
         return true;
         return true;
     }
     }