Merge branch 'master' of http://git.bjzxtw.org.cn:3000/zxt/news_producer

app/JsonRpc/NewsService.php

@@ -792,6 +792,14 @@ class NewsService implements NewsServiceInterface
         'user_id' => $articleData['admin_user_id'],
       ]);
     }
+    if ($data['status'] == 0) {
+      $this->sendMessage([
+        'talk_type' => 100,
+        'title' => $articleData['title'],
+        'content' => '提交了审核',
+        'messageType' => 2,
+      ]);
+    }
 
 
     $result = Article::where(['id' => $data['id']])->update($data);
@@ -3875,7 +3883,7 @@ class NewsService implements NewsServiceInterface
     if ((isset($data['status']) && $data['status'] == 1) || !isset($data['status'])) {
       $this->sendMessage([
         'talk_type' => 600,
-        'title' => $data['title'],
+        'title' => $data['name'],
         'content' => '提交了审核',
         'messageType' => 11,
       ]);
@@ -3918,7 +3926,7 @@ class NewsService implements NewsServiceInterface
     if ((isset($data['status']) && $data['status'] == 1) || !isset($data['status'])) {
       $this->sendMessage([
         'talk_type' => 600,
-        'title' => $data['title'],
+        'title' => $data['name'],
         'content' => '提交了审核',
         'messageType' => 11,
       ]);
@@ -4320,6 +4328,14 @@ class NewsService implements NewsServiceInterface
       }
     }
     $complaintInfo = Complaint::where('id', $data['id'])->first();
+    if ($data['status'] == 1) {
+      $this->sendMessage([
+        'talk_type' => 800,
+        'title' => $complaintInfo['title'],
+        'content' => '提交了审核',
+        'messageType' => 6,
+      ]);
+    }
     if ($data['status'] == 2 && !isset($data['deal'])) {
       $this->sendMessage([
         'talk_type' => 801,
@@ -4400,6 +4416,14 @@ class NewsService implements NewsServiceInterface
         'user_id' => $goodInfo['user_id'],
       ]);
     }
+    if ($data['status'] == 1) {
+      $this->sendMessage([
+        'talk_type' => 200,
+        'title' => $goodInfo['name'],
+        'content' => '提交了审核',
+        'messageType' => 3,
+      ]);
+    }
     $result = Good::where('id', $data['id'])->update($data);
     return Result::success($result);
   }
@@ -4412,7 +4436,7 @@ class NewsService implements NewsServiceInterface
     $jogHuntingInfo = JobHunting::where('id', $data['id'])->first();
     if ($data['status'] == 2) {
       $this->sendMessage([
-        'talk_type' => 600,
+        'talk_type' => 601,
         'title' => $jogHuntingInfo['name'],
         'content' => '审核通过',
         'messageType' => 11,
@@ -4421,13 +4445,21 @@ class NewsService implements NewsServiceInterface
     }
     if ($data['status'] == 3) {
       $this->sendMessage([
-        'talk_type' => 600,
+        'talk_type' => 601,
         'title' => $jogHuntingInfo['name'],
         'content' => '审核拒绝',
         'messageType' => 11,
         'user_id' => $jogHuntingInfo['user_id'],
       ]);
     }
+    if ($data['status'] == 1) {
+      $this->sendMessage([
+        'talk_type' => 600,
+        'title' => $jogHuntingInfo['name'],
+        'content' => '提交了审核',
+        'messageType' => 11,
+      ]);
+    }
     $result = JobHunting::where('id', $data['id'])->update($data);
     return Result::success($result);
   }
@@ -4525,6 +4557,14 @@ class NewsService implements NewsServiceInterface
         'user_id' => $noticeInfo['user_id'],
       ]);
     }
+    if ($data['status'] == 1) {
+      $this->sendMessage([
+        'talk_type' => 700,
+        'title' => $noticeInfo['title'],
+        'content' => '提交了审核',
+        'messageType' => 3,
+      ]);
+    }
     return Result::success($result);
   }
   public function getDUser(array $data): array
@@ -5190,7 +5230,7 @@ class NewsService implements NewsServiceInterface
 
     if ($data['status'] == 1) {
       $this->sendMessage([
-        'talk_type' => 500,
+        'talk_type' => 501,
         'title' => $job['title'],
         'content' => '审核通过',
         'messageType' => 10,
@@ -5199,14 +5239,21 @@ class NewsService implements NewsServiceInterface
     }
     if ($data['status'] == 2) {
       $this->sendMessage([
-        'talk_type' => 500,
+        'talk_type' => 501,
         'title' => $job['title'],
         'content' => '审核拒绝',
         'messageType' => 10,
         'user_id' => $job['user_id'],
       ]);
     }
-
+    if ($data['status'] == 0) {
+      $this->sendMessage([
+        'talk_type' => 500,
+        'title' => $job['title'],
+        'content' => '提交了审核',
+        'messageType' => 10,
+      ]);
+    }
     $result = JobRecruiting::where('id', $data['id'])->update($data);
     if (empty($result)) {
       return Result::error("审核失败", 0);
@@ -5585,24 +5632,34 @@ class NewsService implements NewsServiceInterface
     //审核
     unset($data['user_id']);
     $bookInfo = Book::where("id", $data["id"])->first();
-    if ($bookInfo['status'] == 2) {
+    var_dump($bookInfo, '----');
+    if ($data['status'] == 2) {
       $this->sendMessage([
-        'talk_type' => 400,
+        'talk_type' => 401,
         'title' => $bookInfo['title'],
         'content' => '审核通过',
         'messageType' => 7,
         'user_id' => $bookInfo['user_id'],
       ]);
     }
-    if ($bookInfo['status'] == 3) {
+    if ($data['status'] == 3) {
       $this->sendMessage([
-        'talk_type' => 400,
+        'talk_type' => 401,
         'title' => $bookInfo['title'],
         'content' => '审核拒绝',
         'messageType' => 7,
         'user_id' => $bookInfo['user_id'],
       ]);
     }
+    if ($data['status'] == 1) {
+      $this->sendMessage([
+        'talk_type' => 400,
+        'title' => $bookInfo['title'],
+        'content' => '提交了审核',
+        'messageType' => 7,
+        // 'user_id'=>$bookInfo['user_id'],
+      ]);
+    }
     $result = Book::where("id", $data["id"])->update($data);
     if (empty($result)) {
       return Result::error("更新失败", 0);
@@ -6258,14 +6315,22 @@ class NewsService implements NewsServiceInterface
       ]);
       $result = Company::where('id', $data['id'])->update(['status' => $data['status'], 'reject_reason' => $data['reason']]);
     } else {
-      $this->sendMessage([
-        'talk_type' => 901,
-        'title' => $company['title'],
-        'content' => '审核通过',
-        'messageType' => 8,
-        'user_id' => $company['user_id'],
-      ]);
-
+      if ($data['status'] == 1) {
+        $this->sendMessage([
+          'talk_type' => 901,
+          'title' => $company['title'],
+          'content' => '审核通过',
+          'messageType' => 8,
+          'user_id' => $company['user_id'],
+        ]);
+      } else if ($data['status'] == 0) {
+        $this->sendMessage([
+          'talk_type' => 900,
+          'title' => $company['title'],
+          'content' => '提交了审核',
+          'messageType' => 8,
+        ]);
+      }
       $result = Company::where('id', $data['id'])->update(['status' => $data['status']]);
     }
     if (empty($result)) {
@@ -6677,13 +6742,22 @@ class NewsService implements NewsServiceInterface
       ]);
       $result = Project::where('id', $data['id'])->update(['status' => $data['status'], 'refuse_reason' => $data['refuse_reason']]);
     } else {
-      $this->sendMessage([
-        'talk_type' => 1001,
-        'title' => $project['title'],
-        'content' => '审核通过',
-        'messageType' => 9,
-        'user_id' => $project['user_id'],
-      ]);
+      if ($data['status'] == 1) {
+        $this->sendMessage([
+          'talk_type' => 1001,
+          'title' => $project['title'],
+          'content' => '审核通过',
+          'messageType' => 9,
+          'user_id' => $project['user_id'],
+        ]);
+      } else if ($data['status'] == 0) {
+        $this->sendMessage([
+          'talk_type' => 1000,
+          'title' => $project['title'],
+          'content' => '提交了审核',
+          'messageType' => 9,
+        ]);
+      }
       $result = Project::where('id', $data['id'])->update(['status' => $data['status']]);
     }
 
@@ -7433,6 +7507,7 @@ class NewsService implements NewsServiceInterface
       'content' => $messageData['content'],
       'messageType' => $messageData['messageType'],
       'user_id' => $messageData['user_id'] ?? '',
+      'time' => microtime(),
     ];
     $message = new MqProducer($msg);
     $producer = ContextApplicationContext::getContainer()->get(Producer::class);