wesmiler 报恩寺项目提交

app/Http/Controllers/Api/v1/MasterController.php

@@ -47,6 +47,15 @@ class MasterController extends BaseController
         return $this->service->advice($this->userId);
     }
 
+
+    /**
+     * 咨询记录
+     * @return array
+     */
+    public function adviceList(){
+        return $this->service->adviceList($this->userId);
+    }
+
     /**
      * 打分
      * @return array

app/Services/MasterService.php

@@ -138,6 +138,11 @@ class MasterService extends BaseService
         return $info;
     }
 
+    /**
+     * 打分
+     * @param $userId
+     * @return array
+     */
     public function score($userId){
         $params = request()->all();
         $masterUid = isset($params['id'])? $params['id'] : 0;
@@ -146,6 +151,10 @@ class MasterService extends BaseService
             return message('法师参数错误', false);
         }
 
+        if($masterUid == $userId){
+            return message('不能给自己打分', false);
+        }
+
         if($score<=0 || $score>5){
             return message('评分参数错误，请选择1-5评分', false);
         }
@@ -185,6 +194,11 @@ class MasterService extends BaseService
         }
     }
 
+    /**
+     * 咨询
+     * @param $userId
+     * @return array
+     */
     public function advice($userId){
         $params = request()->all();
         $masterUid = isset($params['id'])? $params['id'] : 0;
@@ -229,6 +243,42 @@ class MasterService extends BaseService
         }
     }
 
+
+    /**
+     * 咨询记录
+     * @return array
+     */
+    public function adviceList(){
+        $params = request()->all();
+        $page = isset($params['pageSize']) ? intval($params['pageSize']) : PAGE;
+        $pageSize = isset($params['pageSize']) ? intval($params['pageSize']) : PERPAGE;
+        $masterUid = isset($params['id'])? $params['id'] : 0;
+
+        $dataList = $this->model::from('master_advice as ma')
+            ->leftJoin('member as m','m.id','=','ma.user_id')
+            ->where(['ma.status'=> 1,'m.mark'=> 1,'m.status'=> 1,'ma.master_uid'=> $masterUid])
+            ->where('m.id','>', 0)
+            ->select('ms.*','m.nickname','m.avatar')
+            ->orderBy('ms.create_time', 'desc')
+            ->paginate($pageSize);
+
+        $dataList = $dataList ? $dataList->toArray() : [];
+        if ($dataList) {
+            foreach ($dataList['data'] as &$item) {
+                $item['avatar'] = $item['avatar']? get_image_url($item['avatar']):'';
+                $item['create_time'] = $item['create_time']? datetime($item['create_time'],'Y-m-d H:i:s') : '';
+            }
+        }
+
+        return [
+            'code' => 0,
+            'success'=> true,
+            'msg' => '操作成功',
+            'count' => isset($dataList['total']) ? $dataList['total'] : 0,
+            'data' => isset($dataList['data']) ? $dataList['data'] : 0,
+        ];
+    }
+
     /**
      * 申请提交
      * @param $userId