Merge branch 'master' of http://git.quyaqu.com/sunlight/menu

app/Api/V1/Controllers/FeaturesController.php

@@ -9,9 +9,11 @@ use App\Models\SearchRecord;
 use App\Models\SearchStatistics;
 use App\Models\Tag;
 use App\Models\UserMessage;
+use App\Models\Special;
+use App\Models\News;
 use Illuminate\Http\Request;
 use Solr;
-
+use DB;
 class FeaturesController extends BaseController
 {
 
@@ -188,4 +190,101 @@ class FeaturesController extends BaseController
     {
         SearchRecord::insertSearchValue($value, $type);
     }
+
+    //早中晚专题
+    public function earlyMiddleAndLateTheme(Request $request){
+        $data=Special::whereIn('title',['上午','中午','下午'])->get();
+        if (!$data) {
+            return $this->response->array(self::returnValue(['data' => 'Database error'], 9999));
+        }
+        return $this->response->array(self::returnValue(['data' => $data], 200));
+    }
+    //其他专题
+
+    /**
+     * @param Request $request
+     * @return mixed
+     */
+    public function otherTheme(Request $request){
+        $today=strtotime(date('Y-m-d'));
+        $data=Special::whereNotIn('title',['上午','中午','下午'])->where('status',1)->where('releaseTime','<',$today)->get();
+        $data=json_decode(json_encode($data),true);
+        $json_menu_idarr=Special::whereNotIn('title',['上午','中午','下午'])->where('status',1)->pluck('contain_recipes');
+        $json_menu_idarr=json_decode(json_encode($json_menu_idarr),true);
+        $initArr=array();
+        foreach($json_menu_idarr as $item){
+            if($item){
+                $initArr=array_merge($initArr,explode(',',$item));
+            }
+        }
+        $initArr=array_unique($initArr);
+        $menuAll=DB::table('menu')->whereIn('id',$initArr)->where('status',1)->get();
+        $menuAll=json_decode(json_encode($menuAll),true);
+        $middleArr=array();
+        foreach($menuAll as $item){
+            $middleArr["".$item['id']]=$item;
+        }
+        foreach($data as $key=>$item){
+            if($item['contain_recipes']){
+                foreach(explode(',',$item['contain_recipes']) as $inneritem){
+                    $data[$key]['menuList'][]=$middleArr[$inneritem];
+                }
+            }
+        }
+        return $this->response->array(self::returnValue(['data' => $data], 200));
+    }
+    public function theLastRecipes(Request $request){
+        $data=Menu::where('status',1)->orderBy('created_at','desc')->limit(50)->get();
+        if (!$data) {
+            return $this->response->array(self::returnValue(['data' => 'Database error'], 9999));
+        }
+        return $this->response->array(self::returnValue(['data' => $data], 200));
+    }
+    public function menuList(Request $request){
+        $id=$request->input('id');
+        $special=Special::where('id',$id)->first();
+        if($special['title']=='上午' || $special['title']=='中午' || $special['title']=='下午'){
+            $contain_recipes_time=json_decode($special['contain_recipes_time']);
+            $idArr=array();
+            $today=date('Y-m-d');
+            foreach($contain_recipes_time as $key=>$value){
+                if($value < $today){
+                    $idArr[]=$key;
+                }
+            }
+            $lastarr=explode(',',$special['contain_recipes']);
+            $idArr=array_intersect_assoc($idArr,$lastarr);
+        }else{
+            $idArr=explode(',',$special['contain_recipes']);
+        }
+        $menuList=Menu::whereIn('id',$idArr)->get();
+        return $this->response->array(self::returnValue(['data' => $menuList], 200));
+    }
+
+    public function menuDetail(Request $request){
+        $id=$request->input('id');
+        $menu=Menu::where('id',$id)->first();
+        $init=array();
+        $list=explode(',',$menu['ingredients']);
+        foreach($list as $item){
+            $origin=explode(':',$item);
+            $init[$origin[0]]=$origin[1];
+        }
+        $menu['ingredients']=$init;
+        $menuDetail=DB::table('menu_step')->where('menu_id',$id)->get();
+        return $this->response->array(self::returnValue(['data' => $menu,'detailData'=>$menuDetail], 200));
+    }
+
+    public function articleList(Request $request){
+        $page=$request->has('page')?$request->input('page'):1;
+        $start=intval((intval($page)-1)*intval(20));
+        $data=News::where('status',1)->select('id','imgurl','title','createTime')->orderBy('createTime','desc')->offset($start)->limit(20)->get();
+        return $this->response->array(self::returnValue(['data' => $data], 200));
+    }
+    public function articleDetail(Request $request){
+        $id=$request->input('id');
+        $articleDetail=News::where('id',$id)->first();
+        $articleDetail['content'] = str_replace(array("\r\n", "\r", "\n"), "", $articleDetail['content']);
+        return $this->response->array(self::returnValue(['data' => $articleDetail], 200));
+    }
 }

app/Models/News.php

@@ -0,0 +1,11 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Model;
+
+class News extends Model
+{
+    protected $table   = 'news';
+    public $timestamps = false;
+}

app/Models/Special.php

@@ -0,0 +1,11 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Model;
+
+class Special extends Model
+{
+    protected $table   = 'special';
+    public $timestamps = false;
+}

config/app.php

@@ -64,7 +64,7 @@ return [
     |
     */
 
-    'timezone' => 'UTC',
+    'timezone' => 'PRC',
 
     /*
     |--------------------------------------------------------------------------

public/index.php

@@ -6,7 +6,7 @@
  * @package  Laravel
  * @author   Taylor Otwell <taylor@laravel.com>
  */
-require __DIR__ . '/../app/check/check.php';
+//require __DIR__ . '/../app/check/check.php';
 /*
 |--------------------------------------------------------------------------
 | Register The Auto Loader

routes/api.php

@@ -31,6 +31,27 @@ $api->version('v1', ['namespace' => 'App\Api\V1\Controllers'], function ($api) {
     //收藏
     $api->post('features/addCollection', 'FeaturesController@addCollection');
 
+    //2.0菜谱
+    //早中晚专题
+    $api->post('features/earlyMiddleAndLateTheme', 'FeaturesController@earlyMiddleAndLateTheme');
+    //其他专题
+    $api->post('features/otherTheme', 'FeaturesController@otherTheme');
+    //最近50条菜谱
+    $api->post('features/theLastRecipes', 'FeaturesController@theLastRecipes');
+
+    //菜谱列表详情
+    $api->post('features/menuList', 'FeaturesController@menuList');
+
+    //菜谱详情
+    $api->post('features/menuDetail', 'FeaturesController@menuDetail');
+
+    //文章列表
+    $api->post('features/articleList', 'FeaturesController@articleList');
+
+    //文章详情
+    $api->post('features/articleDetail', 'FeaturesController@articleDetail');
+
+
     //发现页面
     $api->post('finds/getFinds', 'FindsController@getFinds');
 });