办公楼

application/api_broker/controller/OfficeRoom.php

@@ -263,4 +263,22 @@ class OfficeRoom extends Basic
 
         return $this->response($this->code, $this->msg, $this->data);
     }
+
+    /**
+     * 楼盘列表
+     *
+     * @return \think\Response
+     */
+    public function getBuildingRoom()
+    {
+        $result = $this->service->getRoomBuildingList($this->params);
+
+        if ($result['status'] == 'successful') {
+            $this->data = $result['data'];
+        } else {
+            $this->code = 101;
+            $this->msg  = $result['msg'];
+        }
+        return $this->response($this->code, $this->msg, $this->data);
+    }
 }
\ No newline at end of file

application/api_broker/service/OfficeOrderLogService.php

@@ -450,7 +450,7 @@ class OfficeOrderLogService
         $oBargainModel    = new OfficeOBargainModel();
 
 
-        $orderData = $orderModel->selectOrderByOrderId("a.f_id,a.house_title,b.internal_address", ["order_id" => $order_id]);
+        $orderData = $orderModel->selectOrderByOrderId("a.f_id,a.house_title,c.address as internal_address", ["order_id" => $order_id]);
         //dump($orderData);
         if (count($orderData) <= 0) {
             return ["101", "找不到此订单编号"];
@@ -566,7 +566,7 @@ class OfficeOrderLogService
         $oRefundLogModel        = new OfficeORefundLoORefundLogModel();
 
 
-        $orderData = $orderModel->selectOrderByOrderId("a.f_id,a.house_title,b.internal_address", ["order_id" => $order_id]);
+        $orderData = $orderModel->selectOrderByOrderId("a.f_id,a.house_title,c.address as internal_address", ["order_id" => $order_id]);
         //dump($orderData);
         if (count($orderData) <= 0) {
             return ["101", "找不到此订单编号"];

application/index/controller/OfficePayLog.php

@@ -4,11 +4,15 @@
 namespace app\index\controller;
 
 
+use app\api_broker\service\RedisCacheService;
 use app\index\extend\Basic;
 use app\index\untils\ExportExcelUntil;
+use app\model\OfficeGBuilding;
+use app\model\OfficeGRoom;
 use app\model\OfficeOBargainModel;
 use app\model\OfficeOPayLogAdjustment;
 use app\model\OfficeOPayLogModel;
+use app\model\OfficeOrderModel;
 use app\model\OfficeORefundModel;
 use app\model\OfficeOReportModel;
 use think\Request;
@@ -593,4 +597,389 @@ class OfficePayLog extends Basic
         }
         return $data;
     }
+
+    /**
+     * 获得调整类型
+     *
+     * @param $type
+     * @return string
+     */
+    public function getAdjustmentType($type)
+    {
+        //意向金:1转中介费 2转案场费 3转意向金 7保管金 保管金:4转中介费 5转案场费 6转保管金'
+        switch ($type) {
+            case 1 :
+                $type_name = '意向金转中介费';
+                break;
+            case 2 :
+                $type_name = '意向金转案场费';
+                break;
+            case 3 :
+                $type_name = '意向金转意向金';
+                break;
+            case 4 :
+                $type_name = '保管金转中介费';
+                break;
+            case 5 :
+                $type_name = '保管金转案场费';
+                break;
+            case 6 :
+                $type_name = '保管金转保管金';
+                break;
+            case 7 :
+                $type_name = '意向金转保管金';
+                break;
+            default :
+                $type_name = '其它';
+        }
+        return $type_name;
+    }
+
+    /**
+     *	调整出账
+     * @return \think\Response
+     */
+    public function adjustment() {
+        if (!$this->request->isAjax() && empty($this->params['excel'])) {
+            return view("adjustment");
+        }
+
+        $pageNo = empty($this->params['pageNo']) ? 1 : $this->params['pageNo'];
+        $pageSize = empty($this->params['pageSize']) ? 10 : $this->params['pageSize'];
+        $data = [];
+        $where['a.is_del'] = $is_show = 0;
+        $msg = '';
+        $code = 200;
+
+        $m_paylog = new OfficeOPayLogAdjustment();
+        /*提交时间 start*/
+        if (!empty($this->params['start_time']) && empty($this->params['end_time'])) {
+            $where['a.create_time'] = ['> time', $this->params['start_time'] . ' 00:00:00'];
+            $is_show = 1;
+        }
+
+        if (!empty($this->params['end_time']) && empty($this->params['start_time'])) {
+            $where['a.create_time'] = ['< time', $this->params['end_time'] . ' 23:59:59'];
+            $is_show = 1;
+        }
+
+        if (!empty($this->params['end_time']) && !empty($this->params['start_time'])) {
+            $where['a.create_time'] = ['between time', [
+                $this->params['start_time'] . ' 00:00:00', $this->params['end_time'] . ' 23:59:59'
+            ]];
+            $is_show = 1;
+        }
+        /*提交时间 end*/
+        /*入账日期 start*/
+        if (!empty($this->params['income_start_time']) && empty($this->params['income_end_time'])) {
+            $where['b.income_time'] = ['> time', $this->params['income_start_time'] . ' 00:00:00'];
+            $is_show = 1;
+        }
+
+        if (!empty($this->params['income_end_time']) && empty($this->params['income_start_time'])) {
+            $where['b.income_time'] = ['< time', $this->params['end_time'] . ' 23:59:59'];
+            $is_show = 1;
+        }
+
+        if (!empty($this->params['income_end_time']) && !empty($this->params['income_start_time'])) {
+            $where['b.income_time'] = ['between time', [
+                $this->params['income_start_time'] . ' 00:00:00', $this->params['income_end_time'] . ' 23:59:59'
+            ]];
+            $is_show = 1;
+        }
+        /*入账日期 end*/
+
+        //商铺ID
+        if (!empty($this->params['house_id'])) {
+            $where['e.house_id'] = $this->params['house_id'];
+            $is_show = 1;
+        }
+
+        //商铺地址
+        if (!empty($this->params['address'])) {
+            $m_house = new OfficeGRoom();
+            $id = $m_house->getRoomInfo('a.id',['b.address'=>['like', '%' . $this->params['address'] . '%']]);
+
+            foreach ($id as $v) {
+                $id_arr[] = $v['id'];
+            }
+
+            if (!empty($where['e.house_id'])) {
+                $id_arr[] = $where['e.house_id'];
+            }
+
+            if (!empty($id_arr)) {
+                $id_arr = array_unique($id_arr);
+                $where['e.house_id'] = ['in', $id_arr];
+            }
+            $is_show = 1;
+        }
+
+        //提交人所在门店
+        if (!empty($this->params['store_id'])) {
+            $where['d.store_id'] = $this->params['store_id'];
+            $is_show = 1;
+        }
+
+        //提交人所在部门
+        if (!empty($this->params['district_id'])) {
+            $where['d.district_id'] = $this->params['district_id'];
+            $is_show = 1;
+        }
+
+        //提交人姓名
+        if (!empty($this->params['agent_id'])) {
+            $where['d.id'] = $this->params['agent_id'];
+            $is_show = 1;
+        }
+
+        //提交人手机号
+        if (!empty($this->params['phone'])) {
+            $where['d.phone'] = ['like', '%' . $this->params['phone'] . '%'];
+            $is_show = 1;
+        }
+
+        //入账方式
+        if (!empty($this->params['pay_type'])) {
+            $where['a.pay_type'] = $this->params['pay_type'];
+            $is_show = 1;
+        }
+
+        //入账类型
+        if (!empty($this->params['type'])) {
+            $where['a.type'] = $this->params['type'];
+            $is_show = 1;
+        }
+
+        //来源
+        if (!empty($this->params['source'])) {
+            $where['a.source'] = $this->params['source'];
+            $is_show = 1;
+        }
+
+        if (!empty($this->params['pay_id'])) {
+            $where['a.paylog_id'] = $this->params['pay_id'];
+        }
+
+        if (!empty($this->params['id'])) {
+            $where['a.id'] = $this->params['id'];
+        }
+
+        if (!empty($this->params['march_id'])) {
+            $where['b.order_id'] = $this->params['march_id'];
+        }
+
+        $field = 'a.create_time,a.id,b.order_id,e.house_id,a.paylog_id,a.money,b.income_time,a.type,a.new_paylog_id,a.operation_id';
+        $m_house = new OfficeGRoom();
+        $redis_service = new RedisCacheService();
+        if (empty($this->params['excel'])) {
+            $list = $m_paylog->getAdjustmentListLimit($pageNo, $pageSize, $order_ = 'a.id desc', $field, $where);
+            $data['total'] = $m_paylog->getAdjustmentListTotal($where);
+            //加时间条件
+            if ($is_show) {
+                $data['money_total'] = $m_paylog->getMoneyTotal($where, 'a.money'); //总额
+            } else {
+                $data['money_total'] = '';
+            }
+
+            foreach ($list as $k => $v) {
+                if ($v['operation_id']) {
+                    $agent_data = $redis_service->getRedisCache(2, $v['operation_id']);
+                    $list[$k]['name'] = $agent_data['name'];
+                }
+                if ($v['house_id']) {
+                    $house_data = $m_house->getRoomInfo('a.id,b.address', ['a.id'=>$v['house_id']]);
+                    $list[$k]['house_id'] = $house_data['id'];
+                    $list[$k]['address'] = $house_data['address'];
+                } else {
+                    $list[$k]['house_id'] = '';
+                    $list[$k]['address']  = '';
+                }
+            }
+
+            $data['list'] = $list;
+            $data['list'] = $this->numberTransitionString($data['list']);
+        } else {
+            $list = $m_paylog->getAdjustmentListLimit(1, 40000, $order_ = 'a.id desc', $field, $where);
+
+            if (empty($list)) {
+                $this->closeWin = 1;
+                $this->error('暂无数据,请关闭页面！');
+            } else {
+                $excel_data = [];
+                foreach ($list as $k => $v) {
+                    $excel_data[$k]['create_time'] = $v['create_time'];
+                    $excel_data[$k]['id'] = $v['id'];
+                    $excel_data[$k]['order_id'] = $v['order_id'];
+                    $excel_data[$k]['paylog_id'] = $v['paylog_id'];
+
+                    if ($v['house_id']) {
+                        $house_data = $m_house->getRoomInfo('a.id,b.address', ['a.id'=>$v['house_id']]);
+                        $excel_data[$k]['house_id'] = $house_data['id'];
+                        $excel_data[$k]['address'] = $house_data['address'];
+                    } else {
+                        $excel_data[$k]['house_id'] = '';
+                        $excel_data[$k]['address'] = '';
+                    }
+                    $excel_data[$k]['money'] = $v['money'];
+                    $excel_data[$k]['income_time'] = $v['income_time'];
+                    $excel_data[$k]['type_name'] = $this->getAdjustmentType($v['type']);
+                    $excel_data[$k]['new_paylog_id'] = $v['new_paylog_id'];
+
+                    if ($v['operation_id']) {
+                        $agent_data = $redis_service->getRedisCache(2, $v['operation_id']);
+                        $excel_data[$k]['name'] = $agent_data['name'];
+                    }
+
+                }
+                $export = new ExportExcelUntil();
+                $title = ['提交时间', '调整ID', '调整前带看ID', '调整前收款ID', '调整前商铺ID', '调整前商铺地址', '调整金额', '入账日期', '调整类型', '调整后收款ID', '提交人'];
+                $export->exportTable('调整出账', $excel_data, 10, '调整出账', $title);
+            }
+        }
+
+        return $this->response($code, $msg, $data);
+    }
+
+    /**
+     * 调整
+     *
+     * @return \think\Response
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @throws \think\exception\DbException
+     */
+    public function getAdjustmentDetail() {
+        $code = 101;
+        if (empty($this->params['id'])) {
+            return $this->response($code, '参数错误');
+        }
+
+        $m_pay_adjustment = new OfficeOPayLogAdjustment();
+        $adjustment_data = $m_pay_adjustment->getAdjustmentList('id,new_paylog_id,paylog_id,money,type', ['id'=>$this->params['id']]);
+
+        if (empty($adjustment_data[0]['id'])) {
+            return $this->response($code, '没有该调整详情');
+        }
+        $m_pay = new OfficeOPayLogModel();
+        $result['adjustment'] = $m_pay->getOrderHouse('a.id,a.order_id,b.house_id,d.address as internal_address,a.income_time,a.type,a.pay_type,a.money,a.bargain_id', ['a.id'=> $adjustment_data[0]['new_paylog_id']]);
+        $result['adjustment_old'] = $m_pay->getOrderHouse('a.id,a.order_id,a.agent_id,a.agent_name,a.create_time,b.house_id,d.address as internal_address,a.income_time,a.type,a.pay_type,a.type', ['a.id'=> $adjustment_data[0]['paylog_id']]);
+
+        if (in_array($adjustment_data[0]['type'], [3,6,7])) {
+            $result['adjustment'][0]['bargain_id'] = 0;
+        }
+
+        $result['adjustment'] = $this->numberTransitionString($result['adjustment']);
+        $result['adjustment_old'] = $this->numberTransitionString($result['adjustment_old']);
+        $result['money'] = $adjustment_data[0]['money'];
+        $result['id'] = $adjustment_data[0]['id'];
+        $code = 200;
+        return $this->response($code, '', $result);
+    }
+
+    /**
+     * 收款详情
+     *
+     * @return \think\Response
+     */
+    public function getCollectionDetail() {
+        if (empty($this->params['pay_id'])) {
+            return $this->response(101, '参数错误');
+        }
+
+        $msg = "";
+        $pay_data = [];
+        try {
+            $m_pay = new OfficeOPayLogModel();
+            $pay_fields = 'id,order_id,agent_name,create_time,income_time,house_number,type,real_money,income_time,transfer_name,bargain_id,agent_id,';
+            $pay_fields .= 'transaction_fee,is_dividend,receipt_number,source,pay_type,last_transfer_time,money,industry_type,received_money,type_ext,is_open,open_time';
+            $pay_data = $m_pay->selectReceiptImgList($pay_fields, ['id'=>$this->params['pay_id']]);
+            $pay_data = $pay_data[0];
+            //成交报告id
+
+            if (empty($pay_data['bargain_id'])) {
+                $pay_data['bargain_id'] = "";
+                $pay_data['is_open'] = 0;
+                $pay_data['price'] = 0;
+            } else {
+                $bargain_where['father_id'] = 0;
+                $bargain_where['id'] = $pay_data['bargain_id'];
+                $price = $this->m_bargain->getFieldValue('price', $bargain_where);
+                $pay_data['price'] = empty($price)? 0:$price;
+
+                $m_order = new OfficeOrderModel();
+                $house_data = $m_order->selectOrderByOrderId('b.id,c.address as internal_address,a.f_id', ['order_id'=>$pay_data['order_id']]);
+
+                $pay_data['house_id'] = empty($house_data[0]['id']) ? '':$house_data[0]['id'];
+                $pay_data['address'] = empty($house_data[0]['internal_address']) ? '':$house_data[0]['internal_address'];
+            }
+
+            $m_pay_adjustment = new OfficeOPayLogAdjustment();
+            $source_id = $m_pay_adjustment->getFieldColumn('id', ['paylog_id'=> $pay_data['id']]);
+            $pay_data['source_id'] = empty($source_id) ? 0 : implode(',', $source_id);
+
+            $m_refund = new OfficeORefundModel();
+            $num = $m_refund->getFind('id',['pay_log_id'=>$pay_data['id'],'is_del'=>0]);
+            if ($num['id'] > 0) {
+                $pay_data['is_refund'] = 1;
+            } else {
+                $pay_data['is_refund'] = 0;
+            }
+
+            $m_report = new OfficeOReportModel();
+            $pay_data['current_agent_name'] = $pay_data['store_name'] = "";
+            if (($pay_data['type'] == 92 || $pay_data['type'] == 91) && $pay_data['bargain_id'] > 0) {
+                $where[] = ['EXP','a.id ='.$pay_data['bargain_id'].' or father_id='. $pay_data['bargain_id']];
+                $where['a.status'] = ['in','10,11,13'];
+                $where['a.role'] = ['in','3,4,5'];
+                $bargain_data = $this->m_bargain->agentBargainAll('a.role,a.scale,b.name', $where);
+                $role_arr = [1=>'盘方', 2=>'客方',3=>'反签',4=>'独家',5=>'合作方',6=>'APP盘下载方',7=>'APP客下载方'];
+                $name = '';
+
+                foreach ($bargain_data as $k=>$v) {
+                    $name .= $v['name'] . '('.$role_arr[$v['role']].$v['scale'].'%)，';
+                }
+
+                $pay_data['current_agent_name'] = rtrim($name,'，');
+            }
+
+            if (($pay_data['type'] == 10 || $pay_data['type'] == 30) && isset($house_data[0]['f_id'])) {
+                $current_agent_name = $m_report->selectReportById('report_agent_name,report_store_id', ['id'=>$house_data[0]['f_id']]);
+                $pay_data['current_agent_name'] = empty($current_agent_name[0]['report_agent_name']) ? "" : $current_agent_name[0]['report_agent_name'];
+            }
+            $pay_data['site_id'] =  '';
+            if ($pay_data['agent_id']) {
+                $redis_service = new RedisCacheService();
+                $agent_data = $redis_service->getRedisCache(2, $pay_data['agent_id']);
+                $pay_data['site_id'] = $agent_data['site_id'];
+            }
+
+            $pay_data['open_time'] = empty($pay_data['open_time']) ? '':$pay_data['open_time'];
+        } catch (\Exception $e) {
+            $msg = '内部错误:'.$e->getMessage();
+        }
+        return $this->response(200, $msg, $pay_data);
+    }
+
+    /**
+     * 剩余可以调整或退款的钱
+     * @return \think\Response
+     */
+    public function getAdjustment()
+    {
+        $params = $this->params;
+        /*   $params = array(
+               "pay_id" => 1,
+           );*/
+        if (empty($params["pay_id"])) {
+            return $this->response("101", "请求参数错误");
+        }
+        $service_ = new OfficePayLogService();
+        $result = $service_->adjustment($params["pay_id"]);
+        if ($result == -1) {
+            return $this->response("101", "不存在此条记录");
+        }
+        return $this->response("200","success",["residue_money"=>$result]);
+
+    }
 }
\ No newline at end of file

application/index/service/OfficeRoomService.php

@@ -1126,4 +1126,140 @@ class OfficeRoomService
         }
         return $res;
     }
+
+    /**
+     * 办公楼列表
+     *
+     * @param $params
+     * @return array
+     */
+    public function getRoomBuildingList($params)
+    {
+        $page_no          = empty($params['pageNo']) ? 1 : $params['pageNo'];
+        $page_size        = empty($params['pageSize']) ? 15 : $params['pageSize'];
+        $where = [];
+        $order = 'b.id desc';
+
+        if (isset($params['city'])) {
+            $where['a.city']  = $params['city']; //市
+        }
+
+        if (isset($params['disc'])) {
+            $where['a.disc'] = $params['disc'];  //区
+        }
+
+        if (isset($params['title'])) {
+            $where['a.title'] = ['LIKE', '%'.$params['title'].'%']; //楼盘名
+        }
+
+        if (isset($params['id'])) {
+            $where['a.id'] = $params['id'];
+        }
+
+        if (isset($params['`business_district_id`'])) {
+            $where['a.business_district_id'] = $params['business_district_id'];  //商圈id
+        }
+
+        if (isset($params['area_start'])) {
+            $where['b.area'] = ['>', $params['area_start']];  //面积
+        }
+
+        if (isset($params['area_end'])) {
+            $where['b.area'] = ['<', $params['area_end']];  //面积
+        }
+
+        if (isset($params['area_start']) && $params['area_end']) {
+            $where['b.area'] = ['between', [$params['area_start'], $params['area_end']]];   //面积
+        }
+
+        if (isset($params['type'])) {
+            $where['a.type'] = $params['type'];   //1.写字楼 2商住两用 3园区 4.洋房 5联合办公 6厂房
+        }
+
+        if (isset($params['price_start'])) {
+            $where['b.price'] = $params['price_start']*100;//租金单价
+        }
+
+        if (isset($params['price_end'])) {
+            $where['b.price'] = $params['price_end']*100;//租金单价
+        }
+
+        if (isset($params['price_start']) && isset($params['price_end'])) {
+            $where['b.price'] = ['between', [$params['price_start']*100, $params['price_end']*100]]; //租金单价
+        }
+
+        if (isset($params['is_exclusive_type'])) {
+            $where['b.is_exclusive_type'] = $params['is_exclusive_type'];  //是否独家0否1是
+        }
+
+        if (isset($params['agent_start_time']) && $params['agent_end_time']) {
+            $where['b.agent_start_time'] = ['>', $params['agent_start_time']];  //独家合同开始时间
+            $where['b.agent_end_time'] = ['<', $params['agent_end_time']];      //独家合同结束时间
+        }
+
+        if (isset($params['is_rent'])) {
+            $where['b.is_rent'] = $params['is_rent'];  //是否已租 0未租 1已租
+        }
+
+        if (isset($params['status'])) {
+            $where['a.status'] = $params['status'];  //状态 1上架 2下架
+        }
+
+        if (isset($params['shop_sign'])) {
+            $where['b.shop_sign'] = ['like', '%'.$params['shop_sign'].'%'];  //商铺标签
+        }
+
+        if (isset($params['is_carefully_chosen'])) {
+            $where['b.is_carefully_chosen'] = $params['shop_sign'];  //精选商铺--0否1是
+            $order = 'b.home_page_sort desc';
+        }
+
+        $field = 'a.id,b.disc,title,address,c.name as business_name';
+        try {
+            $data = $this->m_office_room->getRoomBuilding($page_no, $page_size, $order, $field, $where);
+        } catch (\Exception $e) {
+            $result['status'] = 'fail';
+            $result['msg'] = $e->getMessage();
+            return $result;
+        }
+
+        $result_data = [];
+        foreach ($data as $k=>$v) {
+            $tmp['id'] = $v['id'];
+            $tmp['price'] =  $this->MinField($v['id'], 'price');
+            $tmp['price'] = empty($tmp['price']) ? 0:$tmp['price'];
+            $tmp['price_total'] =  $this->MinField($v['id'], 'price_total');
+            $tmp['price_total'] = empty($tmp['price_total']) ? 0:$tmp['price_total'];
+            $tmp['shop_sign'] = $this->getBuildingSign($v['id']);
+            $area = $this->MinField($v['id'], 'area');
+            $tmp['title'] = $v['disc'].' '.$v['business_name']. ' '.$v['title']. ' '.$area.'㎡';
+            $result_data[] = $tmp;
+        }
+        $result['status'] = 'successful';
+        $result['data'] = $result_data;
+        return $result;
+    }
+
+    /**
+     * 标签处理
+     *
+     * @param $id
+     * @return string
+     */
+    private function getBuildingSign($id){
+        $field = 'shop_sign';
+        $where['building_id'] = $id;
+        $where['status'] = 1;
+        $res = $this->m_office_room->getRoom($field, $where);
+        if(!$res)
+            return '';
+        $shop_sign_old = '';
+        foreach ($res as $k=>$v) {
+            $shop_sign_old.=','.$v['shop_sign'];
+        }
+        $ex_shop_sign_old = explode(',', trim($shop_sign_old, ","));
+        $ex_shop_sign_old = array_unique($ex_shop_sign_old);//数组去重
+        $shop_sign = implode(",", $ex_shop_sign_old);
+        return $shop_sign;
+    }
 }
\ No newline at end of file

application/model/OfficeGRoom.php

@@ -393,4 +393,28 @@ class OfficeGRoom extends BaseModel
         //echo Db::table($this->table)->getLastSql();
         return $result;
     }
+
+    /**
+     * @param int $pageNo
+     * @param int $pageSize
+     * @param string $order_
+     * @param string $field
+     * @param string $params
+     * @return false|\PDOStatement|string|\think\Collection
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @throws \think\exception\DbException
+     */
+    public function getRoomBuilding($pageNo = 1, $pageSize = 15, $order_ = 'a.id desc', $field = '', $params = '') {
+        $params['b.is_del'] = 0;
+        return $this->field($field)
+            ->alias('a')
+            ->join('office_g_building b', 'a.building_id = b.id', 'left')
+            ->join('g_business_district c', 'b.business_district_id = c.id', 'left')
+            ->where($params)
+            ->order($order_)
+            ->limit($pageSize)
+            ->page($pageNo)
+            ->select();
+    }
 }

application/model/OfficeOPayLogAdjustment.php

@@ -118,9 +118,9 @@ class OfficeOPayLogAdjustment extends BaseModel{
     public function getAdjustmentListLimit($pageNo, $pageSize, $order_='a.id desc', $field, $params){
         return $this->db_->field($field)
             ->alias("a")
-            ->join("o_paylog b", "a.paylog_id = b.id", "left")
+            ->join("office_o_paylog b", "a.paylog_id = b.id", "left")
             ->join("a_agents d", "a.operation_id = d.id", "left")
-            ->join("o_order e", "b.order_id = e.id")
+            ->join("office_o_order e", "b.order_id = e.id")
             ->limit($pageSize)
             ->page($pageNo)
             ->order($order_)
@@ -134,9 +134,9 @@ class OfficeOPayLogAdjustment extends BaseModel{
      */
     public function getAdjustmentListTotal($params) {
         return $this->db_->alias('a')
-            ->join("o_paylog b", "a.paylog_id = b.id", "left")
+            ->join("office_o_paylog b", "a.paylog_id = b.id", "left")
             ->join("a_agents d", "a.operation_id = d.id", "left")
-            ->join("o_order e", "b.order_id = e.id")
+            ->join("office_o_order e", "b.order_id = e.id")
             ->where($params)
             ->count('a.id');
     }
@@ -149,9 +149,9 @@ class OfficeOPayLogAdjustment extends BaseModel{
      */
     public function getMoneyTotal($params) {
         return $this->db_->alias('a')
-            ->join("o_paylog b", "a.paylog_id = b.id", "left")
+            ->join("office_o_paylog b", "a.paylog_id = b.id", "left")
             ->join("a_agents d", "a.operation_id = d.id", "left")
-            ->join("o_order e", "b.order_id = e.id")
+            ->join("office_o_order e", "b.order_id = e.id")
             ->where($params)
             ->sum('a.money');
     }

application/route.php

@@ -975,7 +975,7 @@ Route::group('office', [
     'filtrateConditionRoom'      => ['api/shop/filtrateConditionRoom', ['method' => 'get | post']],
     'addCollectHouse'            => ['api_broker/OfficeCollectHouse/addCollectHouse', ['method' => 'POST|GET']], //收藏或取消收藏商铺
     'getCollectHouseList'        => ['api_broker/OfficeCollectHouse/getCollectHouseList', ['method' => 'POST|GET']], //查询收藏数据
-    'getBuildingRoom'            => ['api_broker/OfficeBuilding/getBuildingRoom', ['method' => 'POST|GET']], //楼盘列表
+    'getBuildingRoom'            => ['api_broker/OfficeRoom/getBuildingRoom', ['method' => 'POST|GET']], //楼盘列表
     'report'                     => ['api_broker/OfficeReport/report', ['method' => 'get|post']],  //报备
     'addFollowUp'                => ['api_broker/OfficeReport/addFollowUp', ['method' => 'get|post']],  //新增跟进
     'getFollowUpList'            => ['api_broker/OfficeReport/getFollowUpList', ['method' => 'get|post']],
@@ -1005,6 +1005,9 @@ Route::group('office_index', [
     'batchChangDish'              => ['index/OfficeRoom/batchChangDish', ['method' => 'post']],//批量修改盘方
     'getCollection'               => ['index/OfficePayLog/getCollection', ['method' => 'GET']],//收款记录
     'getCollectionExcel'          => ['index/OfficePayLog/getCollectionExcel', ['method' => 'get']],//导出收款记录
+    'adjustment'                  => ['index/OfficePayLog/adjustment', ['method' => 'get']],//导出收款记录
+    'getCollectionDetail'         => ['index/OfficePayLog/getCollectionDetail', ['method' => 'get']],//收款详情
+    'getAdjustmentDetail'         => ['index/OfficePayLog/getAdjustmentDetail', ['method' => 'get']],//调整收款详情
 
 ]);