Merge branch '0529-v3.3.0' of https://gitee.com/zwyjjc/tl_estate into 0529-v3.3.0

application/api_broker/controller/User.php

@@ -833,7 +833,13 @@ class User extends Basic
         }
         $user_id  = $params['user_id'];
         $type     = $params['type'];
-        $result = $this->userLogService->userLog($user_id,$this->siteId,$type);
+
+
+        if(isset($params['entrust_type']) && ($params['entrust_type']== 1)){
+            $result = $this->OfficeUserLogService->userLog($user_id,$this->siteId,$type);
+        }else{
+            $result = $this->userLogService->userLog($user_id,$this->siteId,$type);
+        }
 
         if(count($result) > 0){
             return $this->response("200", "success！", $result);

application/api_broker/service/OfficePayLogService.php

@@ -2,6 +2,7 @@
 
 namespace app\api_broker\service;
 
+use app\model\OfficeOImg;
 use app\model\OfficeOPayLogAdjustment;
 use app\model\OfficeOPayLogModel;
 use app\model\OfficeORefundModel;
@@ -85,9 +86,8 @@ class OfficePayLogService
         if (count($pay_log_arr) < 0) {
             return -1;
         }
-        $oPayLogAdjustment = new OPayLogAdjustment();
         $where_ = $this->adjustmentBin($new_pay_id, $pay_id, $money, $type, $agent_id, $pay_log_arr[0]["type"]);
-        $oPayLogAdjustment->addAdjustment($where_);
+        $this->payLogAdjustmentModel->addAdjustment($where_);
     }
 
     /**
@@ -271,7 +271,7 @@ class OfficePayLogService
      */
     private function addOImg($id, $type, $transfer_img)
     {
-        $oImgModel = new OImg();
+        $oImgModel = new OfficeOImg();
         $oImgModel->addImgAll($id, $type, $transfer_img);
     }
 
@@ -283,7 +283,7 @@ class OfficePayLogService
     private function getOImg($id, $img_type)
     {
         //查询图片
-        $oImgModel = new OImg();
+        $oImgModel = new OfficeOImg();
         $params["img_id"] = $id;
         $params["img_type"] = $img_type;
         $img_arr = $oImgModel->getImgList($params);
@@ -295,7 +295,7 @@ class OfficePayLogService
      * @param $del_img
      */
     private function delOImg($type, $del_img){
-        $oImgModel = new OImg();
+        $oImgModel = new OfficeOImg();
         $ids = rtrim($del_img, ",");
         $where_["id"] = array("in",$ids);
         $where_["img_type"] = $type;

application/index/controller/Finance.php

@@ -26,6 +26,7 @@ use app\model\OBargainLogModel;
 use app\model\OBargainModel;
 use app\model\ODaily;
 use app\model\OfficeOImg;
+use app\model\OfficeOPayLogModel;
 use app\model\OImg;
 use app\model\OMarchInModel;
 use app\model\OPayLogAdjustment;
@@ -3526,7 +3527,6 @@ class Finance extends Basic
         }
     }
 
-
     /**
      * 收款列表记录上传图片
      * 朱伟 2018-07-04
@@ -3565,44 +3565,6 @@ class Finance extends Basic
         }
     }
 
-    /**
-     * 收款列表记录上传图片
-     * 朱伟 2018-07-04
-     */
-    public function addReceiptOfficeImg(){
-        $params = $this->params;
-        $result = 0;
-        /*$params = array(
-             "img_id"       => 1,
-             "img_name"     => 123,
-         );*/
-
-        if(!isset($params["img_id"])){
-            return $this->response("101","请求参数错误");
-        }
-        if(!isset($params["img_name"])){
-            return $this->response("101","请求参数错误");
-        }
-        $order = new OfficeOImg();
-
-        foreach (explode(',',$params["img_name"]) as $k => $v){
-            $time = date("Y-m-d H:i:s", time());
-            $save_data["img_id"]       = $params["img_id"];//id根据img_type区分是收款还是进场还是其他'
-            $save_data["img_type"]     = 2 ;//图片类型:1进场，2收款
-            $save_data["img_name"]     = $v;//图片名称
-            $save_data["img_status"]   = 0 ;//删除状态 0正常 1删除
-            $save_data["update_time"]  = $time;//更新时间
-            $save_data["create_time"]  = $time;//创建时间
-            $result = $order->addImgOnce($save_data);
-        }
-
-        if($result){
-            return $this->response("200","成功");
-        }else{
-            return $this->response("101","失败");
-        }
-    }
-
     /**
      * 收款列表-删除上传图片
      * 朱伟 2018-07-04

application/index/controller/OfficeRoom.php

@@ -34,6 +34,9 @@ class OfficeRoom extends Basic
      */
     public function edit()
     {
+        if (!$this->request->isAjax()) {
+            return view('office_room/officeEdit');
+        }
         if ($this->request->isPost()) {
             $data = $this->service->edit($this->params, $this->userId, $this->siteId);
             if ($data['status'] == 'successful') {
@@ -117,7 +120,7 @@ class OfficeRoom extends Basic
     public function getRoomList()
     {
         if (!$this->request->isAjax()) {
-            return view('office/officeBuildingList');
+            return view('office_room/officeBuildingList');
         }
         $result = $this->service->getRoomList($this->params, 1);
         if ($result['status'] == 'successful') {

application/index/service/OfficeRoomService.php

@@ -416,14 +416,9 @@ class OfficeRoomService
         if (empty($id['id'])) {
             $data['msg'] = '没有该文件';
         } else {
-            $result = $this->m_office_img->editData(['img_status' => 1], $id['id'], 'id');
-
-            if ($result) {
-                $data['status'] = 200;
-                $data['msg'] = '删除成功';
-            } else {
-                $data['msg'] = '删除失败';
-            }
+            $this->m_office_img->editData(['img_status' => 1], $id['id'], 'id');
+            $data['status'] = 200;
+            $data['msg'] = '删除成功';
         }
 
         return $data;
@@ -638,7 +633,7 @@ class OfficeRoomService
         a.is_register,a.age_limit_start,a.age_limit_end,a.rent_free,a.management_fee,a.slotting_fee,a.carport,a.enter_date,
         a.is_partition,a.decoration,a.payment_month,a.deposit_month,a.source,a.create_time,a.operation_id,a.landlord_remark,
         a.fee_rule,a.update_time,b.address,a.is_exclusive_type,a.agent_start_time,a.agent_end_time,c.name as business_name,
-        a.shop_sign,b.longitude,b.latitude,b.intro,a.is_rent';
+        a.shop_sign,b.longitude,b.latitude,b.intro,a.is_rent,a.room_number,a.is_show';
 
         $result = $this->m_office_room->getOfficeRoomInfo($field,['a.id'=>$id]);
         if (!$result) {
@@ -655,7 +650,9 @@ class OfficeRoomService
         //上传人
         $result['upload_info'] = $this->getUploadInfo($result['operation_id']);
         //独家方
-        $result['exclusive_info'] = $this->getExclusiveInfo($result['id']);
+        $result['exclusive_info'] = $this->getExclusiveInfo($result['id'],3);
+        //盘方
+        $result['room_relegation_info'] = $this->getExclusiveInfo($result['id'],2);
         //房东
         $result['landlord_info'] = $this->getLandlordInfo($result['id']);
         //房源数
@@ -783,10 +780,10 @@ class OfficeRoomService
     }
 
     //获取独家方
-    public function getExclusiveInfo($house_id){
+    public function getExclusiveInfo($house_id,$type=3){
         $exclusive_info = [];
         $params['house_id'] = $house_id;
-        $params['type'] = 3;
+        $params['type'] = $type;
         $params['is_del'] = 0;
         $res   = $this->agent_room->getAgentsByRoomId('b.id,name,a.type,b.phone', $params);
         if($res){
@@ -1254,7 +1251,7 @@ class OfficeRoomService
             $order = 'a.home_page_sort desc';
         }
 
-        $field = 'a.id,b.disc,b.title,b.address,c.name as business_name,a.building_id,a.price,a.price_total';
+        $field = 'a.id,b.disc,b.title,b.address,c.name as business_name,a.building_id,a.price,a.price_total,b.status';
         try {
             $data = $this->m_office_room->getRoomBuilding($page_no, $page_size, $order, $field, $where);
         } catch (\Exception $e) {

application/index/service/OfficeUserLogService.php

@@ -4,6 +4,7 @@ namespace app\index\service;
 
 use app\api_broker\service\CallPhoneService;
 use app\api_broker\service\ClientService;
+use app\api_broker\service\OfficeOrderLogService;
 use app\api_broker\service\OrderLogService;
 use app\api_broker\service\RedisCacheService;
 use app\api_broker\service\VipService;
@@ -33,7 +34,7 @@ class  OfficeUserLogService
     {
         $this->agentModel = new AAgents();
         $this->userModel = new Users();
-        $this->orderService = new OrderLogService();
+        $this->orderService = new OfficeOrderLogService();
     }
 
 
@@ -86,4 +87,36 @@ class  OfficeUserLogService
     }
 
 
+    /**
+     * 客户动态
+     * @param $user_id
+     * @param $site_id
+     * @param $type 1表示查最近的一条跟进，2查所有的订单更近
+     * @return false|mixed|null|\PDOStatement|string|\think\Collection
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @throws \think\exception\DbException
+     */
+    public function userLog($user_id, $site_id, $type)
+    {
+        $result = $this->orderService->selectListByUserIdAndSiteId($user_id, '', $site_id);
+        switch ($type){
+            case 1:
+                if(count($result) > 0){
+                    return $result[0];
+                }else{
+                    return null;
+                }
+
+            case 2:
+                return $result;
+            default:
+                return null;
+                break;
+        }
+
+
+    }
+
+
 }
\ No newline at end of file

application/index/view/office/officeBuildingList.html → application/index/view/office_room/officeBuildingList.html

@@ -238,7 +238,7 @@
                         <div class="pull-right">
                             <ul class="bread_btn">
                                 <li>
-                                    <a href="/admin.php/index/officeEdit" class="btn btn-default"><i class="icon-plus"></i>新增办公楼</a>
+                                    <a href="/admin.php/office_index/houseAdd" class="btn btn-default"><i class="icon-plus"></i>新增办公楼</a>
                                 </li>
                             </ul>
                         </div>

application/route.php

@@ -365,7 +365,7 @@ Route::group('index', [
     'dayAchievementsReport'       => ['index/PerformanceReport/dayAchievementsReportList', ['method' => 'POST|GET']],//日报liu
     'weekAchievementsReport'      => ['index/PerformanceReport/weekAchievementsReportList', ['method' => 'POST|GET']],//周报liu
     'officeBuildingList'          => ['index/OfficeBuilding/officeBuildingList', ['method' => 'POST|GET']],//办公楼liu
-    'officeEdit'                  => ['index/OfficeBuilding/officeEdit', ['method' => 'POST|GET']],//办公楼新增编辑liu
+//    'officeEdit'                  => ['index/OfficeBuilding/officeEdit', ['method' => 'POST|GET']],//办公楼新增编辑liu
     'buildingDictionary'          => ['index/OfficeBuilding/buildingDictionary', ['method' => 'POST|GET']],//楼盘字典liu
 
 
@@ -1042,8 +1042,14 @@ Route::group('office_index', [
     'del'                 => ['index/OfficeRoom/del', ['method' => 'POST']], //设置无效房源
     'isShow'              => ['index/OfficeRoom/isShow', ['method' => 'POST']],//是否对C端显示
     'followUpList'        => ['index/OfficeRemark/followUpList', ['method' => 'POST|GET']],
-    'addReceiptImg'       => ['index/Finance/addReceiptOfficeImg', ['method' => 'post|get']],//收款图片信息保存
+    'addReceiptImg'       => ['index/officePayLog/addReceiptOfficeImg', ['method' => 'post|get']],//收款图片信息保存
     'getPayLogImg'        => ['index/DailyPaper/getPayLogOfficeImg', ['method' => 'get|post']],
+    'receiptImgList'      => ['index/officePayLog/receiptOfficeImgList', ['method' => 'post|get']],//收款列表-收款图片列表
+    'getCollectionEdit'   => ['index/officePayLog/getCollectionEdit', ['method' => 'post']],//收款修改保存
+    'refundPayLog'        => ['index/officePayLog/refundPayLog', ['method' => 'POST']],//退款
+    'delPayLog'           => ['index/officePayLog/delPayLog', ['method' => 'POST']],//删除收款
+    'delAdjustment'       => ['index/officePayLog/delAdjustment', ['method' => 'post']],//撤销调整
+
 ]);
 
 Route::group('office_api', [

public/resource/template/office_building_list_template_tpl.html

@@ -81,11 +81,11 @@
 
             [% if(it[item]["is_vip"] == 1) { %]
                 [% if (check_auth('index/vipHouse') || it[item]['auth_edit_house']) { %]
-                    <a class="btn1 btn-success" href="/admin.php/index/officeEdit?id=[%= it[item]['id']%]" >编辑</a>
+                    <a class="btn1 btn-success" href="/admin.php/office_index/houseEdit?id=[%= it[item]['id']%]" >编辑</a>
                 [% } %]
             [% }else{ %]
                 [% if(it[item]['auth_edit_house'] || check_auth('index/houseEdit')) { %]
-                    <a class="btn1 btn-success" href="/admin.php/index/officeEdit?id=[%= it[item]['id']%]" >编辑</a>
+                    <a class="btn1 btn-success" href="/admin.php/office_index/houseEdit?id=[%= it[item]['id']%]" >编辑</a>
                 [% } %]
             [% } %]