新品发布api

app/Http/Controllers/Admin/Furniture/Newgoods/CommentController.php

@@ -23,6 +23,8 @@ class CommentController extends Controller
 
     function index(Request $request) {
         $search['keyword'] = $request->input('keyword');
+        $search['store_id'] = $this->getStoreId();
+
         $query = $this->repository->pushCriteria(new MultiWhere($search));
 
         if(isset($request['sort_field']) && $request['sort_field'] && isset($request['sort_field_by'])) {
@@ -62,6 +64,8 @@ class CommentController extends Controller
      */
     private function _createSave(){
         $data = (array) request('data');
+        $data['store_id'] =$this->getStoreId();
+
         $id = $this->repository->create($data);
         if($id) {
             $url[] = array('url'=>U( 'Furniture/Newgoods/Comment/index'),'title'=>'返回列表');

app/Http/Controllers/Admin/Furniture/Newgoods/InfoController.php

@@ -30,6 +30,8 @@ class InfoController extends Controller
     function index(Request $request)
     {
         $search['keyword'] = $request->input('keyword');
+        $search['store_id'] = $this->getStoreId();
+
         $query = $this->repository->pushCriteria(new MultiWhere($search));
 
         if (isset($request['sort_field']) && $request['sort_field'] && isset($request['sort_field_by'])) {
@@ -71,6 +73,7 @@ class InfoController extends Controller
     private function _createSave()
     {
         $data = (array)request('data');
+        $data['store_id'] =$this->getStoreId();
         $id = $this->repository->create($data);
         if ($id) {
             $url[] = array('url' => U('Furniture/Newgoods/Info/index'), 'title' => '返回列表');

app/Http/Controllers/Api/V1/Controller.php

@@ -22,7 +22,7 @@ class Controller extends BaseController
         $this->middleware('auth:api', [
             'except' => [
                 'upload', 'getCode', 'reset', 'login', 'get', 'register', 'alipayNotify', 'wechatpayNotify', 'get', 'area', 'get_province', 'get_city', 'get_county', 'albumStyle', 'test', 'index', 'companyInfo', 'shop2', 'cardIndex', 'cardUserInfo', 'cardUserProgress', 'cardUserHonor', 'cardUserProject', 'CardUserTrend', 'projectDetail', 'trendDetail', 'albumSetting', 'albumXyxLogin', 'albumCat', 'albumchecklogin', 'albumGoods', 'albumGoodsDetail', 'albumSetPrice', 'albumXcxLogin', 'albumContentList', 'albumSearchGoods','albumContentDetail','albumFavoriteList','albumAddFavorite','albumFavoriteDel','getAttr','getOrder','getProgress','getReviewCount', 'furnitureNewsDetail','furnitureSetting','furnitureXcxLogin','furnitureGoodsList','serviceLogin','getFurnitureAds','getPhoneNumber','getQrcode','orderCount','searchList','printOrder','saveFormId','furnitureNewsList','getMoreComments','addToLike','albumSavePhone',
-                'albumGetWatchRecord','albumSetWatch','albumGetCartOfWatch','albumSaveFormId','albumAddAgent','albumGetBanner','albumGetDataGoods'
+                'albumGetWatchRecord','albumSetWatch','albumGetCartOfWatch','albumSaveFormId','albumAddAgent','albumGetBanner','albumGetDataGoods','newgoods_list','newgoods_index'
             ]
         ]);
 

app/Http/Controllers/Api/V1/FurnitureController.php

@@ -15,6 +15,9 @@ use App\Models\AlbumReviewModel;
 use App\Models\AlbumUserModel;
 use App\Models\FurnitureFormidModel;
 use App\Models\FurnitureGoodsModel;
+use App\Models\FurnitureNewgoodsBookingModel;
+use App\Models\FurnitureNewgoodsCommentModel;
+use App\Models\FurnitureNewgoodsInfoModel;
 use App\Models\UserInfoModel;
 use Carbon\Carbon;
 use Illuminate\Http\Request;
@@ -572,6 +575,334 @@ class FurnitureController extends Controller
         return $this->api(compact('comments', 'comments_replys'));
     }
 
+
+    /**
+     * @api {get} /api/furniture/newgoods_list 新品发布列表
+     * @apiDescription 获取新品发布列表(news_list)
+     * @apiGroup Furniture
+     * @apiPermission none
+     * @apiVersion 0.1.0
+     * @apiParam {int}    store_id  商户id 模拟值为1
+     * @apiSuccessExample {json} Success-Response:
+     * {
+     * "status": true,
+     * "status_code": 0,
+     * "message": "",
+     * "data": {
+     * "current_page": 1,
+     * "data": [
+     *      {
+     *          "id": 1,                    //id
+     *          "title": "新品测试1",        //标题
+     *          "thumb": "https://t6.9026.com/upload/img/20181119/4ee5baa103921e9d40e1c291d3c64f29.jpg",  //缩略图
+     *          "content": "<p>这是一个新品测试</p>",     //详情
+     *          "comments_field_1": "外观",             //用户自定义的评价字段
+     *          "comments_field_2": "实用性",
+     *          "comments_field_3": "质感",
+     *          "comments_field_4": "舒适度",
+     *          "sort": 100,
+     *          "created_at": "2018-12-20 10:13:14",
+     *          "updated_at": "2018-12-20 10:13:14",
+     *          "store_id": 1,
+     *          "comments_total": 2,                  //评价总量
+     *      }
+     *      ],
+     *      "first_page_url": "http://local.furniture.com/api/furniture/newgoods_list?page=1",
+     *      "from": 1,
+     *      "last_page": 1,
+     *      "last_page_url": "http://local.furniture.com/api/furniture/newgoods_list?page=1",
+     *      "next_page_url": null,
+     *      "path": "http://local.furniture.com/api/furniture/newgoods_list",
+     *      "per_page": 10,
+     *      "prev_page_url": null,
+     *      "to": 1,
+     *      "total": 1
+     *      }
+     * }
+     * @apiErrorExample {json} Error-Response:
+     * HTTP/1.1 400 Bad Request
+     * {
+     *     "state": false,
+     *     "code": 1000,
+     *     "message": "传入参数不正确",
+     *     "data": null or []
+     * }
+     * 可能出现的错误代码：
+     *    1000    CLIENT_WRONG_PARAMS             传入参数不正确
+     */
+    public function newgoods_list(Request $request)
+    {
+        $validator = Validator::make($request->all(), [
+            'store_id' => 'required',
+        ], [
+            'store_id.required' => '店铺信息未知',
+        ]);
+        if ($validator->fails()) {
+            return $this->validatorError($validator->messages()->all(), ErrorCode::CLIENT_WRONG_PARAMS, '');
+        }
+
+        $store_id = $request->store_id;
+
+        $list = FurnitureNewgoodsInfoModel::where('store_id', $store_id)->orderBy('sort', 'desc')->paginate(10);
+        foreach ($list as $item) {
+            $item->comments_total = $item->comments->count();
+        }
+        return $this->api($list);
+    }
+
+
+    /**
+     * @api {get} /api/furniture/newgoods_index 新品发布详情
+     * @apiDescription 获取新品发布详情(news_index)
+     * @apiGroup Furniture
+     * @apiPermission none
+     * @apiVersion 0.1.0
+     * @apiParam {int}    store_id  商户id 模拟值为1
+     * @apiParam {int}    id  新品id 模拟值为1
+     * @apiSuccessExample {json} Success-Response:
+     * {
+     * "status": true,
+     * "status_code": 0,
+     * "message": "",
+     * "data": {
+     * "newgoods": {
+     * "id": 1,
+     * "title": "新品测试1",         //标题
+     * "thumb": "https://t6.9026.com/upload/img/20181119/4ee5baa103921e9d40e1c291d3c64f29.jpg",  //缩略图
+     * "content": "<p>这是一个新品测试</p>",       //详情
+     * "comments_field_1": "外观",               //评价1字段名称
+     * "comments_field_2": "实用性",
+     * "comments_field_3": "质感",
+     * "comments_field_4": "舒适度",
+     * "sort": 100,
+     * "created_at": "2018-12-20 10:13:14",
+     * "updated_at": "2018-12-20 10:13:14",
+     * "store_id": 1,
+     * "comments_avg_1": "5.0000",             //字段1平均分
+     * "comments_avg_2": "4.0000",
+     * "comments_avg_3": "3.0000",
+     * "comments_avg_4": "3.0000"
+     * },
+     * "comments": [
+     * {
+     * "id": 2,
+     * "user_id": 152,
+     * "newgoods_id": 1,
+     * "comments_field_1": 5,          //字段1评分
+     * "comments_field_2": 4,
+     * "comments_field_3": 3,
+     * "comments_field_4": 3,
+     * "content": "第一条评价",         //评价详情
+     * "created_at": null,
+     * "updated_at": null,
+     * "store_id": 1,
+     * "username": "哈哈哈",           //用户姓名
+     * "avatar": "https://wx.qlogo.cn/mmopen/vi_32/yx8xw9O4WzvbGFLlqyRRNiciaNKM8V2wiasXrPCGUdB26D060FXUeIwiaAVzoOMibXUE9jhPkLsUz1UIpaTv71mYM4A/132"    //用户头像
+     * }
+     * ]
+     * }
+     * }
+     * @apiErrorExample {json} Error-Response:
+     * HTTP/1.1 400 Bad Request
+     * {
+     *     "state": false,
+     *     "code": 1000,
+     *     "message": "传入参数不正确",
+     *     "data": null or []
+     * }
+     * 可能出现的错误代码：
+     *    1000    CLIENT_WRONG_PARAMS             传入参数不正确
+     */
+    public function newgoods_index(Request $request)
+    {
+        $validator = Validator::make($request->all(), [
+            'store_id' => 'required',
+            'id' => 'required'
+        ], [
+            'store_id.required' => '店铺信息未知',
+            'id.required' => '新品ID未知',
+        ]);
+
+        if ($validator->fails()) {
+            return $this->validatorError($validator->messages()->all(), ErrorCode::CLIENT_WRONG_PARAMS, '');
+        }
+
+        $newgoods = FurnitureNewgoodsInfoModel::find($request->get('id'));
+        $comments = $newgoods->comments()->paginate(10);
+        foreach ($comments as $item) {
+            $item->username = $item->user->username;
+            $item->avatar = $item->user->avatar;
+            unset($item->user);
+        }
+
+        $newgoods->comments_avg_1 = FurnitureNewgoodsCommentModel::where('newgoods_id', $request->get('id'))->select(\DB::raw('AVG(comments_field_1) as field'))->first()->field;
+        $newgoods->comments_avg_2 = FurnitureNewgoodsCommentModel::where('newgoods_id', $request->get('id'))->select(\DB::raw('AVG(comments_field_2) as field'))->first()->field;
+        $newgoods->comments_avg_3 = FurnitureNewgoodsCommentModel::where('newgoods_id', $request->get('id'))->select(\DB::raw('AVG(comments_field_3) as field'))->first()->field;
+        $newgoods->comments_avg_4 = FurnitureNewgoodsCommentModel::where('newgoods_id', $request->get('id'))->select(\DB::raw('AVG(comments_field_4) as field'))->first()->field;
+        return $this->api(compact('newgoods', 'comments'));
+    }
+
+
+    /**
+     * @api {post} /api/furniture/newgoods_addcomment 添加评论
+     * @apiDescription 添加评论(newgoods_addcomment)
+     * @apiGroup Furniture
+     * @apiPermission none
+     * @apiVersion 0.1.0
+     * @apiParam {int}    store_id  商户id 模拟值为1
+     * @apiParam {int}    newgoods_id  新品id 模拟值为1
+     * @apiParam {int}    comments_field_1  字段1评分 1-5
+     * @apiParam {int}    comments_field_2  字段1评分 1-5
+     * @apiParam {int}    comments_field_3  字段1评分 1-5
+     * @apiParam {int}    comments_field_4  字段1评分 1-5
+     * @apiParam {string}    [content]  评论详情
+     * @apiParam {array}     [picture]  图片
+     * @apiSuccessExample {json} Success-Response:
+     * {
+     * "status": true,
+     * "status_code": 0,
+     * "message": "",
+     * "data": {
+     * "store_id": "1",
+     * "newgoods_id": "1",
+     * "comments_field_1": "3",
+     * "comments_field_2": "4",
+     * "comments_field_3": "5",
+     * "comments_field_4": "2",
+     * "user_id": 151,
+     * "updated_at": "2018-12-20 16:56:46",
+     * "created_at": "2018-12-20 16:56:46",
+     * "id": 3
+     * }
+     * }
+     * @apiErrorExample {json} Error-Response:
+     * HTTP/1.1 400 Bad Request
+     * {
+     *     "state": false,
+     *     "code": 1000,
+     *     "message": "传入参数不正确",
+     *     "data": null or []
+     * }
+     * 可能出现的错误代码：
+     *    1000    CLIENT_WRONG_PARAMS             传入参数不正确
+     */
+    public function newgoods_addcomment(Request $request)
+    {
+        $user = Auth('api')->user();
+        if (!$user) {
+            $data = [
+                'code' => 401,
+                'msg' => 'token已过期，请重新登录'
+            ];
+            return $this->api($data);
+        }
+        $validator = Validator::make($request->all(), [
+            'store_id' => 'required',
+            'newgoods_id' => 'required',
+            'comments_field_1' => 'required',
+            'comments_field_2' => 'required',
+            'comments_field_3' => 'required',
+            'comments_field_4' => 'required',
+        ], [
+            'store_id.required' => '店铺信息未知',
+            'newgoods_id.required' => '新品ID未知',
+            'comments_field_1.required' => '字段1不能为空',
+            'comments_field_2.required' => '字段2不能为空',
+            'comments_field_3.required' => '字段3不能为空',
+            'comments_field_4.required' => '字段4不能为空',
+        ]);
+
+        if ($validator->fails()) {
+            return $this->validatorError($validator->messages()->all(), ErrorCode::CLIENT_WRONG_PARAMS, '');
+        }
+        $data = $request->all();
+
+        if (isset($data['picture'])) {
+            $data['picture'] = implode(',', $data['picture']);
+        }
+        $data['user_id'] = $user->id;
+
+        $res = FurnitureNewgoodsCommentModel::create($data);
+
+        return $this->api($res);
+    }
+
+    /**
+     * @api {post} /api/furniture/newgoods_addbooking 添加预售
+     * @apiDescription 添加预售(newgoods_addbooking)
+     * @apiGroup Furniture
+     * @apiPermission none
+     * @apiVersion 0.1.0
+     * @apiParam {int}    store_id  商户id 模拟值为1
+     * @apiParam {int}    newgoods_id  新品id 模拟值为1
+     * @apiParam {int}    phone  电话
+     * @apiParam {string}    receiver_name  姓名
+     * @apiParam {string}    receiver_address  地址
+     * @apiSuccessExample {json} Success-Response:
+     * {
+     * "status": true,
+     * "status_code": 0,
+     * "message": "",
+     * "data": {
+     * "store_id": "1",
+     * "newgoods_id": "1",
+     * "phone": 15178654534,
+     * "receiver_name": '陈',
+     * "receiver_address": '丽都路700好',
+     * "updated_at": "2018-12-20 16:56:46",
+     * "created_at": "2018-12-20 16:56:46",
+     * "id": 3
+     * }
+     * }
+     * @apiErrorExample {json} Error-Response:
+     * HTTP/1.1 400 Bad Request
+     * {
+     *     "state": false,
+     *     "code": 1000,
+     *     "message": "传入参数不正确",
+     *     "data": null or []
+     * }
+     * 可能出现的错误代码：
+     *    1000    CLIENT_WRONG_PARAMS             传入参数不正确
+     */
+    public function newgoods_addbooking(Request $request)
+    {
+        $user = Auth('api')->user();
+        if (!$user) {
+            $data = [
+                'code' => 401,
+                'msg' => 'token已过期，请重新登录'
+            ];
+            return $this->api($data);
+        }
+
+        $validator = Validator::make($request->all(), [
+            'store_id' => 'required',
+            'newgoods_id' => 'required',
+            'phone' => 'required',
+            'receiver_name' => 'required',
+            'receiver_address' => 'required',
+
+        ], [
+            'store_id.required' => '店铺信息未知',
+            'newgoods_id.required' => '新品ID未知',
+            'phone.required' => '电话号码不能为空',
+            'receiver_name.required' => '收货人不能为空',
+            'receiver_address.required' => '收货地址不能为空',
+
+        ]);
+
+        if ($validator->fails()) {
+            return $this->validatorError($validator->messages()->all(), ErrorCode::CLIENT_WRONG_PARAMS, '');
+        }
+        $data = $request->all();
+        $data['user_id'] = $user->id;
+
+        $res = FurnitureNewgoodsBookingModel::create($data);
+
+        return $this->api($res);
+    }
+
     /**
      * @api {get} /api/furniture/goods_list 获取产品列表
      * @apiDescription 获取产品列表(goods_list)
@@ -1977,7 +2308,7 @@ class FurnitureController extends Controller
             if (count($parts)) {
                 $content .= "配件：";
                 foreach ($parts as $part) {
-                    $content .= "<C>".$part->name.'------'.$part->count . "</C><BR>";
+                    $content .= "<C>" . $part->name . '------' . $part->count . "</C><BR>";
                 };
             }
         }
@@ -2001,7 +2332,7 @@ class FurnitureController extends Controller
             if (count($parts)) {
                 $content .= "配件：";
                 foreach ($parts as $part) {
-                    $content .= "<C>".$part->name.'------'.$part->count . "</C><BR>";
+                    $content .= "<C>" . $part->name . '------' . $part->count . "</C><BR>";
                 };
             }
             $content .= "逾期时间：" . $order->expected_time . "<BR>";

app/Models/FurnitureNewgoodsBookingModel.php

@@ -40,6 +40,7 @@ class FurnitureNewgoodsBookingModel extends BaseModel
         'receiver_name',
         'receiver_address',
         'receiver_remark',
+        'store_id'
     ];
 
     public function user(){

app/Models/FurnitureNewgoodsCommentModel.php

@@ -40,7 +40,8 @@ class FurnitureNewgoodsCommentModel extends BaseModel
         'comments_field_2',
         'comments_field_3',
         'comments_field_4',
-        'content'
+        'content',
+        'store_id'
     ];
 
     public function user(){

app/Models/FurnitureNewgoodsInfoModel.php

@@ -41,7 +41,11 @@ class FurnitureNewgoodsInfoModel extends BaseModel
         'comments_field_2',
         'comments_field_3',
         'comments_field_4',
-        'sort'
+        'sort',
+        'store_id'
     ];
 
+    public function comments(){
+        return $this->hasMany('App\Models\FurnitureNewgoodsCommentModel', 'newgoods_id');
+    }
 }

app/Repositories/Furniture/Newgoods/Criteria/MultiWhere.php

@@ -9,12 +9,11 @@
 namespace App\Repositories\Furniture\Newgoods\Criteria;
 
 
-
-
 use App\Repositories\Base\Criteria;
 use App\Repositories\Contracts\RepositoryInterface as Repository;
 
-class MultiWhere extends Criteria {
+class MultiWhere extends Criteria
+{
 
     private $search = [];
 
@@ -29,17 +28,19 @@ class MultiWhere extends Criteria {
     }
 
     /**
-    * @param $model
-    * @param RepositoryInterface $repository
-    * @return mixed
-    */
+     * @param $model
+     * @param RepositoryInterface $repository
+     * @return mixed
+     */
     public function apply($model, Repository $repository)
     {
-          if(isset($this->search['updated_at']) && $this->search['updated_at']) {
-                                    $model = $model->where('updated_at',$this->search['updated_at']);
-                                 }
+        if (isset($this->search['keyword']) && $this->search['keyword']) {
+            $model = $model->where('title','like','%'.$this->search['keyword'].'%');
+        }
+
+        $model = $model->where('store_id', $this->search['store_id']);
 
-         return $model;
+        return $model;
     }
 
 }

database/migrations/2018_12_20_094603_create_furniture_newgoods_info_table.php

@@ -23,6 +23,7 @@ class CreateFurnitureNewgoodsInfoTable extends Migration
             $table->string('comments_field_3',255)->nullable()->comment('评价题目3');
             $table->string('comments_field_4',255)->nullable()->comment('评价题目4');
             $table->integer('sort')->nullable()->default(0)->comment('排序，越大越靠前');
+            $table->integer('store_id')->comment('店铺ID');
 
             $table->timestamps();
         });

database/migrations/2018_12_20_094625_create_furniture_newgoods_booking_table.php

@@ -22,6 +22,7 @@ class CreateFurnitureNewgoodsBookingTable extends Migration
             $table->string('receiver_name',255)->comment('收货人姓名');
             $table->string('receiver_address',255)->comment('收货人地址');
             $table->string('remark',255)->nullable()->comment('收货人地址');
+            $table->integer('store_id')->comment('店铺ID');
 
             $table->timestamps();
         });

database/migrations/2018_12_20_094647_create_furniture_newgoods_comment_table.php

@@ -22,6 +22,7 @@ class CreateFurnitureNewgoodsCommentTable extends Migration
             $table->integer('comments_field_3')->comment('评价条目3评分');
             $table->integer('comments_field_4')->comment('评价条目4评分');
             $table->text('content')->nullable()->comment('评论详情');
+            $table->integer('store_id')->comment('店铺ID');
 
             $table->timestamps();
         });

public/apidoc/api_project.js

@@ -1,16 +1 @@
-define({
-  "name": "模板1",
-  "version": "0.1.0",
-  "description": "模板1接口",
-  "title": "MB",
-  "url": "https://t6.9026.com",
-  "sampleUrl": false,
-  "defaultVersion": "0.0.0",
-  "apidoc": "0.3.0",
-  "generator": {
-    "name": "apidoc",
-    "time": "2018-12-14T02:43:54.482Z",
-    "url": "http://apidocjs.com",
-    "version": "0.17.6"
-  }
-});
+define({
  "name": "模板1",
  "version": "0.1.0",
  "description": "模板1接口",
  "title": "MB",
  "url": "https://t6.9026.com",
  "sampleUrl": false,
  "defaultVersion": "0.0.0",
  "apidoc": "0.3.0",
  "generator": {
    "name": "apidoc",
    "time": "2018-12-20T09:12:50.324Z",
    "url": "http://apidocjs.com",
    "version": "0.17.6"
  }
});

public/apidoc/api_project.json

@@ -1,16 +1 @@
-{
-  "name": "模板1",
-  "version": "0.1.0",
-  "description": "模板1接口",
-  "title": "MB",
-  "url": "https://t6.9026.com",
-  "sampleUrl": false,
-  "defaultVersion": "0.0.0",
-  "apidoc": "0.3.0",
-  "generator": {
-    "name": "apidoc",
-    "time": "2018-12-14T02:43:54.482Z",
-    "url": "http://apidocjs.com",
-    "version": "0.17.6"
-  }
-}
+{
  "name": "模板1",
  "version": "0.1.0",
  "description": "模板1接口",
  "title": "MB",
  "url": "https://t6.9026.com",
  "sampleUrl": false,
  "defaultVersion": "0.0.0",
  "apidoc": "0.3.0",
  "generator": {
    "name": "apidoc",
    "time": "2018-12-20T09:12:50.324Z",
    "url": "http://apidocjs.com",
    "version": "0.17.6"
  }
}

routes/api.php

@@ -405,5 +405,22 @@ $api->version('v1', ['namespace' => 'App\Http\Controllers\Api\V1'], function ($a
         'uses' => 'FurnitureController@addToLike',
     ]);
 
+    $api->get('furniture/newgoods_list', [
+        'as' => 'furniture.newgoods_list',
+        'uses' => 'FurnitureController@newgoods_list',
+    ]);
+    $api->get('furniture/newgoods_index', [
+        'as' => 'furniture.newgoods_index',
+        'uses' => 'FurnitureController@newgoods_index',
+    ]);
+    $api->post('furniture/newgoods_addcomment', [
+        'as' => 'furniture.newgoods_addcomment',
+        'uses' => 'FurnitureController@newgoods_addcomment',
+    ]);
+    $api->post('furniture/newgoods_addbooking', [
+        'as' => 'furniture.newgoods_addbooking',
+        'uses' => 'FurnitureController@newgoods_addbooking',
+    ]);
+
 
 });