修补api/gm接口的几处错误

ctms-api/controllers/gm/v1/NoticeController.php

@@ -36,10 +36,10 @@ class NoticeController extends Common
 		    if (!$res) {
 			    $this->result('没有查询到相应的数据！', [], 0);
 	        }
-			
+			$notices = $this->formatList($res);
 	        $data= [
 	            'total'=>intval($s['query']->count()),
-		        'news' => $res,
+		        'notices' => $notices,
 	            'page'=>$this->page
 	        ];
 		    $this->result('通知查询成功！', $data, 200);
@@ -58,7 +58,7 @@ class NoticeController extends Common
 				if($sn) $res->sn = $sn;
 				$res->save();
 			}
-			$this->result('文章信息查询完成', $res->toArray(), 200);
+			$this->result('通知信息查询完成', $res->toArray(), 200);
 		}
 		
 		public function actionAdd()
@@ -133,20 +133,20 @@ class NoticeController extends Common
 					$detail->is_show = 0;
 					$res = $detail->save();
 					if ($res) {
-						$msg = '文章隐藏标记成功';
+						$msg = '通知隐藏标记成功';
 						$errorCode = 200;
 					} else {
-						$msg = '文章隐藏标记失败';
+						$msg = '通知隐藏标记失败';
 					}
 					break;
 				case 'show':
 					$detail->is_show = 1;
 					$res = $detail->save();
 					if ($res) {
-						$msg = '文章显示标记成功';
+						$msg = '通知显示标记成功';
 						$errorCode = 200;
 					} else {
-						$msg = '文章显示标记失败';
+						$msg = '通知显示标记失败';
 					}
 					break;
 				default:
@@ -176,9 +176,11 @@ class NoticeController extends Common
 				$data = $data->andwhere($where2);
 			}
 			$pages = new Pagination(['totalCount' => $data->count(), 'pageSize' => $this->pageSize]);
-			$res = $data->offset($pages->offset)->limit($pages->limit)->orderBy('order_by DESC')->all();
-			
-			return ['res'=>$res,'query'=>$data];
+			$query = $data->offset($pages->offset)->limit($pages->limit);
+			//->orderBy('order_by DESC')
+			$res = $query->all();
+			$arr = $query->asArray()->all();
+			return ['res'=>$res,'query'=>$data,'arr'=>$arr];
 		}
 		
 		/*
@@ -266,4 +268,24 @@ class NoticeController extends Common
 			
 			return $data;
 	    }
+		
+		private function formatList($res)
+    {
+        $unsets = ['pid','create_at','deleted'];
+	    $list = [];
+        foreach ($res as $s) {
+            $s = $s->toArray();
+            foreach ($unsets as $us) {
+                unset($s[$us]);
+            }
+
+            $weekdays = [0=>'日',1=>'一',2=>'二',3=>'三',4=>'四',5=>'五',6=>'六'];
+            $wk = date('w', $s['update_at']);
+            $s['updateTime'] = date('Y-m-d ', $s['update_at']) . '星期'.$weekdays[$wk];
+            $list[] = $s;
+        }
+        unset($s);
+
+        return $list;
+    }
 }