Merge branch '0124-v3.0.6' into test

application/api/controller/Shop.php

@@ -330,7 +330,7 @@ class Shop extends Basic
             b.enter_num,b.external_item_advantage as item_advantage,b.sign_rule,b.do_business_date, b.opening_date,b.traffic,
             b.auditorium,b.tiny_brochure_url,b.start_business_date,b.fee_rule,b.age_limit,b.payment_month,b.deposit_month,b.external_slotting_fee,
             b.area_width,b.depth,b.electric_quantity,b.voltage,b.exhaust_fume,b.running_water,b.downriver,b.business_scope,b.decoration
-            ,b.rim_mating,b.section,b.crowd,b.other,a.is_show_image,a.fit_industry_type";
+            ,b.rim_mating,b.section,b.crowd,b.other,a.is_show_image,a.fit_industry_type,a.floor";
 
             $conditions['a.status'] = array("eq", 1);
             $conditions['a.is_show'] = array('eq', 0); //c端只显示公开楼盘

application/api_broker/controller/Broker.php

@@ -28,6 +28,7 @@ use app\model\Evaluate;
 use app\model\GOperatingRecords;
 use app\model\NoteLog;
 use app\model\OBargainModel;
+use app\model\SecretReport;
 use app\model\UPhoneFollowUp;
 use app\model\UPhoneFollowUpTemporary;
 use app\model\Users;
@@ -1017,4 +1018,51 @@ class Broker extends Basic
         }
         return $this->response($code, $msg);
     }
+
+
+    /**
+     * 电话记录
+     * @return \think\Response
+     */
+    public function getCallLog()
+    {
+        header('Access-Control-Allow-Origin:*');
+        $params = $this->params;
+
+       /* $params = array(
+            "agents_id" => 1550,
+        );*/
+
+        if (!isset($params["agents_id"])) {
+            return $this->response("101", "请求参数错误");
+        }
+
+        $pageNo   = empty($params['pageNo']) ? 1 : $params['pageNo'];
+        $pageSize = empty($params['pageSize']) ? 15 : $params['pageSize'];
+
+
+        $m_secret_report = new SecretReport();
+        $field  = 'a.id,a.call_time,a.users_id,a.time,b.name';
+        // $where['a.agents_id'] = $params["agents_id"];
+        $where = [];
+
+        // if (!empty($params['start_date']) && !empty($params['end_date'])) {
+        //     $where['a.call_time'] =  array('between', array($params['start_date']. ' 00:00:00', $params['end_date']. ' 23:59:59'));
+        // }
+        if (!empty($params['start_date'])) {
+            $where['a.call_time'] =  array('between', array($params['start_date']. ' 00:00:00', $params['start_date']. ' 23:59:59'));
+        }
+
+        if (is_numeric($params['users_type']) && !empty($this->params['users_id'])) {
+            $where['a.user_type'] = $params['users_type'];
+            $where['a.users_id'] = $params['users_id'];
+        }
+
+        $res        = $m_secret_report->getCallList($pageNo, $pageSize, 'id desc', $field, $where);
+        $res_total  = $m_secret_report->getCallListTotal($where);
+
+        $data['list']  = $res;
+        $data['total'] = $res_total;
+        return $this->response("200", "成功",$data);
+    }
 }
\ No newline at end of file

application/api_broker/controller/DailyPaper.php

@@ -79,6 +79,20 @@ class DailyPaper extends Basic
             "pos"          => "777",//pos机
             "other_bank"   => "888"//其他
         );*/
+//        if (empty($params["agent_id"]) || empty($params["agent_name"]) || empty($params["daily_date"]) ||
+//            !isset($params["alipay"]) || !isset($params["tenpay"]) || !isset($params["realty_pay"]) ||
+//            !isset($params["family_pay"]) || !isset($params["private_bank"]) || !isset($params["cash"]) ||
+//            !isset($params["pos"]) || !isset($params["other_bank"]) || !isset($params['site_id'])
+//        ) {
+//            return $this->response("101", "请求参数错误");
+//        }
+        if ($this->siteId == 10003) {
+            if (empty($params["agent_id"]) || empty($params["agent_name"]) || empty($params["daily_date"]) ||
+                !isset($params["alipay"]) || !isset($params["tenpay"]) || !isset($params['bank_card'])
+            ) {
+                return $this->response("101", "请求参数错误");
+            }
+        } else {
             if (empty($params["agent_id"]) || empty($params["agent_name"]) || empty($params["daily_date"]) ||
                 !isset($params["alipay"]) || !isset($params["tenpay"]) || !isset($params["realty_pay"]) ||
                 !isset($params["family_pay"]) || !isset($params["private_bank"]) || !isset($params["cash"]) ||
@@ -86,20 +100,25 @@ class DailyPaper extends Basic
             ) {
                 return $this->response("101", "请求参数错误");
             }
+        }
 
         $agent_id = $params["agent_id"];
         $agent_name = $params["agent_name"];
         $daily_date = $params["daily_date"];
         $alipay = $params["alipay"];
         $tenpay = $params["tenpay"];
+        $tenpay_2 = $params["tenpay_2"];
+        $alipay_2 = $params["alipay_2"];
         $realty_pay = $params["realty_pay"];
         $private_bank = $params["private_bank"];
         $family_pay = $params["family_pay"];
         $cash = $params["cash"];
         $pos = $params["pos"];
         $other_bank = $params["other_bank"];
+        $bank_card = $params["bank_card"];
+        $site_id = $this->siteId;
         $result = $this->service_->addDaily($agent_id, $agent_name, $daily_date, $alipay, $tenpay, $realty_pay,
-            $family_pay,$private_bank ,$cash, $pos, $other_bank);
+            $family_pay,$private_bank ,$cash, $pos, $other_bank, $tenpay_2, $alipay_2, $site_id, $bank_card);
         if ($result["code"] == 101) {
             return $this->response("101", $result["msg"]);
         } else {
@@ -153,11 +172,14 @@ class DailyPaper extends Basic
         $other_bank = $params["other_bank"];
         $remark = $params["remark"];
         $operation_status = $params["operation_status"];
+        $tenpay_2 = $params["tenpay_2"];
+        $alipay_2 = $params["alipay_2"];
+        $bank_card = $params["bank_card"];
         if($operation_status != 0 && $operation_status != 1){
             return $this->response("101", "审核状态错误");
         }
         $result = $this->service_->addDailyCheck($daily_id,$agent_id, $agent_name, $alipay, $tenpay, $realty_pay,
-            $family_pay,$private_bank ,$cash, $pos, $other_bank,$remark,$operation_status);
+            $family_pay,$private_bank ,$cash, $pos, $other_bank,$remark,$operation_status, $tenpay_2, $alipay_2, $bank_card);
         if ($result["code"] == 101) {
             return $this->response("101", $result["msg"]);
         } else {

application/api_broker/controller/OrderLog.php

@@ -181,7 +181,8 @@ class OrderLog extends Basic
         $income_time       = isset($params["income_time"]) ? $params["income_time"] : "";
         $received_money       = isset($params["received_money"]) ? $params["received_money"] : "";
         $type_ext       = isset($params["type_ext"]) ? $params["type_ext"] : "";
-        $is_ok        = $this->service_->addCollectingBillV2($params["agent_id"], $params["agent_name"], $params["report_id"], $params["order_id"], $params["order_no"],$params["collecting_bill"], $params["house_number"], $params["industry_type"], $remark, $transfer_img, $source,$income_time, $received_money, $type_ext);
+        $bargain_id  = isset($params['bargain_id']) ? $params['bargain_id'] : 0;
+        $is_ok        = $this->service_->addCollectingBillV2($params["agent_id"], $params["agent_name"], $params["report_id"], $params["order_id"], $params["order_no"],$params["collecting_bill"], $params["house_number"], $params["industry_type"], $remark, $transfer_img, $source,$income_time, $received_money, $type_ext, $bargain_id);
 
         if ($is_ok > 0) {
             return $this->response("200", "request success", [ "bill_id" => $is_ok ]);
@@ -203,7 +204,7 @@ class OrderLog extends Basic
 
         if (!isset($params["agent_id"]) || !isset($params["report_id"]) ||
             !isset($params["order_id"]) || !isset($params["order_no"]) | !isset($params["collecting_bill"]) ||
-            !isset($params["house_number"]) || !isset($params["industry_type"])  ) {
+            !isset($params["house_number"]) || !isset($params["industry_type"])  || !isset($params['bargain_id'])) {
             return $this->response("101", "请求参数错误");
         }
 
@@ -250,7 +251,7 @@ class OrderLog extends Basic
         $is_ok        = $this->service_->addCollectingBill($params["agent_id"], $params["agent_name"], $params["report_id"],
         $params["order_id"], $params["order_no"], $params["collecting_bill"], $params["house_number"], $params["industry_type"],
             $remark, $transfer_img, $source,$income_time,$params["is_dividend"],$last_transfer_time,$pay_id,
-            $receipt_number,$transfer_name, $received_money, $type_ext);
+            $receipt_number,$transfer_name, $received_money, $type_ext, $params['bargain_id']);
 
         if ($is_ok > 0) {
             return $this->response("200", "request success", [ "bill_id" => $is_ok ]);
@@ -642,6 +643,34 @@ class OrderLog extends Basic
 
     }
 
+    /**
+     * 搜索我的成交报告
+     * @return \think\Response
+     */
+    public function searchBargainListByOrderId()
+    {
+        $params = $this->params;
+        /*       $params = array(
+                   "order_id" => 11231,
+               );*/
+
+        if (!isset($params["order_id"]) ) {
+            return $this->response("101", "请求参数错误");
+        }
+
+        try {
+            $result = $this->service_->getBargainListByOrderId($params["order_id"]);
+            if (count($result) > 0) {
+                return $this->response("200", "request success", $result);
+            } else {
+                return $this->response("200", "request null");
+            }
+        } catch (Exception $e) {
+            return $this->response("101", "request error,msg:" . $e);
+        }
+
+    }
+
     /**
      * 搜索经纪人
      * @return \think\Response

application/api_broker/controller/RankingList.php

+<?php
+namespace app\api_broker\controller;
+
+
+
+use app\api_broker\extend\Basic;
+use app\index\service\RankingListService;
+use app\model\AAgents;
+use think\Request;
+
+/**
+ * Created by PhpStorm.
+ * User : zw
+ * Date : 2018/11/12
+ * Time : 2:04 PM
+ * Intro: pk榜
+ */
+class RankingList extends Basic{
+    private $service_;
+    public function __construct(Request $request = null)
+    {
+        parent::__construct($request);
+        $this->service_ = new RankingListService();
+    }
+
+
+
+    /**
+     * 查询分区业绩pk by 个人
+     * @return \think\Response
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @throws \think\exception\DbException
+     */
+    public function getRandKingListByAgentId(){
+        header('Access-Control-Allow-Origin:*');
+        $params = $this->params;
+        /*$params["agent_id"] = 1;
+        $this->siteId = 10001;*/
+        if(!isset($params["agent_id"])){
+            return $this->response("101","请求参数错误");
+        }
+        $agentModel = new AAgents();
+        $agent_info = $agentModel->getAgentInfo("id,position",$params["agent_id"]);
+        if($agent_info["position"] == 5){
+            return $this->response("101","该经纪人没有分配职称");
+        }
+        $result = $this->service_->RankingList( $agent_info["position"],$this->siteId);
+        $agent_id = $params["agent_id"];
+        $data = [];
+        foreach ($result as $key=>$value){
+            $is_exits = false;
+            foreach ($value as $item){
+                if($item["id"] == $agent_id){
+                    $is_exits = true;
+                }
+            }
+            if(!$is_exits){
+               unset($result[$key]);
+            }else{
+                $data["list"] = $value;
+                $data["grade"] = $key;
+            }
+        }
+        $data["position"] = $agent_info["position"];
+        if(count($result) > 0){
+            return $this->response("200","success",$data);
+        }
+        return $this->response("200","null");
+    }
+
+    /**
+     * 首页团队排名
+     * @return \think\Response
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @throws \think\exception\DbException
+     */
+    public function getStoreRandKingListByAgentId(){
+        header('Access-Control-Allow-Origin:*');
+        $params = $this->params;
+        /*$params["agent_id"] = 1;
+        $this->siteId = 10001;*/
+        if(!isset($params["agent_id"])){
+            return $this->response("101","请求参数错误");
+        }
+        $agentModel = new AAgents();
+        $agent_info = $agentModel->getAgentInfo("id,position,store_id",$params["agent_id"]);
+        if(count($agent_info) <= 0){
+            return $this->response("101","该经纪人不存在");
+        }
+        $result = $this->service_->StoreRankingList( $this->siteId);
+        $store_id = $agent_info["store_id"];
+        $data = [];
+        foreach ($result as $key=>$value){
+            $is_exits = false;
+            foreach ($value as $item){
+                if($item["id"] == $store_id){
+                    $is_exits = true;
+                }
+            }
+            if(!$is_exits){
+                unset($result[$key]);
+            }else{
+                $data["list"] = $value;
+                $data["grade"] = $key;
+            }
+        }
+        if(count($result) > 0){
+            return $this->response("200","success",$data);
+        }
+        return $this->response("200","null");
+    }
+
+}
\ No newline at end of file

application/api_broker/controller/Shop.php

@@ -60,6 +60,7 @@ class Shop extends Basic
         header('Access-Control-Allow-Origin:*');
 
         $params = $this->params;
+        big_log(json_encode($params));
         /*  $params = array(
               "site_area"           => 4, //来源 1c首页  2c搜索 3b首页 4b搜索 5b报备
              // "title"               => "vv", //1，2 external_title  ,3,4internal_title
@@ -100,13 +101,13 @@ class Shop extends Basic
 
         if ($params['site_area'] == 1 || $params['site_area'] == 2) {
             $field = "id,external_title as title,external_address as address,city,disc,business_district_id,status,industry_type
-            ,shop_area_start,shop_area_end,shop_type,residue_num,shop_sign,is_carefully_chosen,rent_type,rent_price,is_exclusive_type";
+            ,shop_area_start,shop_area_end,shop_type,residue_num,shop_sign,is_carefully_chosen,rent_type,rent_price,is_exclusive_type,floor";
 
         } else {
            // $field = "id,internal_title as title,internal_address as address,city,disc,business_district_id,status,industry_type
             $field = "id,internal_title as title,internal_address as address,city,disc,business_district_id,status,industry_type
             ,shop_area_start,shop_area_end,shop_type,residue_num,shop_sign,is_carefully_chosen,rent_type,rent_price,is_lock
-            ,is_exclusive_type,is_vip";
+            ,is_exclusive_type,is_vip,floor";
             if(empty($params["city"])){
                 $conditions["city"] = trim($this->city);
             }else{
@@ -143,6 +144,10 @@ class Shop extends Basic
             $conditions['fit_industry_type'] = array('like', "%" . trim($params['fit_industry_type']) . "%");
         }
 
+        if (isset($params['is_vip'])) { //适合业态
+            $conditions['is_vip'] = $params['is_vip'];
+        }
+
         $order_ = "";
         $spTagArr = array();
         switch ($params['site_area']) {
@@ -286,32 +291,45 @@ class Shop extends Basic
             //锁盘后，盘方、独家方、有权限的可以查看
             $result[$key]["look_lock"] = 0;
             if (isset($val['is_lock']) && $val['is_lock'] == 1) {
+
+                $isLook = $this->isLookLock($val['id']);
+                $result[$key]["look_lock"] = $isLook ? 1 : 0;
+            }
+        }
+
+
+        if (empty($result)) {
+            return $this->response("200", "此条件没有找到数据");
+        }
+
+        return $this->response("200", 'request success', $result);
+    }
+
+    /**
+     * 判断是否有查看商铺权限
+     * @param $house_id
+     * @return bool
+     */
+    private function isLookLock($house_id){
         $vip = new VipService();
         if (!$vip->vip($this->agentId, 'index/lockHouse')) {
-                    $result[$key]["look_lock"] = 1;
+            return true;
         }
 
         $m_agent = new GHousesToAgents();
         $agent_where['a.agents_id'] = $this->agentId;
         $agent_where['a.type'] = ['in', '2,3'];
-                $agent_where['a.houses_id'] = $val['id'];
+        $agent_where['a.houses_id'] = $house_id;
         $agent_where['a.is_del'] = 0;
         $agent_data = $m_agent->getAgentsHouseField('a.id', $agent_where);
 
         foreach ($agent_data as $vvv) {
             if ($vvv > 0) {
-                        $result[$key]["look_lock"] = 1;
-                    }
-                }
+                return true;
             }
         }
+        return false;
 
-
-        if (empty($result)) {
-            return $this->response("200", "此条件没有找到数据");
-        }
-
-        return $this->response("200", 'request success', $result);
     }
 
     /**
@@ -504,12 +522,17 @@ class Shop extends Basic
 
         $field .= ',b.age_limit,b.payment_month,b.deposit_month,b.external_slotting_fee,c.agents_id, b.area_width,b.depth,
         b.electric_quantity,b.voltage,b.exhaust_fume,b.running_water,b.downriver,b.business_scope,b.decoration,b.source
-        ,b.rim_mating,b.section,b.crowd,b.other,a.is_lock,b.project_name,a.is_vip,a.fit_industry_type,a.is_show_image,a.external_image_id';
+        ,b.rim_mating,b.section,b.crowd,b.other,a.is_lock,b.project_name,a.is_vip,a.fit_industry_type,a.is_show_image,a.external_image_id,a.floor';
         $result = $this->gHousesModel->getHouseDetailById($field, $conditions);
         if (count($result) <= 0) {
             return $this->response("101", '此楼盘不存在');
         }
 
+        $is_look = $this->isLookLock($result['id']);
+        if ( $result['is_lock'] == 1 && !$is_look) {
+            return $this->response("101", '没有查看权限');
+        }
+
         if ($result["start_business_date"] == "0000-00-00 00:00:00" || empty($result["start_business_date"])) {
             $result["start_business_date"] = "";
         } else {

application/api_broker/controller/User.php

@@ -110,7 +110,10 @@ class User extends Basic
             $conditions['user_name'] = array( "like", "%" . trim($params['user_name']) . "%" );
             $is_search               = true;
         }
-
+        if (isset($params['user_nick'])) {
+            $conditions['user_nick'] = array( "like", "%" . trim($params['user_nick']) . "%" );
+            $is_search               = true;
+        }
         if (isset($params['user_phone'])) {
             $conditions['user_phone'] = array( "like", "%" . trim($params['user_phone']) . "%" );
             $is_search                = true;

application/api_broker/service/DailyPaperService.php

@@ -106,7 +106,8 @@ class DailyPaperService
 
         //todo 统计各金额
         $result["total_info"] = $this->getTotal($store_id, $daily_data);
-
+        $result["site_id"] = $daily_info[0]['site_id'];
+        unset($daily_info["site_id"]);
         return ["code" => 200, "data" => $result];
 
     }
@@ -164,29 +165,38 @@ class DailyPaperService
         $payLogModel = new OPayLogModel();
         $total_arr = $payLogModel->getTotal($field, $params, "pay_type");
         $total["alipay"] = 0;
+        $total["alipay_2"] = 0;
         $total["tenpay"] = 0;
+        $total["tenpay_2"] = 0;
         $total["pos"] = 0;
         $total["realty_pay"] = 0;
         $total["family_pay"] = 0;
         $total["private_bank"] = 0;
         $total["cash"] = 0;
         $total["other_bank"] = 0;
+        $total["bank_card"] = 0;
         if (count($total_arr) <= 0) {
             return $total;
         }
         foreach ($total_arr as $item) {
             switch ($item["pay_type"]) {
                 case 10:
-                    $total["alipay1"] = $item["money"];
+                    $total["alipay"] = $item["money"];
                     break;
                 case 11:
-                    $total["alipay2"] = $item["money"];
+                    $total["alipay_2"] = $item["money"];
+                    break;
+                case 12:
+                    $total["alipay"] = $item["money"];
                     break;
                 case 20:
-                    $total["tenpay1"] = $item["money"];
+                    $total["tenpay"] = $item["money"];
                     break;
                 case 21:
-                    $total["tenpay2"] = $item["money"];
+                    $total["tenpay_2"] = $item["money"];
+                    break;
+                case 22:
+                    $total["tenpay"] = $item["money"];
                     break;
                 case 30:
                     $total["pos"] = $item["money"];
@@ -206,14 +216,11 @@ class DailyPaperService
                 case 60:
                     $total["other_bank"] = $item["money"];
                     break;
+                case 70:
+                    $total["bank_card"] = $item["money"];
+                    break;
             }
         }
-        $total["alipay"] = $total["alipay1"] + $total["alipay2"];
-        $total["tenpay"] = $total["tenpay1"] + $total["tenpay2"];
-        unset($total["alipay1"]);
-        unset($total["alipay2"]);
-        unset($total["tenpay1"]);
-        unset($total["tenpay2"]);
         return $total;
     }
 
@@ -429,7 +436,7 @@ class DailyPaperService
     private function getCheckList($daily_id,$agent_id = 0)
     {
         $field = "id,daily_id,operation_id,operation_name,remark,alipay,tenpay,realty_pay,family_pay,private_bank,
-        cash,pos,other_bank,create_time,update_time";
+        cash,pos,other_bank,create_time,update_time,tenpay_2,alipay_2,bank_card";
         $params["daily_id"] = $daily_id;
         $params["is_del"] = 0;
         if($agent_id > 0){
@@ -439,7 +446,6 @@ class DailyPaperService
         return $this->oDailyLogModel->getDailyLogList($field, $params, 1, 15);
     }
 
-
     /**
      * @param $agent_id
      * @param $agent_name
@@ -452,13 +458,17 @@ class DailyPaperService
      * @param $cash
      * @param $pos
      * @param $other_bank
-     * @return array|int
+     * @param $tenpay_2
+     * @param $alipay_2
+     * @param $site_id
+     * @param $bank_card
+     * @return array
      * @throws \think\db\exception\DataNotFoundException
      * @throws \think\db\exception\ModelNotFoundException
      * @throws \think\exception\DbException
      */
     public function addDaily($agent_id, $agent_name, $daily_date, $alipay, $tenpay, $realty_pay,
-                             $family_pay, $private_bank, $cash, $pos, $other_bank)
+                             $family_pay, $private_bank, $cash, $pos, $other_bank, $tenpay_2, $alipay_2, $site_id, $bank_card)
     {
         $agent_info_arr["agent_id"] = $agent_id;
         $agent_info_field = "id,name,store_id,district_id,level";
@@ -473,7 +483,7 @@ class DailyPaperService
             return ["code" => 101, "msg" => "请勿重复提交日报"];
         }
         $params = $this->dailyBin($agent_id, $agent_name, $daily_date, $alipay, $tenpay, $realty_pay,
-            $family_pay, $private_bank, $cash, $pos, $other_bank, $agent_info[0]["store_id"], $agent_info[0]["district_id"]);
+            $family_pay, $private_bank, $cash, $pos, $other_bank, $agent_info[0]["store_id"], $agent_info[0]["district_id"], $tenpay_2, $alipay_2, $site_id, $bank_card);
         $is_ok = $this->oDailyModel->addDaily($params);
         if ($is_ok > 0) {
             return ["code" => 200, "data" => null];
@@ -483,7 +493,7 @@ class DailyPaperService
     }
 
     public function dailyBin($agent_id, $agent_name, $daily_date, $alipay, $tenpay, $realty_pay,
-                             $family_pay, $private_bank, $cash, $pos, $other_bank, $store_id, $district_id)
+                             $family_pay, $private_bank, $cash, $pos, $other_bank, $store_id, $district_id, $tenpay_2, $alipay_2, $site_id, $bank_card)
     {
         $arr["agent_id"] = $agent_id;
         $arr["agent_name"] = $agent_name;
@@ -498,6 +508,10 @@ class DailyPaperService
         $arr["cash"] = $cash;
         $arr["pos"] = $pos;
         $arr["other_bank"] = $other_bank;
+        $arr["bank_card"] = $bank_card;
+        $arr["tenpay_2"] = $tenpay_2;
+        $arr["alipay_2"] = $alipay_2;
+        $arr["site_id"] = $site_id;
         $arr["create_time"] = date("Y-m-d H:i:s", time());
         $arr["update_time"] = date("Y-m-d H:i:s", time());
         return $arr;
@@ -523,7 +537,7 @@ class DailyPaperService
      * @throws \think\exception\DbException
      */
     public function addDailyCheck($daily_id, $agent_id, $agent_name, $alipay, $tenpay, $realty_pay,
-                                  $family_pay, $private_bank, $cash, $pos, $other_bank, $remark,$operation_status)
+                                  $family_pay, $private_bank, $cash, $pos, $other_bank, $remark,$operation_status, $tenpay_2, $alipay_2, $bank_card)
     {
         $agent_info_arr["agent_id"] = $agent_id;
         $agent_info_field = "id,name,store_id,district_id,level";
@@ -539,7 +553,7 @@ class DailyPaperService
             return ["code" => 101, "msg" => "您已经审核过了"];
         }
         $params = $this->dailyLogBin($daily_id, $agent_id, $agent_name, $alipay, $tenpay, $realty_pay,
-            $family_pay, $private_bank, $cash, $pos, $other_bank,  $remark,$operation_status);
+            $family_pay, $private_bank, $cash, $pos, $other_bank,  $remark,$operation_status, $tenpay_2, $alipay_2, $bank_card);
 
         $is_ok =  $this->oDailyLogModel->addDailyCheck($params);
 
@@ -576,7 +590,7 @@ class DailyPaperService
      * @return mixed
      */
     public function dailyLogBin($daily_id, $agent_id, $agent_name, $alipay, $tenpay, $realty_pay,
-                                $family_pay, $private_bank, $cash, $pos, $other_bank, $remark,$operation_status)
+                                $family_pay, $private_bank, $cash, $pos, $other_bank, $remark,$operation_status, $tenpay_2, $alipay_2, $bank_card)
     {
         $arr["daily_id"] = $daily_id;
         $arr["operation_id"] = $agent_id;
@@ -591,6 +605,9 @@ class DailyPaperService
         $arr["pos"] = $pos;
         $arr["other_bank"] = $other_bank;
         $arr["operation_status"] = $operation_status;
+        $arr["tenpay_2"] = $tenpay_2;
+        $arr["alipay_2"] = $alipay_2;
+        $arr["bank_card"] = $bank_card;
         $arr["create_time"] = date("Y-m-d H:i:s", time());
         $arr["update_time"] = date("Y-m-d H:i:s", time());
         return $arr;
@@ -610,7 +627,7 @@ class DailyPaperService
     private function getDailyInfo($store_id, $daily_data,$type = 0)
     {
         $field_info_field = "id,agent_id,agent_name,daily_date,alipay,tenpay,realty_pay,family_pay,private_bank,
-        cash,pos,other_bank,status,create_time,update_time";
+        cash,pos,other_bank,status,create_time,update_time,alipay_2,tenpay_2,site_id,bank_card";
         if($type == 1){
             $daily_info_params["agent_id"] = $store_id;
         }else{

application/api_broker/service/OrderLogService.php

@@ -65,7 +65,7 @@ class OrderLogService
      * @throws \think\exception\DbException
      */
     public function addCollectingBillV2($agent_id, $agent_name, $report_id, $order_id, $order_no, $collecting_bill, $house_number,
-                                        $industry_type, $remark, $transfer_img, $source, $income_time, $received_money, $type_ext)
+                                        $industry_type, $remark, $transfer_img, $source, $income_time, $received_money, $type_ext, $bargain_id)
     {
         $bill_arr = $params = [];
         $father_id = 0;
@@ -73,11 +73,11 @@ class OrderLogService
             if (isset($collecting["type"]) && isset($collecting["pay_type"]) && isset($collecting["money"])) {
                 if ($father_id == 0) {
                     $params = $this->collectingBillBin($father_id, $collecting, $agent_id, $agent_name, $report_id, $order_id, $order_no,
-                        $house_number, $industry_type, $remark, $transfer_img, $source, $income_time, 0, 0, $received_money, $type_ext);
+                        $house_number, $industry_type, $remark, $transfer_img, $source, $income_time, 0, 0, $received_money, $type_ext, $bargain_id);
                     $father_id = $this->payLogModel->insertPayLog($params);
                 } else {
                     array_push($bill_arr, $this->collectingBillBin($father_id, $collecting, $agent_id, $agent_name, $report_id, $order_id, $order_no,
-                        $house_number, $industry_type, $remark, $transfer_img, $source, $income_time, 0, 0, $received_money, $type_ext));
+                        $house_number, $industry_type, $remark, $transfer_img, $source, $income_time, 0, 0, $received_money, $type_ext, $bargain_id));
                 }
             }
         }
@@ -126,7 +126,7 @@ class OrderLogService
      */
     public function addCollectingBill($agent_id, $agent_name, $report_id, $order_id, $order_no, $collecting_bill, $house_number,
                                       $industry_type, $remark, $transfer_img, $source, $income_time, $is_dividend,
-                                      $last_transfer_time, $pay_id, $receipt_number, $transfer_name, $received_money, $type_ext)
+                                      $last_transfer_time, $pay_id, $receipt_number, $transfer_name, $received_money, $type_ext, $bargain_id)
     {
         $bill_arr = $params = [];
         $father_id = 0;
@@ -148,12 +148,12 @@ class OrderLogService
                 if ($father_id == 0) {
                     $params = $this->collectingBillBin($father_id, $collecting, $agent_id, $agent_name, $report_id,
                         $order_id, $order_no, $house_number, $industry_type, $remark, $transfer_img, $source, $income_time,
-                        $is_dividend, $last_transfer_time, $receipt_number, $transfer_name, $received_money, $type_ext);
+                        $is_dividend, $last_transfer_time, $receipt_number, $transfer_name, $received_money, $type_ext, $bargain_id);
                     $father_id = $this->payLogModel->insertPayLog($params);
                 } else {
                     array_push($bill_arr, $this->collectingBillBin($father_id, $collecting, $agent_id, $agent_name,
                         $report_id, $order_id, $order_no, $house_number, $industry_type, $remark, $transfer_img, $source,
-                        $income_time, $is_dividend, $last_transfer_time, $receipt_number, $transfer_name, $received_money, $type_ext));
+                        $income_time, $is_dividend, $last_transfer_time, $receipt_number, $transfer_name, $received_money, $type_ext, $bargain_id));
                 }
             }
         }
@@ -288,11 +288,13 @@ class OrderLogService
      * @param $receipt_number
      * @param $transfer_name
      * @param $received_money
+     * @param $type_ext
+     * @param $bargain_id
      * @return mixed
      */
     private function collectingBillBin($father_id, $collecting_arr, $agent_id, $agent_name, $report_id, $order_id,
                                        $order_no, $house_number, $industry_type, $remark, $transfer_img, $source,
-                                       $income_time, $is_dividend, $last_transfer_time, $receipt_number, $transfer_name, $received_money, $type_ext)
+                                       $income_time, $is_dividend, $last_transfer_time, $receipt_number, $transfer_name, $received_money, $type_ext, $bargain_id)
     {
 
         $arr["report_id"] = $report_id;
@@ -316,6 +318,7 @@ class OrderLogService
         $arr["is_dividend"] = $is_dividend;
         $arr["received_money"] = $received_money;
         $arr["type_ext"] = $type_ext;
+        $arr["bargain_id"] = $bargain_id;
         if ($income_time) {
             $arr["income_time"] = date("Y-m-d H:i:s", $income_time);
         }
@@ -1374,6 +1377,42 @@ class OrderLogService
 
     }
 
+    /**
+     * 根据订单id搜索成交报告
+     * @param $params
+     * @return array
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @throws \think\exception\DbException
+     */
+    public function getBargainListByOrderId($order_id)
+    {
+        $params["order_id"] = $order_id;
+
+        $bargainModel = new OBargainModel();
+        $filed = "a.id,a.father_id,a.house_number,a.commission,a.agent_id,a.create_time,b.user_phone,b.user_name,b.user_id,c.id as order_id,
+        d.id as house_id,d.internal_title,d.internal_address,c.order_no,a.report_id";
+        $result = $bargainModel->selectBargainList($filed, $params,1, 15);
+        $list = [];
+        foreach ($result as $k => $v) {
+            $father_id = $v["father_id"];
+            if ($father_id > 0 && in_array($father_id, $list)) {
+                unset($result[$k]);
+            } else {
+                $result[$k]["create_time"] = date("Y-m-d", strtotime($v["create_time"]));
+                $result[$k]["id"] = $v["father_id"] == 0 ? $v["id"] : $v["father_id"];
+                array_push($list, $father_id);
+            }
+        }
+        $sortResult = [];
+        foreach ($result as $k => $v) {
+            $sortResult[] = $v;
+        }
+        return $sortResult;
+
+    }
+
+
     private function recursion($params, $cent_commissions, $i)
     {
 

application/api_broker/service/PayLogService.php

@@ -312,4 +312,47 @@ class PayLogService
         }
     }
 
+    /**
+     * 计算收款-退款
+     *
+     * @param $bargain_id
+     * @return bool|float|int
+     */
+    public function getPayLogRefundSurplusMoney($bargain_id) {
+        if (empty($bargain_id)) {
+            return false;
+        }
+
+        $pay_id = $this->payLogModel->getFieldColumn('id', ['bargain_id'=>$bargain_id]);
+
+        if (empty($pay_id)) {
+            return false;
+        }
+        $money = $this->payLogModel->getSum('money', ['id'=> ['in', $pay_id]]);
+        if ($money > 0) {
+            $refund_money = $this->oRefundModel->getRefundSum('refund_money', ['pay_log_id'=>['in', $pay_id]]);
+            $result = $money - $refund_money;
+        } else {
+            $result = 0;
+        }
+        return $result;
+    }
+
+    /**
+     * @param $bargain_id
+     * @return bool
+     */
+    public function checkPayLogAdjustment($bargain_id) {
+        if (empty($bargain_id)) {
+            return false;
+        }
+        $result = false;
+        $pay_id = $this->payLogModel->getFieldColumn('id', ['bargain_id'=>$bargain_id]);
+        $id = $this->payLogAdjustmentModel->getFieldValue('id', ['paylog_id'=> ['in', $pay_id]]);
+        if ($id > 0) {
+            $result = true;
+        }
+
+        return $result;
+    }
 }
\ No newline at end of file

application/app_broker/view/index/shop_detail_pc.html

@@ -37,7 +37,7 @@
 							<tr>
 								<td>业态：{{d.industry_type}}</td>
 								<td>{{(d.shop_type==1)?'当前经营':'已入驻'}}：{{d.enter_num}}</td>
-								<td></td>
+								<td>楼层：{{d.floor}}</td>
 								<td></td>
 							</tr>
 							<tr>

application/chat/controller/AppChat.php

@@ -15,6 +15,7 @@ use app\chat\extend\Basic;
 use app\chat\service\ChatService;
 use app\chat\utils\RPush;
 use app\extra\RedisPackage;
+use app\model\AAgents;
 use app\model\ChatMsg;
 use app\model\GHouses;
 use app\model\GHousesImgs;
@@ -483,8 +484,10 @@ class AppChat extends Basic
         $field = "id,addressee_id,type,message,house_id,create_time,is_read";
 
         //获取此经纪人的所有盘方楼盘id
+        $params_agent_id = $this->getAgentIds($params['agent_id']);//如果是店长，将员工的消息也搜出来
 
-        $param["addressee_id"] = $params["agent_id"];
+        $param["addressee_id"] = array("in", $params_agent_id);
+        // $param["addressee_id"] = $params["agent_id"];
         $param["type"] = array("in", "1,3");
 
         $msgModel = new MPushMessage();
@@ -633,4 +636,35 @@ class AppChat extends Basic
 
     }
 
+    /**
+     * 查询店长下面的业务员id
+     * @param $agent_id
+     * @return string
+     */
+    public function getAgentIds($agent_id){
+        $m_agent = new AAgents();
+        $a_res_level= $m_agent->getAgentFieldById($agent_id, 'level');
+        if($a_res_level == 20){
+            //查询总监下面门店的所有经纪人
+            $a_res_store_id= $m_agent->getAgentFieldById($agent_id, 'store_id');
+            $params = [];
+            $params["store_id"] = $a_res_store_id;
+            $params["status"] = 0; //只查询正常状态的经纪人
+            $agentsArr = $m_agent->getAgentsByStoreId($params);
+            if (count($agentsArr) > 0) {
+                $agent_ids = "";
+                foreach ($agentsArr as $k => $v) {
+                    $agent_ids .= $v["id"] . ",";
+                }
+                $agent_ids = rtrim($agent_ids, ",");//经纪人ID集合
+            }//查询总监下面门店的所有经纪人 end
+
+            return $agent_ids;
+
+        }else{
+            return $agent_id;
+        }
+
+    }
+
 }

application/index/controller/CellPhone.php

@@ -88,7 +88,11 @@ class CellPhone extends Basic
             }
 
             if (!empty($this->params['user_type'])) {
-                $where['user_type'] = $this->params['a.user_type'];
+                $where['a.user_type'] = $this->params['user_type'];
+            }
+
+            if (!empty($this->params['id'])) {
+                $where['a.id'] = $this->params['id'];
             }
 
             $list  = $report->getCallList($pageNo, $pageSize, 'id desc', $field, $where);

application/index/controller/DailyPaper.php

@@ -4,6 +4,7 @@ namespace app\index\controller;
 
 use app\index\extend\Basic;
 use app\api_broker\service\DailyPaperService;
+use app\model\ODaily;
 use think\Request;
 
 /**
@@ -79,6 +80,14 @@ class DailyPaper extends Basic
             "pos"          => "777",//pos机
             "other_bank"   => "888"//其他
         );*/
+
+        if ($this->siteId == 10003) {
+            if (empty($params["agent_id"]) || empty($params["agent_name"]) || empty($params["daily_date"]) ||
+                !isset($params["alipay"]) || !isset($params["tenpay"]) || !isset($params['bank_card'])
+            ) {
+                return $this->response("101", "请求参数错误");
+            }
+        } else {
             if (empty($params["agent_id"]) || empty($params["agent_name"]) || empty($params["daily_date"]) ||
                 !isset($params["alipay"]) || !isset($params["tenpay"]) || !isset($params["realty_pay"]) ||
                 !isset($params["family_pay"]) || !isset($params["private_bank"]) || !isset($params["cash"]) ||
@@ -86,11 +95,15 @@ class DailyPaper extends Basic
             ) {
                 return $this->response("101", "请求参数错误");
             }
+        }
+
 
         $agent_id = $params["agent_id"];
         $agent_name = $params["agent_name"];
         $daily_date = $params["daily_date"];
         $alipay = $params["alipay"];
+        $tenpay_2 = $params["tenpay_2"];
+        $alipay_2 = $params["alipay_2"];
         $tenpay = $params["tenpay"];
         $realty_pay = $params["realty_pay"];
         $private_bank = $params["private_bank"];
@@ -98,8 +111,10 @@ class DailyPaper extends Basic
         $cash = $params["cash"];
         $pos = $params["pos"];
         $other_bank = $params["other_bank"];
+        $bank_card = $params["bank_card"];
+        $site_id = $this->siteId;
         $result = $this->service_->addDaily($agent_id, $agent_name, $daily_date, $alipay, $tenpay, $realty_pay,
-            $family_pay,$private_bank ,$cash, $pos, $other_bank);
+            $family_pay,$private_bank ,$cash, $pos, $other_bank, $tenpay_2, $alipay_2, $site_id, $bank_card);
         if ($result["code"] == 101) {
             return $this->response("101", $result["msg"]);
         } else {
@@ -132,6 +147,27 @@ class DailyPaper extends Basic
             "operation_status" => 1,//0审核通过 1转为已审核
             "remark"           => "888"//备注,
         );*/
+//        if (!isset($params["daily_id"]) || empty($params["agent_id"]) || empty($params["agent_name"]) ||
+//            !isset($params["alipay"]) || !isset($params["tenpay"]) || !isset($params["realty_pay"]) ||
+//            !isset($params["family_pay"]) || !isset($params["private_bank"]) || !isset($params["cash"]) ||
+//            !isset($params["pos"]) || !isset($params["other_bank"]) || !isset($params["operation_status"])
+//        ) {
+//            return $this->response("101", "请求参数错误");
+//        }
+        $m_daily = new ODaily();
+        $daily_data = $m_daily->getDailyList('id,site_id',['id'=>$params['daily_id']],1,1);
+
+        if (empty($daily_data)) {
+            return $this->response(101, '没有该记录，审核失败');
+        }
+
+        if ($daily_data[0]['site_id'] == 10003) {
+            if (empty($params["agent_id"]) || empty($params["agent_name"]) || empty($params["daily_id"]) ||
+                !isset($params["alipay"]) || !isset($params["tenpay"]) || !isset($params['bank_card']) || !isset($params["operation_status"])
+            ) {
+                return $this->response("101", "请求参数错误");
+            }
+        } else {
             if (!isset($params["daily_id"]) || empty($params["agent_id"]) || empty($params["agent_name"]) ||
                 !isset($params["alipay"]) || !isset($params["tenpay"]) || !isset($params["realty_pay"]) ||
                 !isset($params["family_pay"]) || !isset($params["private_bank"]) || !isset($params["cash"]) ||
@@ -139,6 +175,7 @@ class DailyPaper extends Basic
             ) {
                 return $this->response("101", "请求参数错误");
             }
+        }
 
         $daily_id = $params["daily_id"];
         $agent_id = $params["agent_id"];
@@ -153,11 +190,14 @@ class DailyPaper extends Basic
         $other_bank = $params["other_bank"];
         $remark = $params["remark"];
         $operation_status = $params["operation_status"];
+        $tenpay_2 = $params["tenpay_2"];
+        $alipay_2 = $params["alipay_2"];
+        $bank_card = $params["bank_card"];
         if($operation_status != 0 && $operation_status != 1){
             return $this->response("101", "审核状态错误");
         }
         $result = $this->service_->addDailyCheck($daily_id,$agent_id, $agent_name, $alipay, $tenpay, $realty_pay,
-            $family_pay,$private_bank ,$cash, $pos, $other_bank,$remark,$operation_status);
+            $family_pay,$private_bank ,$cash, $pos, $other_bank,$remark,$operation_status, $tenpay_2, $alipay_2, $bank_card);
         if ($result["code"] == 101) {
             return $this->response("101", $result["msg"]);
         } else {

application/index/controller/Houses.php

@@ -268,7 +268,7 @@ class Houses extends Basic
             }
 
             $fields = 'id,shop_type,internal_title,rent_price,is_show,create_time,residue_num,rent_type,status,
-            shop_area_start,shop_area_end,industry_type,disc,is_carefully_chosen,is_exclusive_type,is_lock,is_vip';
+            shop_area_start,shop_area_end,industry_type,disc,is_carefully_chosen,is_exclusive_type,is_lock,is_vip,is_show,floor';
 
             /*楼盘编号*/
             if ($this->params['id'] != NULL) {

application/index/controller/ImageDepot.php

@@ -6,6 +6,7 @@ use app\api_broker\service\VipService;
 use app\index\extend\Basic;
 use app\index\service\ImageDepotService;
 use app\index\service\UserService;
+use app\model\AAgents;
 use app\model\GBusinessDistrict;
 use app\model\GImageDepot;
 use think\Cache;
@@ -177,49 +178,14 @@ class ImageDepot extends Basic
 
     public function ceshi()
     {
-        $s = new UserService();
-        //查询
-        $user_info_list = $s->userBindInfo(1);
-        return $this->response("200", "成功",$user_info_list);
-
-        //新增
-        // $user_id = 3;
-        // $bind_id = 1;
-        // $add_res = $s->addUserBind($user_id,$bind_id);
-        // switch ($add_res) {
-        //     case 1 :
-        //         return $this->response("300", "参数不全");
-        //         break;
-        //     case 2 :
-        //         return $this->response("300", "当前客户已经存在绑定关系");
-        //         break;
-        //     case 3 :
-        //         return $this->response("300", "当前客户已经存在绑定关系");
-        //         break;
-        //     case 4 :
-        //         return $this->response("300", "绑定客户关系数超限");
-        //         break;
-        //     case 5 :
-        //         return $this->response("300", "绑定失败");
-        //         break;
-        //     case 0 :
-        //         return $this->response("200", "绑定成功");
-        //         break;
-        //     default :
-        //         return $this->response("300", "绑定失败");
-        //
-        // }
-
-        //解除
-        // $rm_res = $s->removeUserBind($user_id);
-        // if($rm_res == 1){
-        //     return $this->response("200", "解绑成功");
-        // }else{
-        //     return $this->response("200", "解绑失败");
-        // }
+      
+
     }
 
 
 
+
+
+
 }
 

application/index/controller/Member.php

@@ -277,9 +277,16 @@ class Member extends Basic{
             }
 
             //客户姓名
+            if (!empty($params['user_name'])) {
+                $if_search_user = false;
+                $where['a.user_name'] = [ 'LIKE', '%' . $params['user_name'] . '%' ];
+                unset($where['a.create_time']);
+            }
+
+            //客户昵称
             if (!empty($params['user_nick'])) {
                 $if_search_user = false;
-                $where['a.user_name'] = [ 'LIKE', '%' . $params['user_nick'] . '%' ];
+                $where['a.user_nick'] = [ 'LIKE', '%' . $params['user_nick'] . '%' ];
                 unset($where['a.create_time']);
             }
 

application/index/controller/PerformanceInfo.php

@@ -123,7 +123,8 @@ class PerformanceInfo extends Basic
             $return_total  = $this->oBargainModel->performancelInfoTotal($where,$field);
 
             /*计算业绩总计 即应分佣金 根据分佣ID去重*/
-            $field  = 'Obargain.scale_fee,Obargain.id,Obargain.father_id';
+            /*real_fee o_partial_commission数据表对应备注为'实分佣金字段' 作为 '预分业绩总计' */
+            $field  = 'Obargain.scale_fee,Obargain.id,Obargain.father_id,PartialCommission.real_fee';
             $return_sum  = $this->oBargainModel->performancelInfoScaleFee($where,$field);
             foreach ($return_sum as $key1 => $val1) {
                 //成交报告ID
@@ -133,12 +134,19 @@ class PerformanceInfo extends Basic
             }
             $return_sum_unique = $this->arr_unset($return_sum,'commission_id');
             $return_sum = 0;
+            $real_fee = 0;
             foreach ($return_sum_unique as $key12 => $val2) {
                 $return_sum += $val2["scale_fee"];
+                $real_fee += $val2["real_fee"];
             }
             /*计算业绩总计 即应分佣金 根据分佣ID去重*/
 
-            return $this->response(200, '', ['scale_fee_sum'=>$return_sum,'data'=>$return,'total'=>$return_total]);
+            $data['data'] = $return;
+            $data['total'] = $return_total;
+            $data['scale_fee_sum'] = $return_sum;
+            $data['real_fee'] = $real_fee;
+
+            return $this->response(200, '', $data);
         } else {
             return view('performanceInfo');
         }

application/index/service/RankingListService.php

@@ -221,7 +221,7 @@ class RankingListService
         //分组
         $total = count($resultArr);
         $total_page = floor($total / $crewNum_);
-        $residue = $total % $crewNum_;
+        $residue = fmod($total , $crewNum_);
         $full = $total_page * ($crewNumMax_ - $crewNum_);
         $x = $crewNum_;
         $y = $total_page;

application/index/view/cell_phone/index.html

@@ -45,14 +45,6 @@
 		width: 16%!important;
 	}
 
-	/*.text-left {
-		float: left;
-		display: inline-block;
-		height: 26px;
-		line-height: 26px;
-		font-size: 14px;
-	}
-	*/
 	.text-right {
 		float: right;
 		display: inline-block;
@@ -316,7 +308,7 @@
                             <table class="table table-striped table-bordered table-hover table-condensed">
                                 <thead>
                                 <tr>
-                                    <td colspan="9">
+                                    <td colspan="12">
                                         <form id="form_search">
                                             <span class="fore-span ld-Marheight">拨打类型:</span>
                                             <select class="form-control btn2 ld-Marheight" id="call_type">
@@ -346,7 +338,7 @@
                                             <input class="form-control btn4 ld-Marheight" value="" data-rule-phoneus="false" data-rule-required="false" id="start_date" name="start_date" type="date">
                                             <span class="fore-span ld-Marheight">-</span>
                                             <input class="form-control btn4 ld-Marheight" value="" data-rule-phoneus="false" data-rule-required="false" id="end_date" name="end_date" type="date">
-                                            <!--<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="house_id" placeholder="房源ID" type="phone" value="">-->
+                                            <input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="call_id" placeholder="通话ID" type="text" value="">
 
                                             <span class="btn btn-info btn3 ld-Marheight" id="search">搜索</span>
                                             <span class="btn btn-info btn3 ld-Marheight" id="reset">重置</span>
@@ -354,12 +346,12 @@
                                     </td>
                                 </tr>
                                 <tr>
+                                    <th class="text-center">通话ID</th>
                                     <th class="text-center">拨打时间</th>
                                     <th class="text-center">拨打人（主叫）</th>
                                     <th class="text-center">隐私号码</th>
                                     <th class="text-center">被拨打人（被叫）</th>
                                     <th class="text-center">通话时长</th>
-                                    <!--<th class="text-center">花费</th>-->
                                     <th class="text-center">跟进</th>
                                     <th class="text-center">录音</th>
                                     <th class="text-center">拨打类型</th>

application/index/view/finance/daily_details.html

@@ -279,7 +279,7 @@
 							<thead>
             	                <tr class="maintable-tr-bar">
 									<th class="text-center">收款ID</th>
-									<!--<th class="text-center">成交报告ID</th>-->
+									<th class="text-center">成交报告ID</th>
 									<th class="text-center">成交商铺地址</th>
 									<th class="text-center">成交价</th>
 									<th class="text-center">应收金额</th>
@@ -309,7 +309,7 @@
 							<thead>
             	                <tr class="maintable-tr-bar">
 									<th class="text-center">收款ID</th>
-									<!--<th class="text-center">成交报告ID</th>-->
+									<th class="text-center">成交报告ID</th>
 									<th class="text-center">成交商铺地址</th>
 									<th class="text-center">应收案场费</th>
 									<th class="text-center">本次收佣</th>
@@ -415,44 +415,70 @@
 					<table class="table table-striped table-bordered table-hover table-condensed">
 							<thead>
             	                <tr class="maintable-tr-bar">
-									<th class="text-center">支付宝转账</th>
-									<th class="text-center">微信转账</th>
-									<th class="text-center">地产转账</th>
-									<th class="text-center">世家公账</th>
-									<th class="text-center">3000账号</th>
-									<th class="text-center">现金</th>
-									<th class="text-center">POS机</th>
-									<th class="text-center">其他</th>
+            	                	<!--深圳-->
+            	                	<th class="text-center shenzhen">筠姐支付宝</th>
+									<th class="text-center shenzhen">筠姐微信</th>
+									<th class="text-center shenzhen">银满谷银行卡</th>
+            	                	<!--上海 杭州 店长 commit-->
+									<th class="text-center shanghai">施总支付宝</th>
+									<th class="text-center shanghai">林老师支付宝</th>
+									<th class="text-center shanghai">施总微信</th>
+									<th class="text-center shanghai">林老师微信</th>
+									<th class="text-center shanghai">地产转账</th>
+									<th class="text-center shanghai">世家公账</th>
+									<th class="text-center shanghai">3000账号</th>
+									<th class="text-center shanghai">现金</th>
+									<th class="text-center shanghai">POS机</th>
+									<th class="text-center shanghai">其他</th>
+									
 									<th class="text-center">提交人</th>
 									<th class="text-center">提交时间</th>
 								</tr>
 							</thead>
 							<tbody class="text-center" id="">
 									<tr>
-										<td class="text-center">
+										<!--深圳-->
+										<td class="text-center shenzhen">
+											<span id="pay_yun_zhihubao"></span>
+										</td>
+										<td class="text-center shenzhen">
+											<span id="pay_yun_weixin"></span>
+										</td>
+										<td class="text-center shenzhen">
+											<span id="pay_yun_card"></span>
+										</td>
+            	                	    <!--上海 杭州 店长 commit-->
+										<td class="text-center shanghai">
 											<span id="pay_a"></span>
 										</td>
-										<td class="text-center">
+										<td class="text-center shanghai">
+											<span id="pay_a1"></span>
+										</td>
+										<td class="text-center shanghai">
 											<span id="pay_b"></span>
 										</td>
-										<td class="text-center">
+										<td class="text-center shanghai">
+											<span id="pay_b1"></span>
+										</td>
+										<td class="text-center shanghai">
 											<span id="pay_c"></span>
 										</td>
-										<td class="text-center">
+										<td class="text-center shanghai">
 											<span id="pay_d"></span>
 										</td>
-										<td class="text-center">
+										<td class="text-center shanghai">
 											<span id="pay_e"></span>
 										</td>
-										<td class="text-center">
+										<td class="text-center shanghai">
 											<span id="pay_f"></span>
 										</td>
-										<td class="text-center">
+										<td class="text-center shanghai">
 											<span id="pay_g"></span>
 										</td>
-										<td class="text-center">
+										<td class="text-center shanghai">
 											<span id="pay_h"></span>
 										</td>
+										
 										<td class="text-center">
 											<span id="pay_i"></span>
 										</td>
@@ -472,14 +498,21 @@
 						<table class="table table-striped table-bordered table-hover table-condensed">
 									<thead>
 	            	                <tr class="maintable-tr-bar">
-										<th class="text-center">支付宝转账</th>
-										<th class="text-center">微信转账</th>
-										<th class="text-center">地产转账</th>
-										<th class="text-center">世家公账</th>
-										<th class="text-center">3000账号</th>
-										<th class="text-center">现金</th>
-										<th class="text-center">POS机</th>
-										<th class="text-center">其他</th>
+	            	                	<!--深圳-->
+	            	                	<th class="text-center shenzhen">筠姐支付宝</th>
+										<th class="text-center shenzhen">筠姐微信</th>
+										<th class="text-center shenzhen">银满谷银行卡</th>
+	            	                	<!--上海 杭州 total 财务-->
+										<th class="text-center shanghai">施总支付宝</th>
+										<th class="text-center shanghai">林老师支付宝</th>
+										<th class="text-center shanghai">施总微信</th>
+										<th class="text-center shanghai">林老师微信</th>
+										<th class="text-center shanghai">地产转账</th>
+										<th class="text-center shanghai">世家公账</th>
+										<th class="text-center shanghai">3000账号</th>
+										<th class="text-center shanghai">现金</th>
+										<th class="text-center shanghai">POS机</th>
+										<th class="text-center shanghai">其他</th>
 										<th class="text-center">审核人</th>
 										<th class="text-center">审核时间</th>
 										<th class="text-center">备注</th>
@@ -491,38 +524,54 @@
 								</tbody>
 								<tfoot class="text-center" id="maintable_list_total">
 										<tr>
-											<td class="text-center">
-												<span id="total_a">555</span>
+											<td class="text-center shenzhen">
+												<span id="total_yun_zhihubao"></span>
 											</td>
-											<td class="text-center">
+											<td class="text-center shenzhen">
+												<span id="total_yun_weixin"></span>
+											</td>
+											<td class="text-center shenzhen">
+												<span id="total_yun_card"></span>
+											</td>
+											
+											<td class="text-center shanghai">
+												<span id="total_a"></span>
+											</td>
+											<td class="text-center shanghai">
+												<span id="total_a1"></span>
+											</td>
+											<td class="text-center shanghai">
 												<span id="total_b"></span>
 											</td>
-											<td class="text-center">
+											<td class="text-center shanghai">
+												<span id="total_b1"></span>
+											</td>
+											<td class="text-center shanghai">
 												<span id="total_c"></span>
 											</td>
-											<td class="text-center">
+											<td class="text-center shanghai">
 												<span id="total_d"></span>
 											</td>
-											<td class="text-center">
+											<td class="text-center shanghai">
 												<span id="total_e"></span>
 											</td>
-											<td class="text-center">
+											<td class="text-center shanghai">
 												<span id="total_f"></span>
 											</td>
-											<td class="text-center">
+											<td class="text-center shanghai">
 												<span id="total_g"></span>
 											</td>
-											<td class="text-center">
+											<td class="text-center shanghai">
 												<span id="total_h"></span>
 											</td>
 											<td class="text-center">
-												<span id="total_f"></span>
+												<span id="total_i"></span>
 											</td>
 											<td class="text-center">
-												<span id="total_g"></span>
+												<span id="total_j"></span>
 											</td>
 											<td class="text-center">
-												<span id="total_h"></span>
+												<span id="total_k"></span>
 											</td>
 											
 	                                    </tr>

application/index/view/finance/wait_back_out.html

@@ -185,4 +185,27 @@
         </div><!-- /.modal-content -->
     </div><!-- /.modal -->
 </div>
+<!-- 弹出框 恢复正常 -->
+<div class="modal fade" id="modal-backNormal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">
+                    ×
+                </button>
+                <h4 class="modal-title">
+                    恢复正常
+                </h4>
+            </div>
+            <div class="modal-body">
+                <div style="font-size: 15px;font-weight: 600;">该成交报告将从撤销状态恢复到一级审核的状态，确定恢复正常么？</div>
+            </div>
+            <div class="modal-footer">
+					<button type="button" class="btn btn-default" data-dismiss="modal">取消</button>
+				    <button type="button" class="btn btn-info" data-dismiss="modal"  id="backToNormal">确定</button>
+			</div>
+        </div><!-- /.modal-content -->
+        
+    </div><!-- /.modal -->
+</div>
 

application/index/view/houses/HouseFollowUp.html

@@ -104,30 +104,19 @@
 												<span class="fore-span ld-Marheight">-</span>
 												<input class="form-control btn4 ld-Marheight" value="" data-rule-phoneus="false" data-rule-required="false" id="create_time_end" name="end_date1" type="date">
 												<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="houseID" placeholder="商铺ID" type="text" value="">
-												<!--<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="house_title" placeholder="商铺名称" type="text" value="">-->
 												<input class="form-control btn4 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="follow_up_con" placeholder="跟进内容" type="text" value="">
 												<select class="form-control btn4 ld-Marheight input" name="" id="district_id">
 													<option value="">跟进人所在部门</option>
 												</select>
-
 												<select class="form-control btn4 ld-Marheight input" name="" id="guest_stores" value="">
 												</select>
-												<!--<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="user_name" placeholder="跟进人姓名" type="text" value="">-->
-												<!--<input class="form-control btn4 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="user_phone" placeholder="跟进人姓名/电话" type="text" value="">-->
+												<select class="form-control btn4 ld-Marheight input" name="" id="guest_stores_agent" value="">
+												</select>
 												<div class="left-phone-liu">
 													<input class="form-control" data-rule-phoneus="false" data-rule-required="false" id="partical_name" placeholder="跟进人姓名" type="text" value="">
 												    <ul class="user-ul-liu"></ul>
 												</div>
-												
-												<!--<div class="clear"></div>-->
-												<!--<select class="form-control btn2 ld-Marheight" id="shop_city_id">
-                                                      <option value="" selected="selected">城市筛选</option>
-                                                      <option value="310100">上海市</option>
-                                                      <option value="330100">杭州市</option>
-                                                      
-                                                </select>-->
 	                                            <div class="clear">
-	                                            	
 	                                            </div>
 												<span class="btn btn-info btn3 ld-Marheight" id="search">搜索</span>
 												<span class="btn btn-info btn3 ld-Marheight" id="reset">重置</span>

application/index/view/houses/edit.html

@@ -124,6 +124,9 @@
 									<label class="checkbox-inline">
 									  <input type="checkbox" class="yetai" value="其他">其他 
 									</label>
+									 <!--楼层新增-->
+									<label style="margin-left: 128px;">楼层:</label>
+									 <input type="text" class="form-control" id="loucengfloor" placeholder="请输入楼层"  data-alert="请输入楼层！">
 								</li>
 								<li class="list-group-item">
 									<div class="suitable-yetai">

application/index/view/houses/houseList.html

@@ -218,7 +218,7 @@
                             <table class="table table-striped table-bordered table-hover table-condensed">
                                 <thead>
 	                                <tr>
-	                                    <td colspan="12">
+	                                    <td colspan="16">
 	                                        <form id="form_search">
 	                                        	<div class="col-xs-12" style="padding:0px">
 												    <select class="form-control btn2-city shop_city_choose_site_list"></select>
@@ -244,7 +244,7 @@
 	                                                  <option value="" selected="selected">业态筛选</option>
 	                                                </select>
 	 												<input class="form-control btn2 " data-rule-phoneus="false" data-rule-required="false" id="id" placeholder="商铺编号" type="text" value="">
-	 												<input class="form-control btn2" data-rule-phoneus="false" data-rule-required="false" id="shop_address" placeholder="商铺地址" type="text" value="">
+	 												<input class="form-control btn2" data-rule-phoneus="false" data-rule-required="false" id="shop_address" placeholder="商铺地址" type="text" value="" autocomplete="off">
 		                                            <input class="form-control btn2 " data-rule-phoneus="false" data-rule-required="false" id="landlord_phone" placeholder="房东手机号" type="tel" value="">
 		                                            <div class="clear">
 		                                            	
@@ -332,13 +332,14 @@
 	                                    <th class="text-center">类型</th>
 	                                    <th class="text-center">区域</th>
 	                                    <th class="text-center">对内名称</th>
+	                                    <th class="text-center">楼层</th>
 	                                    <th class="text-center">租金均价</th>
 	                                    <th class="text-center">面积</th>
 	                                    <th class="text-center">业态</th>
 	                                    <th class="text-center">盘方</th>
 	                                    <th class="text-center">创建时间</th>
 	                                    <th class="text-center">上下架</th>
-	                                    <!--<th class="text-center">盘方</th>-->
+	                                    <th class="text-center">对客户展示</th>
 	                                    <th class="text-center">操作</th>
 	                                </tr>
                                 </thead>

application/index/view/member/users_list.html

@@ -486,6 +486,7 @@
 														<option value="0">否</option>
 													</select>
 													<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" name="user" placeholder="客户姓名" type="text" value="">
+													<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" name="userNick" placeholder="客户昵称" type="text" value="">
 													<input class="form-control btn2 ld-Marheight input" data-rule-phoneus="false" data-rule-required="false" name="invite_phone" placeholder="邀请人(客户)手机号" type="text" value="">
 													<select class="form-control btn2 ld-Marheight" name="login_status">
 														<option value="">下载登录app</option>

application/index/view/performancesubsidiary/performancesubsidiaryList.html

@@ -102,13 +102,16 @@
 												 <div class="clear">
 													
 												</div>
-												<div class="col-sm-8" style="padding:15px 0px 0px">
+												<div class="col-sm-4" style="padding:15px 0px 0px">
 												<span class="btn btn-info btn3 search" id="maintable_search">搜索</span>
 												<span class="btn btn-info btn3" id="maintable_reset">重置</span>
 												<span class="btn btn-info btn3" id="maintable_export">导出excel</span>
 												</div>
-												<div class="col-sm-4" style="float:right; text-align:right ; padding:15px 0px 0px">
-												 	<span class="margin-top-ld-mingxi">业绩总计:</span><span id="performance_subsidiary_total" class="margin-top-ld-mingxi"></span>
+												<div class="col-sm-8" style="float:right; text-align:right ; padding:15px 0px 0px">
+												 	<span class="margin-top-ld-mingxi">业绩总计:</span><span id="performance_subsidiary_total" class="margin-top-ld-mingxi" style="margin-right: 15px;"></span>
+												 	<span class="margin-top-ld-mingxi">预分业绩总计:</span><span id="performance_subsidiary_total2" class="margin-top-ld-mingxi" style="margin-right: 15px;"></span>
+												 	<span class="margin-top-ld-mingxi">未分业绩总计:</span><span id="performance_subsidiary_total3" class="margin-top-ld-mingxi" style="margin-right: 15px;"></span>
+												 	
 												</div>
 											</form>
 										</td>

application/model/AAgents.php

@@ -1584,4 +1584,10 @@ class AAgents extends BaseModel
         return $result;
     }
 
+    public function getAgentFieldById($id, $fields)
+    {
+        $return = $this->where('id', $id)->value($fields);
+        return $return;
+    }
+
 }
\ No newline at end of file

application/model/GHouses.php

@@ -754,6 +754,11 @@ class GHouses extends BaseModel
             $save_data['fit_industry_type'] = $data['fit_industry_type'];
         }
 
+        //楼层
+        if (isset($data['floor'])) {
+            $save_data['floor'] = $data['floor'];
+        }
+
         if (empty($data['id'])) {
             $save_data['upload_id']   = $agent_id; //上传人
             $save_data['create_time'] = date('Y-m-d H:i:s');

application/model/OBargainModel.php

@@ -249,6 +249,9 @@ class OBargainModel extends Model
         if (isset($params["account_statement"])) {
             $where_["a.account_statement"] = $params["account_statement"];
         }
+        if (isset($params["order_id"])) {
+            $where_["a.order_id"] = $params["order_id"];
+        }
 
         if (isset($params["father_id"])) {
             $where_["a.father_id"] = $params["father_id"];
@@ -366,6 +369,7 @@ class OBargainModel extends Model
             ->join('o_order c', 'a.order_id = c.id', 'left')
             ->join('g_houses d', 'c.house_id = d.id', 'left')
             ->join('o_partial_commission e', 'a.id = e.bargain_id', 'left')
+            ->join('o_paylog f', 'a.id = f.bargain_id', 'left')
             ->where($params)
             ->order($order_)
             ->limit($pageSize)
@@ -386,6 +390,7 @@ class OBargainModel extends Model
             ->join('o_order c', 'a.order_id = c.id', 'left')
             ->join('g_houses d', 'c.house_id = d.id', 'left')
             ->join('o_partial_commission e', 'e.bargain_id = a.id', 'left')
+            ->join('o_paylog f', 'a.id = f.bargain_id', 'left')
             ->where($params)
             ->sum($field);
     }
@@ -403,6 +408,7 @@ class OBargainModel extends Model
             ->join('o_order c', 'a.order_id = c.id', 'left')
             ->join('g_houses d', 'c.house_id = d.id', 'left')
             ->join('o_partial_commission e', 'e.bargain_id = a.id', 'left')
+            ->join('o_paylog f', 'a.id = f.bargain_id', 'left')
             ->where($params)
             ->group('a.id')
             ->count();
@@ -1217,20 +1223,18 @@ class OBargainModel extends Model
         $partial_bargain = $m_partial->getBragainScale($bargain_id);
 
         foreach ($partial_bargain as $val) {
-            $bargain_id_arr[] = $val['bargain_id'];
+            $bargain_id_arr[] = $val['agent_id'];
         }
 
-        if (empty($bargain_id_arr[0])) {
         $data = $this->field('role,agent_id,scale,scale_fee')
-                ->where('id', $bargain_id)
-                ->whereOr('father_id', $bargain_id)
-                ->select();
-        } else {
-            $data = $this->field('role,agent_id,scale,scale_fee')
-                ->where('id', $bargain_id)
-                ->where('id', 'not in', implode(',', $bargain_id_arr))
-//                ->whereOr('father_id', $bargain_id)
+            ->where('','EXP','id='.$bargain_id.' OR father_id='.$bargain_id)
+            ->where('status', '<>',30)
             ->select();
+
+        foreach ($data as $k=>$v) {
+            if (in_array($v['agent_id'], $bargain_id_arr)) {
+                unset($data[$k]);
+            }
         }
 
         if (!empty($partial_bargain)) {
@@ -1572,19 +1576,17 @@ class OBargainModel extends Model
     /**
      * @param $field
      * @param $where
-     * @return array|false|\PDOStatement|string|\think\Collection
+     * @return false|\PDOStatement|string|\think\Collection
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @throws \think\exception\DbException
      */
     public function agentBargainAll($field, $where) {
-        try {
-            $data = $this->db_->alias('a')
+        return $this->db_->alias('a')
             ->field($field)
             ->join('a_agents b', 'a.agent_id = b.id', 'left')
             ->where($where)
             ->select();
-        } catch (\Exception $e) {
-            $data = [];
-        }
-        return $data;
     }
 
     /**
@@ -1596,6 +1598,15 @@ class OBargainModel extends Model
         return $this->db_->where($where)->value($field);
     }
 
+    /**
+     * @param $field
+     * @param $where
+     * @return mixed
+     */
+    public function getFieldColumn($field, $where) {
+        return $this->db_->where($where)->column($field);
+    }
+
     /**
      * @param $field
      * @param $where

application/model/ODaily.php

@@ -46,6 +46,9 @@ class ODaily extends BaseModel
         if (isset($params["store_id"])) {
             $where_["store_id"] = $params["store_id"];
         }
+        if (isset($params['id'])) {
+            $where_["id"] = $params['id'];
+        }
         $where_["is_del"] = 0;
         return $this->db_
             ->field($field)
@@ -124,4 +127,8 @@ class ODaily extends BaseModel
             ->group('a.id')
             ->count();
     }
+
+    public function getFieldValue($filed, $where) {
+        return $this->where($where)->value($filed);
+    }
 }
\ No newline at end of file

application/model/OPartialCommission.php

@@ -199,8 +199,8 @@ class OPartialCommission extends BaseModel
     public function getBragainScale(int $bargain_id)
     {
         $sql = 'SELECT a.bargain_id,a.scale,b.scale_fee,a.agent_id,a.role,substring_index(group_concat(a.id ORDER BY a.id DESC),",",1) AS id
-                FROM o_partial_commission a LEFT JOIN o_bargain b on a.bargain_id=b.id  WHERE a.bargain_id = ' . $bargain_id . ' 
-                and b.id= ' . $bargain_id . ' OR b.father_id=' . $bargain_id . ' GROUP BY role';
+                FROM o_partial_commission a LEFT JOIN o_bargain b on a.bargain_id=b.id  WHERE a.is_del = 0 and (a.bargain_id = ' . $bargain_id . ' 
+                and b.id= ' . $bargain_id . ' OR b.father_id=' . $bargain_id . ') GROUP BY role';
         return $this->query($sql);
     }
 

application/model/OPayLogModel.php

@@ -490,6 +490,10 @@ class OPayLogModel extends Model
      * @return float|int
      */
     public function getSum($filed,$params){
+        if (!isset($params['is_del'])) {
+            $params['is_del'] = 0;
+        }
+
         return $this->db_
             ->where($params)
             ->sum($filed);
@@ -503,7 +507,7 @@ class OPayLogModel extends Model
     public function getAdjustmentSum($filed,$params){
        return $this->db_
             ->alias('a')
-            ->join('o_paylog_adjustment b','a.id=b.new_paylog_id')
+            ->join('o_paylog_adjustment b','a.id=b.paylog_id')
             ->where($params)
             ->sum($filed);
     }
@@ -557,4 +561,34 @@ class OPayLogModel extends Model
     public function sumPayLog(string $field, array $where) {
         return $this->db_->where($where)->sum($field);
     }
+
+    public function getCount($where) {
+        if (!isset($params['is_del'])) {
+            $params['is_del'] = 0;
+        }
+        return $this->db_->where($where)->count('id');
+    }
+
+    /**
+     * @param $where
+     * @return array
+     */
+    public function getFieldColumn($field, $where) {
+        if (!isset($params['is_del'])) {
+            $params['is_del'] = 0;
+        }
+        return $this->db_->where($where)->column($field);
+    }
+
+    /**
+     * @param $field
+     * @param $where
+     * @return mixed
+     */
+    public function getFieldValue($field, $where) {
+        if (!isset($params['is_del'])) {
+            $params['is_del'] = 0;
+        }
+        return $this->db_->where($where)->value($field);
+    }
 }
\ No newline at end of file

application/model/ORealIncome.php

@@ -90,6 +90,7 @@ class ORealIncome extends BaseModel
             ->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')
+            ->join('o_paylog f', 'a.id = f.bargain_id', 'left')
             ->where($params)
             ->sum($field);
     }

application/model/ORefundModel.php

@@ -253,6 +253,9 @@ class ORefundModel extends Model{
 
     public function getRefundSum($field, $params)
     {
+        if (!isset($params['is_del'])) {
+            $params['is_del'] = 0;
+        }
         $data = $this->db_
             ->where($params)
             ->sum($field);

application/model/OTaxes.php

@@ -115,6 +115,41 @@ class OTaxes extends BaseModel
         return $result;
     }
 
+    /**
+     * 根据成交报告-实收佣金 或 税费开票 查询详情
+     *
+     * @param int $bargain_id
+     * @param string $field
+     * @return false|\PDOStatement|string|\think\Collection
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @throws \think\exception\DbException
+     */
+    public function getBargainFeeDetailV2(int $bargain_id, string $field)
+    {
+        return $this->field($field)
+            ->where('bargain_id', $bargain_id)
+            ->where('father_id', 0)
+            ->where('is_del', 0)
+            ->select();
+    }
+
+    /**
+     * @param $field
+     * @param $where
+     * @return false|\PDOStatement|string|\think\Collection
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @throws \think\exception\DbException
+     */
+    public function getTaxesAgent($field, $where) {
+        return $this->field($field)
+            ->alias('a')
+            ->join('a_agents b', 'a.agent_id = b.id', 'left')
+            ->where($where)
+            ->select();
+    }
+
     /**
      * 根据id 查询详情 zw
      *
@@ -302,4 +337,8 @@ class OTaxes extends BaseModel
             ->where($where)
             ->sum($field);
     }
+
+    public function updateData($data, $where) {
+        return $this->where($where)->update($data);
+    }
 }
\ No newline at end of file

application/route.php

@@ -250,7 +250,7 @@ Route::group('index', [
     'selectReportAll'                    => ['index/Finance/selectReportAll', ['method' => 'get|post']], //时间轴
     'partialCommissionList'              => ['index/Finance/partialCommissionList', ['method' => 'get']], //分佣提成明细表
     'addRealIncome'                      => ['index/Finance/addRealIncome', ['method' => 'POST']], //增加和编辑实收佣金
-    'getTallAge'                         => ['index/Finance/getTallAge', ['method' => 'GET']], //开票税费查询
+    'getTallAge'                         => ['index/Finance/getTallAgeV2', ['method' => 'GET']], //开票税费查询
     'addTallAge'                         => ['index/Finance/addTallAge', ['method' => 'POST']], //新增和编辑开票税费
     'searchBargainAgents'                => ['index/Finance/searchBargainAgents', ['method' => 'GET']], //成交报告id获取盘方，客方，反签，独家，合作方
     'searchOrderAgents'                  => ['index/Finance/searchOrderAgents', ['method' => 'GET']], //order_id获取盘方，客方，反签，独家，合作方
@@ -282,6 +282,7 @@ Route::group('index', [
     'refundPayLog'                       => ['index/Finance/refundPayLog', ['method' => 'POST']],//退款
     'checkRefund'                        => ['index/Finance/checkRefund', ['method' => 'POST']],//退款审核
     'refundDetail'                       => ['index/Finance/refundDetail', ['method' => 'GET']],//退款详情
+    'recoveryBargain'                    => ['index/Finance/recoveryBargain', ['method' => 'POST']],//撤销列表-恢复成交报告
     'performanceInfo'                    => ['index/PerformanceInfo/performanceInfo', ['method' => 'post|get']],//业绩明细
     'getPerformanceInfoExcel'            => ['index/PerformanceInfo/getPerformanceInfoExcel', ['method' => 'post|get']],//业绩明细
 
@@ -588,29 +589,30 @@ Route::group('broker', [
     'getIsAccountStatement' => ['api_broker/OrderLog/getIsAccountStatement', ['method' => 'get|post']],
     'getLook'               => ['api_broker/OrderLog/getLook', ['method' => 'get|post']],
 
-    'login'             => ['api_broker/Broker/login', ['method' => 'post']], //经纪人登陆 废弃
-    'loginV2'           => ['api_broker/Broker/loginV2', ['method' => 'post']], //经纪人登陆
-    'verifyAgentStatus' => ['api_broker/Broker/verifyAgentStatus', ['method' => 'post']], //判断经纪人是否被解绑
-    'updateDevice'      => ['api_broker/Broker/updateDevice', ['method' => 'post']], //解绑或者绑定经纪人
-
-    'editAgent'           => ['api_broker/Broker/editAgent', ['method' => 'post']], //经纪人修改密码
-    'forgetPwd'           => ['api_broker/Broker/forgetPwd', ['method' => 'post']], //经纪人忘记密码
-    'uploadHeadImg'       => ['api_broker/Broker/uploadHeadImg', ['method' => 'post']], //经纪人上传头像
-    'editClient'          => ['api_broker/Client/editClient', ['method' => 'get|post']],//添加和编辑客户
-    'getBroker'           => ['api_broker/broker/getBroker', ['method' => 'get']],//获取经纪人列表
-    'getAgentGroupSite'   => ['api_broker/broker/getAgentGroupSite', ['method' => 'get']],//获得经纪人站点
-    'labelEdit'           => ['api_broker/label/index', ['method' => 'get|post']],  //编辑标签
-    'getLabelsList'       => ['api_broker/label/getLabelsList', ['method' => 'get']],  //标签列表
-    'add_phone_follow_up' => ['api_broker/broker/add_phone_follow_up', ['method' => 'get|post']],//新增-客户电话跟进
-    'addUserPhoneFollowUp' => ['api_broker/broker/addUserPhoneFollowUp', ['method' => 'get|post']],//新增-客户电话跟进
-    'useraction_search'   => ['api_broker/broker/useraction_search', ['method' => 'get|post']],//客户电话跟进
-    'vip'                 => ['api_broker/broker/vip', ['method' => 'get|post']],
-    'userStateSearch'     => ['api_broker/broker/userStateSearch', ['method' => 'get|post']],//新增-客户电话跟进
-    'user_search'         => ['api_broker/broker/user_search', ['method' => 'get|post']],//客户搜索
-    'checkAuth'         => ['api_broker/broker/checkAuth', ['method' => 'get']],//权限验证
-    'bindAXB'             => ['api_broker/CellPhone/bindAXB', ['method' => 'post']],//隐私号码
-    'agentsUnBind'        => ['api_broker/CellPhone/agentsUnBind', ['method' => 'post']],//解除绑定关系
-    'updateBindAXB'       => ['api_broker/CellPhone/updateBindAXB', ['method' => 'post']], //更新绑定关系隐私号码
+    'login'             => [ 'api_broker/Broker/login', [ 'method' => 'post' ] ], //经纪人登陆 废弃
+    'loginV2'           => [ 'api_broker/Broker/loginV2', [ 'method' => 'post' ] ], //经纪人登陆
+    'verifyAgentStatus' => [ 'api_broker/Broker/verifyAgentStatus', [ 'method' => 'post' ] ], //判断经纪人是否被解绑
+    'updateDevice'      => [ 'api_broker/Broker/updateDevice', [ 'method' => 'post' ] ], //解绑或者绑定经纪人
+
+    'editAgent'            => [ 'api_broker/Broker/editAgent', [ 'method' => 'post' ] ], //经纪人修改密码
+    'forgetPwd'            => [ 'api_broker/Broker/forgetPwd', [ 'method' => 'post' ] ], //经纪人忘记密码
+    'uploadHeadImg'        => [ 'api_broker/Broker/uploadHeadImg', [ 'method' => 'post' ] ], //经纪人上传头像
+    'editClient'           => [ 'api_broker/Client/editClient', [ 'method' => 'get|post' ] ],//添加和编辑客户
+    'getBroker'            => [ 'api_broker/broker/getBroker', [ 'method' => 'get' ] ],//获取经纪人列表
+    'getAgentGroupSite'    => [ 'api_broker/broker/getAgentGroupSite', [ 'method' => 'get' ] ],//获得经纪人站点
+    'labelEdit'            => [ 'api_broker/label/index', [ 'method' => 'get|post' ] ],  //编辑标签
+    'getLabelsList'        => [ 'api_broker/label/getLabelsList', [ 'method' => 'get' ] ],  //标签列表
+    'add_phone_follow_up'  => [ 'api_broker/broker/add_phone_follow_up', [ 'method' => 'get|post' ] ],//新增-客户电话跟进
+    'addUserPhoneFollowUp' => [ 'api_broker/broker/addUserPhoneFollowUp', [ 'method' => 'get|post' ] ],//新增-客户电话跟进
+    'useraction_search'    => [ 'api_broker/broker/useraction_search', [ 'method' => 'get|post' ] ],//客户电话跟进
+    'vip'                  => [ 'api_broker/broker/vip', [ 'method' => 'get|post' ] ],
+    'userStateSearch'      => [ 'api_broker/broker/userStateSearch', [ 'method' => 'get|post' ] ],//新增-客户电话跟进
+    'user_search'          => [ 'api_broker/broker/user_search', [ 'method' => 'get|post' ] ],//客户搜索
+    'checkAuth'            => [ 'api_broker/broker/checkAuth', [ 'method' => 'get' ] ],//权限验证
+    'bindAXB'              => [ 'api_broker/CellPhone/bindAXB', [ 'method' => 'post' ] ],//隐私号码
+    'agentsUnBind'         => [ 'api_broker/CellPhone/agentsUnBind', [ 'method' => 'post' ] ],//解除绑定关系
+    'updateBindAXB'        => [ 'api_broker/CellPhone/updateBindAXB', [ 'method' => 'post' ] ], //更新绑定关系隐私号码
+    'getCallLog'           => [ 'api_broker/broker/getCallLog', [ 'method' => 'get|post' ] ],
 
 
     'agentUserTb'       => ['api_broker/Client/agentUserTb', ['method' => 'get']],//客户列表
@@ -647,6 +649,9 @@ Route::group('broker', [
 
     'searchAgents'      => ['api_broker/OrderLog/searchAgents', ['method' => 'get']],
     'searchBargainList' => ['api_broker/OrderLog/searchBargainList', ['method' => 'get']],
+
+    'searchBargainListByOrderId' => ['api_broker/OrderLog/searchBargainListByOrderId', ['method' => 'get']],
+
     'getListByHouseId'  => ['api_broker/OrderLog/getListByHouseId', ['method' => 'get']],
 
     'searchBargainAgents' => ['api_broker/OrderLog/searchBargainAgents', ['method' => 'get']],
@@ -784,6 +789,10 @@ Route::group('broker', [
     'commitCheck'        => ['api_broker/DailyPaper/commitCheck', ['method' => 'get|post']],
     'getPayLogImg'       => ['api_broker/DailyPaper/getPayLogImg', ['method' => 'get|post']],
 
+
+    'getRandKingListByAgentId'      => ['api_broker/RankingList/getRandKingListByAgentId', ['method' => 'GET|POST']],
+    'getStoreRandKingListByAgentId' => ['api_broker/RankingList/getStoreRandKingListByAgentId', ['method' => 'GET|POST']],
+
 ]);
 
 //Route::miss('api/index/miss');//处理错误的url
\ No newline at end of file

public/app/dist/index.html

@@ -23,4 +23,4 @@
 				if(!doc.addEventListener) return;
 				win.addEventListener(resizeEvt, recalc, false);
 				doc.addEventListener('DOMContentLoaded', recalc, false);
-			})(document, window);</script><link href=./static/css/app.920ea36f4dff96f9a5e43da13e447901.css rel=stylesheet></head><body><div id=app></div><script src=https://api.tonglianjituan.com/app/js/libs/vue.min.js></script><script src=https://api.tonglianjituan.com/app/js/libs/vue-router.min.js></script><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.c1544c6e64ebde97066c.js></script><script type=text/javascript src=./static/js/app.4840ac74419a00bd4eec.js></script></body></html>
+			})(document, window);</script><link href=./static/css/app.a76e29d54235be617793e54941f1b2ba.css rel=stylesheet></head><body><div id=app></div><script src=https://api.tonglianjituan.com/app/js/libs/vue.min.js></script><script src=https://api.tonglianjituan.com/app/js/libs/vue-router.min.js></script><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.1b35a927314506fe4a4f.js></script><script type=text/javascript src=./static/js/app.f7f0a178d5f517c460bf.js></script></body></html>
\ No newline at end of file