消息内容

app/Http/Controllers/MessageRuleController.php

@@ -66,8 +66,9 @@ class MessageRuleController extends Controller
             'title' => 'required|string|max:20',
             'notice_groups' => 'required|string|max:31',
             'message_type' => ['required',Rule::in('star', 'system')],
-            'message_show_type' => ['required',Rule::in('only_show', 'user', 'post', 'activity', 'topic')],
-            'activity_url' => 'required_unless:message_show_type,only_show|string|max:64',
+            'message_show_type' => ['required_if:message_type,star',Rule::in('only_show', 'user', 'post', 'activity', 'topic')],
+            'activity_url' => 'required_if:message_show_type,user,post,activity,topic|string|max:64',
+            'content' => 'required_if:message_type,system|string|max:200',
             'cover' => 'required|url',
             'send_time' => 'nullable|date',
             'activity_time' => 'nullable|string|max:24',
@@ -88,8 +89,9 @@ class MessageRuleController extends Controller
             'title' => 'required|string|max:20',
             'notice_groups' => 'required|string|max:31',
             'message_type' => ['required',Rule::in('star', 'system')],
-            'message_show_type' => ['required',Rule::in('only_show', 'user', 'post', 'activity', 'topic')],
-            'activity_url' => 'required_unless:message_show_type,only_show|string|max:64',
+            'message_show_type' => ['required_if:message_type,star',Rule::in('only_show', 'user', 'post', 'activity', 'topic')],
+            'activity_url' => 'required_if:message_show_type,user,post,activity,topic|string|max:64',
+            'content' => 'required_if:message_type,system|string|max:200',
             'cover' => 'required|url',
             'send_time' => 'nullable|date',
             'activity_time' => 'nullable|string|max:24',

app/Repositories/MessageRuleRepository.php

@@ -66,10 +66,11 @@ class MessageRuleRepository
 
         $data = [
             'title' => $request['title'],
+            'content' => isset($request['content'])? $request['content']:'',
             'notice_groups' => $noticeGroups,
             'message_type' => $request['message_type'],
-            'message_show_type' => $request['message_show_type'],
-            'activity_url' => $request['activity_url']??'',
+            'message_show_type' => isset($request['message_show_type'])? $request['message_show_type']:'',
+            'activity_url' => isset($request['activity_url'])? $request['activity_url']:'',
             'cover' => $request['cover'],
             'message_status' => 0,
             'send_time' => isset($request['send_time']) && $request['send_time']? $request['send_time']:null,
@@ -125,12 +126,17 @@ class MessageRuleRepository
         $message->title = $request['title'];
         $message->notice_groups = $noticeGroups;
         $message->message_type = $request['message_type'];
-        $message->message_show_type = $request['message_show_type'];
         $message->cover = $request['cover'];
 
         if($request['activity_url']){
             $message->notice_groups = $request['activity_url'];
         }
+        if($request['message_show_type']){
+            $message->message_show_type = $request['message_show_type'];
+        }
+        if($request['content']){
+            $message->content = $request['content'];
+        }
         if(isset($request['send_time'])){
             if($request['send_time']){
                 $message->send_time = $request['send_time'];

app/Transformers/MessageRuleDetailTransformer.php

@@ -19,6 +19,7 @@ class MessageRuleDetailTransformer extends TransformerAbstract
         return [
             'id' => $messageRule['id'],
             'title' => $messageRule['title'],
+            'content' => $messageRule['content'],
             'message_type' => $messageRule['message_type'],
             'cover' => $messageRule['cover'],
             'send_time' => $messageRule['send_time'] ? Carbon::parse($messageRule['send_time'])->toDateTimeString():'',

database/migrations/2019_06_12_095415_add_content_to_table_message_rule.php

@@ -0,0 +1,35 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddContentToTableMessageRule extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('message_rule', function (Blueprint $table) {
+            $table->string('content', 500)
+                ->default('')
+                ->after('title')
+                ->comment('文字说明');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('message_rule', function (Blueprint $table) {
+            //
+        });
+    }
+}

resources/lang/zh-CN/validation.php

@@ -101,6 +101,7 @@ return [
 
     'attributes' => [
         'title' => '标题',
+        'content' => '内容',
         'notice_groups' => '通知群体',
         'message_type' => '消息类型',
         'message_show_type' => '展示类型',