update notification app module

ecjia · Jan 28, 2021 · 657d0b4 · 657d0b4
1 parent c55cf13
commit 657d0b4
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 26 deletions.
diff --git a/content/apps/notification/mh_notification.php b/content/apps/notification/mh_notification.php
@@ -109,47 +109,47 @@ public function mark_read()
                 $db_notifications->where('type', $status);
             }
 
-            $notice_list = $db_notifications->whereIn('notifiable_type', ['staff_user', 'orm_staff_user_model'])->take($page_size)->skip(($page - 1) * $page_size)->orderby('created_at', 'desc')->get();
+            $notice_list = $db_notifications->whereIn('notifiable_type', ['staff_user', 'staff_user_model', 'orm_staff_user_model'])->take($page_size)->skip(($page - 1) * $page_size)->orderby('created_at', 'desc')->get();
             $id_list     = [];
             if (!empty($notice_list)) {
                 foreach ($notice_list as $v) {
                     $arr   = json_decode($v['data'], true);
                     $title = $arr['body'];
-                    ecjia_admin::admin_log($title, 'batch_mark', 'notice');
+                    ecjia_merchant::admin_log($title, 'batch_mark', 'notice');
                     $id_list[] = $v['id'];
                 }
             }
 
             $db = RC_DB::table('notifications')->where('notifiable_id', $_SESSION['staff_id']);
-            $update = $db->whereIn('notifiable_type', ['staff_user', 'orm_staff_user_model'])->whereNull('read_at')->whereIn('id', $id_list)->update($data);
+            $update = $db->whereIn('notifiable_type', ['staff_user', 'staff_user_model', 'orm_staff_user_model'])->whereNull('read_at')->whereIn('id', $id_list)->update($data);
         } else {
             //标记该类型下全部通知为已读
             if (!empty($type)) {
                 $db_notifications = RC_DB::table('notifications')->where('notifiable_id', $_SESSION['staff_id']);
-                $notice_list = $db_notifications->whereIn('notifiable_type', ['staff_user', 'orm_staff_user_model'])->whereRaw('type = ' . "'$type'")->whereNull('read_at')->get();
+                $notice_list = $db_notifications->whereIn('notifiable_type', ['staff_user', 'staff_user_model', 'orm_staff_user_model'])->whereRaw('type = ' . "'$type'")->whereNull('read_at')->get();
                 if (!empty($notice_list)) {
                     foreach ($notice_list as $v) {
                         $arr   = json_decode($v['data'], true);
                         $title = $arr['body'];
-                        ecjia_admin::admin_log($title, 'batch_mark', 'notice');
+                        ecjia_merchant::admin_log($title, 'mark', 'notice');
                     }
                 }
 
                 $db = RC_DB::table('notifications')->where('notifiable_id', $_SESSION['staff_id']);
-                $update = $db->whereIn('notifiable_type', ['staff_user', 'orm_staff_user_model'])->whereRaw('type = ' . "'$type'")->whereNull('read_at')->update($data);
+                $update = $db->whereIn('notifiable_type', ['staff_user', 'staff_user_model', 'orm_staff_user_model'])->whereRaw('type = ' . "'$type'")->whereNull('read_at')->update($data);
             } else {
                 //标记单个
                 $id    = isset($_POST['val']) ? remove_xss($_POST['val']) : '';
 
                 $db_notifications = RC_DB::table('notifications')->where('notifiable_id', $_SESSION['staff_id']);
-                $info  = $db_notifications->whereIn('notifiable_type', ['staff_user', 'orm_staff_user_model'])->where('id', $id)->whereNull('read_at')->first();
+                $info  = $db_notifications->whereIn('notifiable_type', ['staff_user', 'staff_user_model', 'orm_staff_user_model'])->where('id', $id)->whereNull('read_at')->first();
                 $arr   = json_decode($info['data'], true);
                 $title = $arr['body'];
-                ecjia_admin::admin_log($title, 'mark', 'notice');
+                ecjia_merchant::admin_log($title, 'mark', 'notice');
 
                 if (!empty($id)) {
                     $db = RC_DB::table('notifications')->where('notifiable_id', $_SESSION['staff_id']);
-                    $update = $db->whereIn('notifiable_type', ['staff_user', 'orm_staff_user_model'])->where('id', $id)->whereNull('read_at')->update($data);
+                    $update = $db->whereIn('notifiable_type', ['staff_user', 'staff_user_model', 'orm_staff_user_model'])->where('id', $id)->whereNull('read_at')->update($data);
                 }
             }
         }
@@ -162,11 +162,11 @@ public function mark_read()
 
     private function get_notification_list()
     {
-        $db = RC_DB::table('notifications')->whereIn('notifiable_type', ['staff_user', 'orm_staff_user_model'])->where('notifiable_id', $_SESSION['staff_id']);
+        $db = RC_DB::table('notifications')->whereIn('notifiable_type', ['staff_user', 'staff_user_model', 'orm_staff_user_model'])->where('notifiable_id', $_SESSION['staff_id']);
 
         $status = !empty($_GET['status']) ? remove_xss($_GET['status']) : 'not_read';
 
-        $db->whereIn('notifiable_type', ['staff_user', 'orm_staff_user_model']);
+        $db->whereIn('notifiable_type', ['staff_user', 'staff_user_model', 'orm_staff_user_model']);
         if ($status == 'not_read') {
             $db->whereNull('read_at');
         } elseif ($status != 'all') {
@@ -175,26 +175,26 @@ private function get_notification_list()
             $db->where('type', $status);
         }
 
-        $type_count['count'] = RC_DB::table('notifications')->whereIn('notifiable_type', ['staff_user', 'orm_staff_user_model'])->where('notifiable_id', $_SESSION['staff_id'])->count();
-        $type_count['not_read'] = RC_DB::table('notifications')->whereIn('notifiable_type', ['staff_user', 'orm_staff_user_model'])->where('notifiable_id', $_SESSION['staff_id'])->whereNull('read_at')->count();
+        $type_count['count'] = RC_DB::table('notifications')->whereIn('notifiable_type', ['staff_user', 'staff_user_model', 'orm_staff_user_model'])->where('notifiable_id', $_SESSION['staff_id'])->count();
+        $type_count['not_read'] = RC_DB::table('notifications')->whereIn('notifiable_type', ['staff_user', 'staff_user_model', 'orm_staff_user_model'])->where('notifiable_id', $_SESSION['staff_id'])->whereNull('read_at')->count();
 
         $page_size = 20;
         $count     = $db->count();
         $page      = new ecjia_merchant_page($count, $page_size, 5);
         $data      = $db->select('*')->take($page_size)->skip($page->start_id - 1)->orderby('created_at', 'desc')->get();
 
         //通知类型
-        $type_list = RC_DB::table('notifications')->whereIn('notifiable_type', ['staff_user', 'orm_staff_user_model'])->where('notifiable_id', $_SESSION['staff_id'])->select(RC_DB::raw('distinct type'))->get();
+        $type_list = RC_DB::table('notifications')->whereIn('notifiable_type', ['staff_user', 'staff_user_model', 'orm_staff_user_model'])->where('notifiable_id', $_SESSION['staff_id'])->select(RC_DB::raw('distinct type'))->get();
         if (!empty($type_list)) {
             foreach ($type_list as $k => $v) {
-                $list = RC_DB::table('notifications')->whereIn('notifiable_type', ['staff_user', 'orm_staff_user_model'])->where('notifiable_id', $_SESSION['staff_id'])->select('*')->where('type', $v['type'])->orderby('created_at', 'desc')->get();
+                $list = RC_DB::table('notifications')->whereIn('notifiable_type', ['staff_user', 'staff_user_model', 'orm_staff_user_model'])->where('notifiable_id', $_SESSION['staff_id'])->select('*')->where('type', $v['type'])->orderby('created_at', 'desc')->get();
                 if (!empty($list)) {
                     foreach ($list as $key => $val) {
                         $arr                         = json_decode($val['data'], true);
                         $type_list[$k]['type_title'] = $arr['title'];
                     }
                 }
-                $type_list[$k]['count']             = RC_DB::table('notifications')->whereIn('notifiable_type', ['staff_user', 'orm_staff_user_model'])->where('notifiable_id', $_SESSION['staff_id'])->select('*')->where('type', $v['type'])->count();
+                $type_list[$k]['count']             = RC_DB::table('notifications')->whereIn('notifiable_type', ['staff_user', 'staff_user_model', 'orm_staff_user_model'])->where('notifiable_id', $_SESSION['staff_id'])->select('*')->where('type', $v['type'])->count();
                 $type_list[$k]['type']              = str_replace("\\", '-', $v['type']);
                 $type_list[$k]['notice_type_title'] = mix_substr($type_list[$k]['type_title'], 15);
             }

diff --git a/content/apps/notification/model/orm_staff_user_model.class.php b/content/apps/notification/model/orm_staff_user_model.class.php
@@ -46,13 +46,10 @@
 //
 defined('IN_ECJIA') or exit('No permission resources.');
 
-use Royalcms\Component\Database\Eloquent\Model;
-use Royalcms\Component\Notifications\Notifiable;
+use Ecjia\System\Notifications\NotifiableModel;
 
-class orm_staff_user_model extends Model
+class orm_staff_user_model extends NotifiableModel
 {
-    use Notifiable;
-
     protected $table = 'staff_user';
     protected $primaryKey = 'user_id';
 }

diff --git a/content/apps/notification/modules/admin/merchant/notification/read_module.class.php b/content/apps/notification/modules/admin/merchant/notification/read_module.class.php
@@ -65,7 +65,7 @@ public function handleRequest(\Royalcms\Component\HttpKernel\Request $request) {
 
     	$db = RC_DB::table('notifications');
     	if ($_SESSION['staff_id']) {
-    		$db->where('notifiable_type', 'orm_staff_user_model')->where('notifiable_id', $_SESSION['staff_id']);
+    		$db->whereIn('notifiable_type', ['staff_user','staff_user_model', 'orm_staff_user_model'])->where('notifiable_id', $_SESSION['staff_id']);
     	} 
     	$notification_info = $db->where('id', $message_id)->first();
     	if (empty($notification_info)) {

diff --git a/content/apps/notification/modules/admin/merchant/notification/unread_count_module.class.php b/content/apps/notification/modules/admin/merchant/notification/unread_count_module.class.php
@@ -70,7 +70,7 @@ public function handleRequest(\Royalcms\Component\HttpKernel\Request $request) {
 
         $record_count  = RC_DB::table('notifications')
             ->whereIn('type', $type)
-            ->where('notifiable_type', 'orm_staff_user_model')
+            ->whereIn('notifiable_type', ['staff_user','staff_user_model', 'orm_staff_user_model'])
             ->where('notifiable_id', $_SESSION['staff_id'])
             ->whereNull('read_at')
             ->count();

diff --git a/content/apps/notification/modules/admin/merchant/notification_module.class.php b/content/apps/notification/modules/admin/merchant/notification_module.class.php
@@ -82,7 +82,7 @@ public function handleRequest(\Royalcms\Component\HttpKernel\Request $request) {
     	);
     	$record_count  = RC_DB::table('notifications')
                     	->whereIn('type', $type)
-                    	->where('notifiable_type', 'orm_staff_user_model')
+                    	->whereIn('notifiable_type', ['staff_user','staff_user_model', 'orm_staff_user_model'])
                     	->where('notifiable_id', $_SESSION['staff_id'])
                     	->count();
 
@@ -91,11 +91,11 @@ public function handleRequest(\Royalcms\Component\HttpKernel\Request $request) {
     	$skip                  = $page_row->start_id-1;
         $notifications_result  = RC_DB::table('notifications')
                                 ->whereIn('type', $type)
-                                ->where('notifiable_type', 'orm_staff_user_model')
+                                ->whereIn('notifiable_type', ['staff_user','staff_user_model', 'orm_staff_user_model'])
                                 ->where('notifiable_id', $_SESSION['staff_id'])
                                 ->skip($skip)
                                 ->take($size)
-                                ->orderBy('created_at', 'dsec')
+                                ->orderBy('created_at', 'desc')
                                 ->get();
 
         $notifications_list = array();