通知配置

app/Http/Controllers/ConfigController.php

@@ -133,6 +133,12 @@ class ConfigController extends Controller
                     '1' => '短信',
                     '0' => 'push',
                 ],
+                //通知状态
+                'notice_status' =>[
+                    '1' => '发送中',
+                    '0' => '未发送',
+                    '2' => '已发送',
+                ],
                 //通知用户类型
                 'notice_user_type' =>[
                     '1' => '条件筛选',
@@ -142,9 +148,16 @@ class ConfigController extends Controller
                 //用户属性
                 'attribute' =>[
                     '1' => '原始用户',
-                    '0' => '全部用户',
+                    '0' => '不限',
                     '2' => '正式用户',
                 ],
+                //跳转类型
+                'action_type' =>[
+                    'post' => '内容',
+                    'star' => '首页',
+                    'activity' => '活动',
+                    'product' => '商品',
+                ],
         ];
     }
 }

app/Http/Controllers/NoticeRuleController.php

@@ -56,8 +56,8 @@ class NoticeRuleController extends Controller
         $validator = Validator::make($request->all(), [
             'title' => 'required|string|max:30',
             'notice_user_type' => ['required',Rule::in(0, 1, 2)],
-            'action_type' => ['required_if:notice_type,0',Rule::in('post', 'recommend', 'star', 'activity', 'product')],
-            'action_id' => 'required_if:notice_type,0|integer|min:1',
+            'action_type' => ['required',Rule::in('post', 'star', 'activity', 'product')],
+            'action_id' => 'required_unless:action_type,star|integer|min:1',
             'content' => 'required|string|max:60',
             'send_time' => 'nullable|date',
             'attribute' => ['nullable',Rule::in(0, 1, 2)],

app/Transformers/NoticeRuleDetailTransformer.php

@@ -18,12 +18,13 @@ class NoticeRuleDetailTransformer extends TransformerAbstract
         $attribute = $noticeUsers['attribute']??0;
         $category = $noticeUsers['category']??[];
         $uids = '';
-        if($noticeUsers['uids']){
+        if(isset($noticeUsers['uids'])){
             $uids = implode('、', $noticeUsers['uids']);
         }
         return [
             'id' => $noticeRule['id'],
             'title' => $noticeRule['title'],
+            'content' => $noticeRule['content'],
             'cover' => $noticeRule['cover'],
             'updated_at' => Carbon::parse($noticeRule['updated_at'])->toDateTimeString(),
             'send_count' => $noticeRule['send_count'],