评论记录增加看铺时间和地址

application/api/controller/Broker.php

@@ -129,14 +129,14 @@ class Broker extends Basic{
             $evalutate = new Evaluate();
             $journal  = new JournalAccounts();
             
-            $fields_evaluate = 'user_nick,user_pic,evaluate_grade,evaluate_content,evaluate_sign';
-
+            $fields_evaluate = 'house_id,user_id,user_nick,user_phone,user_pic,evaluate_grade,evaluate_content,evaluate_sign';
+            $fields_journal  = 'a.house_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', '', 'j.transaction_status = 3', $params['agent_id']);
+                    $result['journalAccounts'] = $journal->getJournalHouseInfo($pageNo, $pageSize, 'j.id desc', $fields_journal, 'j.transaction_status = 3', $params['agent_id']);
                     $data['data'] = $result;
                     break;
                 case 1:
@@ -146,7 +146,7 @@ class Broker extends Basic{
                     break;
                 case 2:
                     //成交记录
-                    $result['journalAccounts'] = $journal->getJournalHouseInfo($pageNo, $pageSize, '', '', '', $params['agent_id']);
+                    $result['journalAccounts'] = $journal->getJournalHouseInfo($pageNo, $pageSize, 'j.id desc', $fields_journal, 'j.transaction_status = 3', $params['agent_id']);
                     $data['data']   = $result;
                     break;
                 default:

application/model/JournalAccounts.php

@@ -42,26 +42,24 @@ class JournalAccounts extends Model
      * @param type $agent_id
      * @return type
      */
-    public function getJournalHouseInfo($pageNo = 1, $pageSize = 15, $order_ = 'id desc', $field, $params, $agent_id = '') {
-
+    public function getJournalHouseInfo($pageNo = 1, $pageSize = 15, $order_ = 'j.id desc', $field, $params, $agent_id = '') {
+      
         if ($agent_id) {
-            $result = $this->field('a.house_id')->alias('j')
-                    ->join('applies a','j.apply_id = a.id')
+            $result = $this->db->field($field)->alias('j')
+                    ->join('applies a','j.apply_id = a.id','LEFT')
                     ->where('a.agent_id', $agent_id)
-                    ->where('j.transaction_status = 3')
                     ->group('j.apply_id')
-                    ->order($order_)
                     ->limit($pageSize)
+                    ->order($order_)
                     ->page($pageNo)
                     ->select();
         } else {
-            $result = $this->field('a.house_id')->alias('j')
-                    ->join('applies a', 'j.apply_id = a.id')
+            $result = $this->field($field)->alias('j')
+                    ->join('applies a', 'j.apply_id = a.id','left')
                     ->where('a.agent_id', $agent_id)
-                    ->where('j.transaction_status = 3')
-                    ->group('j.apply_id')
-                    ->order($order_)
+                    ->group('j.apply_id')                    
                     ->limit($pageSize)
+                    ->order($order_)
                     ->page($pageNo)
                     ->select();
         }