经纪人详情接口修改

application/api/controller/Broker.php

@@ -5,8 +5,8 @@ use app\api\extend\Basic;
 use app\model\Agents;
 use app\model\Evaluate;
 use app\model\EvaluateSign;
-use app\model\JournalAccounts;
-use think\Db;
+use app\model\Remarks;
+
 /**
  * Description of Agents
  *
@@ -132,12 +132,14 @@ class Broker extends Basic{
 
         return $this->response($data['status'], $data['msg'], $data['data']);
     }
-    
-    
+
     /**
      * 查询评论和成交记录
-     * 
-     * @return type
+     *
+     * @return \think\Response
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @throws \think\exception\DbException
      */
     public function  commentAndDeal() {
         $params = $this->params;
@@ -150,16 +152,16 @@ class Broker extends Basic{
             $pageSize = empty($params['pageSize']) ? PAGESIZE : $params['pageSize'];
             
             $evalutate = new Evaluate();
-            $journal  = new JournalAccounts();
+            $remarks  = new Remarks();
             
             $fields_evaluate = 'house_id,user_id,user_nick,user_phone,user_pic,evaluate_grade,evaluate_content,evaluate_sign,a.create_time,record_id,a.source';
-            $fields_journal  = 'a.house_id,j.singntime';
+            $fields_journal  = 'a.house_id,a.apply_id';
             switch ($params['type']) {
                 case 0:
                     //评价列表信息
                     $result['evaluate'] = $evalutate->getEvaluate($pageNo, $pageSize, 'a.id desc', $fields_evaluate, '', $params['agent_id']);
                     //成交记录
-                    $result['journalAccounts'] = $journal->getJournalHouseInfo($pageNo, $pageSize, 'j.id desc', $fields_journal, 'j.transaction_status = 3', $params['agent_id']);
+                    $result['journalAccounts'] = $remarks->getJournalHouseInfo($pageNo, $pageSize, 'a.id desc', $fields_journal, 'j.transaction_status = 3', $params['agent_id']);
                     $data['data'] = $result;
                     break;
                 case 1:
@@ -169,7 +171,7 @@ class Broker extends Basic{
                     break;
                 case 2:
                     //成交记录
-                    $result['journalAccounts'] = $journal->getJournalHouseInfo($pageNo, $pageSize, 'j.id desc', $fields_journal, 'j.transaction_status = 3', $params['agent_id']);
+                    $result['journalAccounts'] = $remarks->getJournalHouseInfo($pageNo, $pageSize, 'a.id desc', $fields_journal, 'j.transaction_status = 3', $params['agent_id']);
                     $data['data']   = $result;
                     break;
                 default:

application/model/Agents.php

@@ -77,10 +77,10 @@ class Agents extends Model
                     ->where('agents_id',$id)->count(); //看铺
 
             $result['head_portrait'] = ADMIN_URL_TL.$result['head_portrait'];
-            $journal = new JournalAccounts();
-            $fields  = 'count(j.id) as num';
-            $Journal_num = $journal->getJournalHouseInfoId($fields, $id);
-            $result['JournalAccounts'] = isset($Journal_num['num']) ? $Journal_num['num']:0;  //成交记录
+            $remarks = new Remarks();
+            $fields  = 'a.id';
+            $Journal_num = $remarks->getJournalHouseInfoId($fields, $id);
+            $result['JournalAccounts'] = count($Journal_num);  //成交记录
 
             $current_time = time();
             $user_time    = strtotime($result['created']);

application/model/JournalAccounts.php

@@ -4,7 +4,6 @@ namespace app\model;
 
 use think\Model;
 use think\helper\Time;
-use think\Db;
 class JournalAccounts extends Model
 {
     // 设置当前模型对应的完整数据表名称
@@ -109,29 +108,4 @@ class JournalAccounts extends Model
             ->page($pageNo)
             ->select();
     }
-    
-    /**
-     * 查询当前经纪人的成交记录
-     * 
-     * @param $fields
-     * @param $agent_id
-     * @return $result
-     */
-    public function getJournalHouseInfoId($fields = '', $agent_id) {
-        if ($agent_id) {
-            $result = $this->field($fields)->alias('j')
-                    ->join('applies a', 'j.apply_id = a.id')
-                    ->where('a.agent_id', $agent_id)
-                    ->where('j.transaction_status = 3')
-                    ->find();
-        } else {
-            $result = $this->field($fields)->alias('j')
-                    ->join('applies a', 'j.apply_id = a.id')
-                    ->where('a.agent_id', $agent_id)
-                    ->where('j.transaction_status = 3')
-                    ->find();
-        }
-        return $result;
-    }
-
 }