经纪人主页

application/api/controller/Broker.php

@@ -183,7 +183,7 @@ class Broker extends Basic{
                     //评价列表信息
                     $result['evaluate'] = $evaluate->getEvaluate($pageNo, $pageSize, 'a.id desc', $fields_evaluate, '', $params['agent_id']);
                     //成交记录
-                    $result['journalAccounts']  = $bargain->getBargainOrderList($bargain_fields, ['a.agent_id'=>$this->params['agent_id']]);
+                    $result['journalAccounts']  = $bargain->getBargainOrderList($pageNo, $pageSize, '', $bargain_fields, ['a.agent_id'=>$this->params['agent_id']]);
                     $data['data'] = $result;
                     break;
                 case 1:
@@ -193,7 +193,7 @@ class Broker extends Basic{
                     break;
                 case 2:
                     //成交记录
-                    $result['journalAccounts']  = $bargain->getBargainOrderList($bargain_fields, ['a.agent_id'=>$this->params['agent_id']]);
+                    $result['journalAccounts']  = $bargain->getBargainOrderList($pageNo, $pageSize, '', $bargain_fields, ['a.agent_id'=>$this->params['agent_id']]);
                     $data['data']   = $result;
                     break;
                 default:

application/model/OBargainModel.php

@@ -478,26 +478,36 @@ class OBargainModel extends Model
     /**
      * 获取成交报告详情
      *
+     * @param int $pageNo
+     * @param int $pageSize
+     * @param string $order_
      * @param $field
      * @param $params
-     * @return array|false|\PDOStatement|string|Model
+     * @return false|\PDOStatement|string|\think\Collection
      * @throws \think\db\exception\DataNotFoundException
      * @throws \think\db\exception\ModelNotFoundException
      * @throws \think\exception\DbException
      */
-    public function getBargainOrderList($field, $params)
+    public function getBargainOrderList($pageNo = 1, $pageSize = 15, $order_ = 'a.id desc', $field, $params)
     {
         $data = $this->field($field)->alias('a')
             ->join('o_report b', 'a.report_id = b.id', 'left')
             ->join('o_order c', 'a.order_id = c.id', 'left')
             ->join('g_houses d', 'c.house_id = d.id', 'left')
             ->where($params)
+            ->order($order_)
+            ->limit($pageSize)
+            ->page($pageNo)
             ->select();
 
         foreach ($data as $k=>$v) {
             if (isset($v['singntime'])) {
                 $data[$k]['singntime'] = date('Y-m-d', strtotime($v['singntime']));
             }
+
+            if (empty($v['shangpu_tags'])) {
+                $data[$k]['shangpu_tags'] = "";
+            }
         }
 
         return $data;