Merge branch 'develop'

app/Http/Controllers/ConfigController.php

@@ -105,7 +105,7 @@ class ConfigController extends Controller
                 ],
                 //消息类型
                 'message_type' =>[
-                    'star' => '星球活动消息',
+                    'star' => '后院活动消息',
                     'system' => '系统通知消息'
                 ],
                 //对应商城

app/Http/Controllers/V2/ComplaintSuggestionsController.php

@@ -0,0 +1,45 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: durong
+ * Date: 2019/7/25
+ * Time: 下午2:00
+ */
+namespace App\Http\Controllers\V2;
+
+use App\Http\Controllers\BaseController;
+use App\Repositories\ComplaintSuggestionsRepository;
+use App\Transformers\ComplaintSuggestionsTransformer;
+use League\Fractal\Pagination\IlluminatePaginatorAdapter;
+use League\Fractal\Resource\Collection;
+use League\Fractal\Manager;
+use Illuminate\Http\Request;
+
+class ComplaintSuggestionsController extends BaseController
+{
+    public function __construct(ComplaintSuggestionsRepository $complaintSuggestionsRepository)
+    {
+        $this->complaintSuggestionsRepository = $complaintSuggestionsRepository;
+    }
+    //投诉建议列表
+    public function index(Request $request)
+    {
+        $complaintSuggestions = $this->complaintSuggestionsRepository->index($request->all());
+
+        $fractal = new Manager();
+        $resource = new Collection($complaintSuggestions, new ComplaintSuggestionsTransformer());
+        $resource->setPaginator(new IlluminatePaginatorAdapter($complaintSuggestions));
+        $data = $fractal->createData($resource)->toArray();
+        $data['extra'] = [
+            'columns' => [
+                'id',
+                'mobile',
+                'upload_user',
+                'uid',
+                'content',
+                'created_at'
+            ]
+        ];
+        return $data;
+    }
+}

app/Http/Controllers/V2/StarNewsController.php

@@ -23,7 +23,7 @@ class StarNewsController extends BaseController
         $this->starNewsRepository = $starNewsRepository;
     }
 
-    //星球新闻列表
+    //后院新闻列表
     public function index(Request $request)
     {
         $starNews = $this->starNewsRepository->index($request->all());
@@ -51,7 +51,7 @@ class StarNewsController extends BaseController
         return $data;
     }
 
-    //新增星球新闻
+    //新增后院新闻
     public function create(Request $request)
     {
         $validator = Validator::make($request->all(), [
@@ -67,7 +67,7 @@ class StarNewsController extends BaseController
 
     }
 
-    //修改星球新闻
+    //修改后院新闻
     public function edit(Request $request)
     {
         $validator = Validator::make($request->all(), [
@@ -83,7 +83,7 @@ class StarNewsController extends BaseController
         return  $this->starNewsRepository->edit($request->all());
     }
 
-    //删除星球新闻
+    //删除后院新闻
     public function delete(Request $request)
     {
         $validator = Validator::make($request->all(), [
@@ -96,7 +96,7 @@ class StarNewsController extends BaseController
 
     }
 
-    //修改星球新闻状态
+    //修改后院新闻状态
     public function editStatus(Request $request)
     {
         $validator = Validator::make($request->all(), [

app/Models/ComplaintSuggestions.php

@@ -0,0 +1,14 @@
+<?php
+namespace App\Models;
+
+class ComplaintSuggestions extends BaseModel
+{
+    protected  $table = 'complaint_suggestions';
+    /**
+     * 可被批量赋值的字段
+     * @var array
+     */
+    protected $fillable = ['mobile','content','upload_user','uid'];
+
+
+}

app/Repositories/ComplaintSuggestionsRepository.php

@@ -0,0 +1,19 @@
+<?php
+namespace App\Repositories;
+use App\Models\ComplaintSuggestions;
+
+class ComplaintSuggestionsRepository
+{
+    public function __construct(ComplaintSuggestions $complaintSuggestions)
+    {
+        $this->complaintSuggestions = $complaintSuggestions;
+    }
+
+    public function index($request)
+    {
+        $perPage = isset($request['per_page']) ? $request['per_page'] : env('PER_PAGE');
+
+        return $this->complaintSuggestions->orderBy('id', 'desc')->paginate($perPage);
+
+    }
+}

app/Repositories/StarNewsRepository.php

@@ -74,7 +74,7 @@ class StarNewsRepository
         }
         $res = $starNew->save();
             if (!$res) {
-                throw new HttpException(500, '星球新闻更新失败');
+                throw new HttpException(500, '后院新闻更新失败');
             }
         }
 

app/Transformers/ComplaintSuggestionsTransformer.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace App\Transformers;
+
+use App\Models\ComplaintSuggestions;
+use League\Fractal\TransformerAbstract;
+
+class ComplaintSuggestionsTransformer extends TransformerAbstract
+{
+
+    public function transform(ComplaintSuggestions $complaintSuggestions)
+    {
+        return [
+            'id'  => $complaintSuggestions['id'],
+            'mobile'    => $complaintSuggestions['mobile'],
+            'upload_user'    => $complaintSuggestions['upload_user'],
+            'uid'    => $complaintSuggestions['uid'],
+            'content'    => $complaintSuggestions['content'],
+            'created_at'    => date($complaintSuggestions['created_at']),
+        ];
+    }
+}

database/migrations/2019_06_04_060233_create_message_rule.php

@@ -25,7 +25,7 @@ class CreateMessageRule extends Migration
 
             $table->string('message_type', 16)
                 ->default('system')
-                ->comment('消息类型:star星球活动消息;system系统通知消息');
+                ->comment('消息类型:star后院活动消息;system系统通知消息');
 
             $table->string('show_type', 16)
                 ->default('only_show')

database/migrations/2019_07_25_020244_create_complaint_suggestions_table.php

@@ -0,0 +1,35 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class CreateComplaintSuggestionsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('complaint_suggestions', function (Blueprint $table) {
+            $table->bigIncrements('id');
+            $table->string('mobile',16)->default('')->comment('预留手机号');
+            $table->string('upload_user')->default('')->comment('上传用户');
+            $table->integer('uid')->default(0)->comment('上传用户ID');
+            $table->string('content',255)->default('')->comment('投诉内容');
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('complaint_suggestions');
+    }
+}

routes/api.php

@@ -102,15 +102,15 @@ $api->version('v1', [
             //活动详情
             $api->get('activitiesView', 'ActivitiesController@view');
 
-            //星球新闻列表
+            //后院新闻列表
             $api->get('/starNews/lists', 'StarNewsController@index');
-            //新增星球新闻
+            //新增后院新闻
             $api->post('/starNews/create', 'StarNewsController@create');
-            //编辑星球新闻
+            //编辑后院新闻
             $api->put('/starNews/create', 'StarNewsController@edit');
-            //修改星球新闻状态
+            //修改后院新闻状态
             $api->put('/starNews/editStatus', 'StarNewsController@editStatus');
-            //删除星球新闻
+            //删除后院新闻
             $api->delete('/starNews/delete', 'StarNewsController@delete');
 
             //平台内容列表
@@ -119,6 +119,9 @@ $api->version('v1', [
             $api->post('/platformContent/create', 'PlatformContentController@create');
             //编辑平台内容
             $api->put('/platformContent/create', 'PlatformContentController@edit');
+
+            //投诉建议列表
+            $api->get('/complaintSuggestions/lists', 'ComplaintSuggestionsController@index');
         });
     });
 });