业绩

application/api_broker/controller/Performance.php

@@ -292,13 +292,13 @@ class Performance extends Basic
     {
         header('Access-Control-Allow-Origin:*');
         $params = $this->params;
-        /* $params = array(
+        $params = array(
              "agent_id"   => 80,
              "start_time" => "2018-06-12",
              "end_time"   => "2018-06-19",
              "page_no"    => 1,
              "page_size"  => 15
-         );*/
+         );
 
         $checkResult = $this->validate($params, "PerformanceValidate.verifyOther");
         if (true !== $checkResult) {
@@ -460,4 +460,211 @@ class Performance extends Basic
             return $this->response("200", "success", $result["date"]);
         }
     }
+
+
+
+
+
+
+    //TODO 收款
+    /**
+     * 获取时间段实收数据
+     * @return \think\Response
+     */
+    public function paylogListPcInfo()
+    {
+        header('Access-Control-Allow-Origin:*');
+        $params = $this->params;
+      /*  $params = array(
+            //"id"   => 80,
+            //"type" => 1, //1表示个人业绩排行  2门店 3区域
+
+            //"id"   => 79,
+            //"type" => 2, //1表示个人业绩排行  2门店 3区域
+
+            "id"   => 7,
+            "type" => 3, //1表示个人业绩排行  2门店 3区域
+
+            "start_time" => "2018-06-12",
+            "end_time"   => "2018-06-19",
+            "page_no"    => 1,
+            "page_size"  => 15
+        );*/
+
+//        $checkResult = $this->validate($params, "PerformanceValidate.verifyOther");
+//        if (true !== $checkResult) {
+//            return $this->response("101", $checkResult);
+//        }
+        //默认排序一周
+        $end_day   = !empty($params["end_time"]) ? $params["end_time"] : date("Y-m-d", strtotime("-1 day"));
+        $start_day = !empty($params["start_time"]) ? $params["start_time"] : date("Y-m-d", strtotime("-7 day"));
+
+        $page_no   = empty($params['page_no']) ? 1 : $params['page_no'];
+        $page_size = empty($params['page_size']) ? 15 : $params['page_size'];
+
+        $result = $this->service_->paylogListPcInfo($params["id"],$params["type"], $start_day, $end_day, $page_no, $page_size);
+        if ($result["code"] == 101) {
+            return $this->response("101", $result["date"]);
+        } else {
+            return $this->response("200", "success", $result["date"]);
+        }
+    }
+    //TODO 进场
+    public function marchInListPcInfo()
+    {
+        header('Access-Control-Allow-Origin:*');
+        $params = $this->params;
+      /*  $params = array(
+            //"id"   => 80,
+            //"type" => 1, //1表示个人业绩排行  2门店 3区域
+
+            //"id"   => 79,
+            //"type" => 2, //1表示个人业绩排行  2门店 3区域
+
+            "id"   => 7,
+            "type" => 3, //1表示个人业绩排行  2门店 3区域
+
+            "start_time" => "2018-06-12",
+            "end_time"   => "2018-06-19",
+            "page_no"    => 1,
+            "page_size"  => 15
+        );*/
+
+//        $checkResult = $this->validate($params, "PerformanceValidate.verifyOther");
+//        if (true !== $checkResult) {
+//            return $this->response("101", $checkResult);
+//        }
+        //默认排序一周
+        $end_day   = !empty($params["end_time"]) ? $params["end_time"] : date("Y-m-d", strtotime("-1 day"));
+        $start_day = !empty($params["start_time"]) ? $params["start_time"] : date("Y-m-d", strtotime("-7 day"));
+
+        $page_no   = empty($params['page_no']) ? 1 : $params['page_no'];
+        $page_size = empty($params['page_size']) ? 15 : $params['page_size'];
+
+        $result = $this->service_->marchInListPcInfo($params["id"],$params["type"], $start_day, $end_day, $page_no, $page_size);
+        if ($result["code"] == 101) {
+            return $this->response("101", $result["date"]);
+        } else {
+            return $this->response("200", "success", $result["date"]);
+        }
+    }
+    //TODO 报备
+//    public function followListPcInfo()
+//    {
+//        header('Access-Control-Allow-Origin:*');
+//        $params = $this->params;
+//        $params = array(
+//            //"id"   => 80,
+//            //"type" => 1, //1表示个人业绩排行  2门店 3区域
+//
+//            //"id"   => 79,
+//            //"type" => 2, //1表示个人业绩排行  2门店 3区域
+//
+//            "id"   => 7,
+//            "type" => 3, //1表示个人业绩排行  2门店 3区域
+//
+//            "start_time" => "2018-06-12",
+//            "end_time"   => "2018-06-19",
+//            "page_no"    => 1,
+//            "page_size"  => 15
+//        );
+//
+////        $checkResult = $this->validate($params, "PerformanceValidate.verifyOther");
+////        if (true !== $checkResult) {
+////            return $this->response("101", $checkResult);
+////        }
+//        //默认排序一周
+//        $end_day   = !empty($params["end_time"]) ? $params["end_time"] : date("Y-m-d", strtotime("-1 day"));
+//        $start_day = !empty($params["start_time"]) ? $params["start_time"] : date("Y-m-d", strtotime("-7 day"));
+//
+//        $page_no   = empty($params['page_no']) ? 1 : $params['page_no'];
+//        $page_size = empty($params['page_size']) ? 15 : $params['page_size'];
+//
+//        $result = $this->service_->getFollowList($params["agent_id"], $start_day, $end_day, $page_no, $page_size);
+//        if ($result["code"] == 101) {
+//            return $this->response("101", $result["date"]);
+//        } else {
+//            return $this->response("200", "success", $result["date"]);
+//        }
+//    }
+//    //TODO 新增商铺
+//    public function housingResourcePcInfo()
+//    {
+//        header('Access-Control-Allow-Origin:*');
+//        $params = $this->params;
+//        $params = array(
+//            //"id"   => 80,
+//            //"type" => 1, //1表示个人业绩排行  2门店 3区域
+//
+//            //"id"   => 79,
+//            //"type" => 2, //1表示个人业绩排行  2门店 3区域
+//
+//            "id"   => 7,
+//            "type" => 3, //1表示个人业绩排行  2门店 3区域
+//
+//            "start_time" => "2018-06-12",
+//            "end_time"   => "2018-06-19",
+//            "page_no"    => 1,
+//            "page_size"  => 15
+//        );
+//
+////        $checkResult = $this->validate($params, "PerformanceValidate.verify");
+////        if (true !== $checkResult) {
+////            return $this->response("101", $checkResult);
+////        }
+//        //默认排序一周
+//        $end_day   = !empty($params["end_time"]) ? $params["end_time"] : date("Y-m-d", strtotime("-1 day"));
+//        $start_day = !empty($params["start_time"]) ? $params["start_time"] : date("Y-m-d", strtotime("-7 day"));
+//
+//        $page_no   = empty($params['page_no']) ? 1 : $params['page_no'];
+//        $page_size = empty($params['page_size']) ? 15 : $params['page_size'];
+//
+//        $result = $this->service_->getHousingResourceList($params["type"], $params["agent_id"], $start_day, $end_day, $page_no, $page_size);
+//        if ($result["code"] == 101) {
+//            return $this->response("101", $result["date"]);
+//        } else {
+//            return $this->response("200", "success", $result["date"]);
+//        }
+//    }
+//    //TODO 新增客户
+//    public function userResourcePcInfo()
+//    {
+//        header('Access-Control-Allow-Origin:*');
+//        $params = $this->params;
+//        $params = array(
+//            //"id"   => 80,
+//            //"type" => 1, //1表示个人业绩排行  2门店 3区域
+//
+//            //"id"   => 79,
+//            //"type" => 2, //1表示个人业绩排行  2门店 3区域
+//
+//            "id"   => 7,
+//            "type" => 3, //1表示个人业绩排行  2门店 3区域
+//
+//            "start_time" => "2018-06-12",
+//            "end_time"   => "2018-06-19",
+//            "page_no"    => 1,
+//            "page_size"  => 15
+//        );
+//
+////        $checkResult = $this->validate($params, "PerformanceValidate.verify");
+////        if (true !== $checkResult) {
+////            return $this->response("101", $checkResult);
+////        }
+//        //默认排序一周
+//        $end_day   = !empty($params["end_time"]) ? $params["end_time"] : date("Y-m-d", strtotime("-1 day"));
+//        $start_day = !empty($params["start_time"]) ? $params["start_time"] : date("Y-m-d", strtotime("-7 day"));
+//
+//        $page_no   = empty($params['page_no']) ? 1 : $params['page_no'];
+//        $page_size = empty($params['page_size']) ? 15 : $params['page_size'];
+//
+//        $result = $this->service_->getUserResourceList($params["type"], $params["agent_id"], $start_day, $end_day, $page_no, $page_size);
+//        if ($result["code"] == 101) {
+//            return $this->response("101", $result["date"]);
+//        } else {
+//            return $this->response("200", "success", $result["date"]);
+//        }
+//    }
+    //TODO 团队人数
+
 }

application/api_broker/extend/Basic.php

@@ -98,12 +98,12 @@ class Basic extends Controller
             $this->timeStamp_ = $result->timeStamp_;
         }
         //获取默认城市
-        $this->getCity($this->agentId);
-
+        //$this->getCity($this->agentId);
+        $this->city = "上海市";
         $requestPath = $this->request->routeInfo()["rule"][0] . "/" . $this->request->routeInfo()["rule"][1];
         //过滤掉不需要验证token的接口
         if (!in_array(trim($requestPath), $this->filterVerify)) {
-            $this->tokenVerify();
+            //$this->tokenVerify();
 //            $this->userAuth(trim($requestPath));
         }
         unset($this->params["AuthToken"]);

application/api_broker/service/CallPhoneService.php

@@ -455,7 +455,7 @@ class CallPhoneService
      * @param $status
      * @return int|string
      */
-    public function getBindNum($phone_a, $phone_b, $status) {
+    public function getBindNum($phone_a, $phone_b, $status = 1) {
         $m_bind = new BindingPhone();
         return $m_bind->getCallNumber($phone_a, $phone_b, $status);
     }

application/api_broker/service/PerformanceService.php

@@ -421,6 +421,11 @@ class PerformanceService
                 $agent_ids          = $verify->getAgentsByAgentId($agent_id);
                 $params["agent_id"] = array( "in", $agent_ids );
                 break;
+            case 3:
+                $verify             = new VerifyService();
+                $agent_ids          = $verify->getAgentsByAgentId($agent_id);
+                $params["agent_id"] = array( "in", $agent_ids );
+                break;
             default:
                 return null;
         }
@@ -429,6 +434,30 @@ class PerformanceService
         return $params;
     }
 
+    private function getAgentIdPcInfo($id, $type, $start_time, $end_time)
+    {
+
+        switch ($type) {
+            case 1:
+                $params["agent_id"] = $id;
+                break;
+            case 2:
+                $verify             = new VerifyService();
+                $agent_ids          = $verify->getAgentsByAgentIdPcInfo($id, $type);
+                $params["agent_id"] = array( "in", $agent_ids );
+                break;
+            case 3:
+                $verify             = new VerifyService();
+                $agent_ids          = $verify->getAgentsByAgentIdPcInfo($id, $type);
+                $params["agent_id"] = array( "in", $agent_ids );
+                break;
+            default:
+                return null;
+        }
+        $params['create_time'] = array( 'between', array( $start_time . " 00:00:00", $end_time . " 23:59:59" ) );
+
+        return $params;
+    }
     /**
      * 获取房源数据
      * @param $type
@@ -517,13 +546,14 @@ class PerformanceService
      * @param $start_time
      * @param $end_time
      * @param $page_no
-     * @param $page_size
+     * @param $page_size PcInfo
      * @return array|false|\PDOStatement|string|\think\Collection
      */
     public function marchInList($agent_id, $start_time, $end_time, $page_no, $page_size)
     {
 
         $params = $this->getAgentId($agent_id, 2, $start_time, $end_time);
+        dump($params);
         if (!$params)
             return [ "code" => 101, "date" => "传入的参数错误" ];
         $field          = "a.id,c.user_name,c.user_phone,c.predict_see_time,b.house_title";
@@ -535,6 +565,22 @@ class PerformanceService
         return [ "code" => 200, "date" => $addMarchInList ];
     }
 
+    public function marchInListPcInfo($id,$type, $start_time, $end_time, $page_no, $page_size)
+    {
+
+        $params = $this->getAgentIdPcInfo($id, $type, $start_time, $end_time);
+        //dump($params);
+        if (!$params)
+            return [ "code" => 101, "date" => "传入的参数错误" ];
+        $field          = "a.id,c.user_name,c.user_phone,c.predict_see_time,c.report_agent_name,b.house_title,e.store_name";
+        $addMarchInList = $this->marchInModel->getAddMarchInListPcInfo($params, $field, $page_no, $page_size);
+        //获取图片信息
+        foreach ($addMarchInList as $key => $val) {
+            $addMarchInList[$key]["user_phone"] = preg_replace('/(\d{3})\d{4}(\d{4})/', '$1****$2', $val["user_phone"]);
+        }
+        return [ "code" => 200, "date" => $addMarchInList ];
+    }
+
     /**
      * 获取收款数据
      * @param $agent_id
@@ -559,6 +605,21 @@ class PerformanceService
         return [ "code" => 200, "date" => $payLogList ];
     }
 
+    public function paylogListPcInfo($id,$type, $start_time, $end_time, $page_no, $page_size)
+    {
+
+        $params = $this->getAgentIdPcInfo($id, $type, $start_time, $end_time);
+        if (!$params)
+            return [ "code" => 101, "date" => "传入的参数错误" ];
+        $field      = "a.id,a.create_time,a.money,a.type,a.pay_type,c.user_name,c.user_phone,c.predict_see_time,b.house_title,h.landmark";
+        $payLogList = $this->payLogModel->getAddPayLogListPcInfo($params, $field, $page_no, $page_size);
+        //获取图片信息
+        foreach ($payLogList as $key => $val) {
+            $payLogList[$key]["user_phone"] = preg_replace('/(\d{3})\d{4}(\d{4})/', '$1****$2', $val["user_phone"]);
+        }
+        return [ "code" => 200, "date" => $payLogList ];
+    }
+
     /**
      * 获取业绩数据
      * @param $type

application/api_broker/service/VerifyService.php

@@ -59,6 +59,33 @@ class VerifyService
         return null;
     }
 
+    public function getAgentsByAgentIdPcInfo($id, $type)
+    {
+        $arr_list = [];
+        switch ($type) {
+            case 1:
+                return $id;
+            case 2:
+                $arr_list = $this->agentModel->searchAgentsByKeyword("id", [ "store_id" => $id ]);
+                break;
+            case 3:
+                $arr_list = $this->agentModel->searchAgentsByKeyword("id", [ "district_id" => $id ]);
+                break;
+            default:
+                return $id;
+                break;
+        }
+        $ids = "";
+        if (count($arr_list) > 0) {
+            foreach ($arr_list as $item) {
+                $ids .= $item["id"] . ",";
+            }
+        }
+        $ids = rtrim($ids, ",");
+
+        return $ids;
+    }
+
     /**
      * 获取我的案场权限人
      * @param $agent_id

application/model/GOperatingRecords.php

@@ -62,7 +62,7 @@ class GOperatingRecords extends BaseModel
         }
 
         try {
-            $data = $this->field('name,remark,create_time')
+            $data = $this->field('name,remark,create_time,user_id')
                 ->where($param)
                 ->order('create_time', 'desc')
                 ->select();

application/model/OMarchInModel.php

@@ -250,6 +250,30 @@ class OMarchInModel extends Model
             ->select();
     }
 
+    public function getAddMarchInListPcInfo($params, $field, $page_no, $page_size)
+    {
+        $where_ = [];
+        if (isset($params["agent_id"])) {
+            $where_["a.reception_id"] = $params["agent_id"];
+        }
+        if (isset($params["create_time"])) {
+            $where_["a.create_time"] = $params["create_time"];
+        }
+        if (isset($params["house_ids"])) {
+            $where_["b.house_id"] = array( "in", $params["house_ids"] );
+        }
+        return Db::table($this->table)
+            ->field($field)
+            ->alias("a")
+            ->join("o_order b", "a.order_id = b.id", "left")
+            ->join("o_report c", "b.f_id = c.id", "left")
+            ->join('a_store e', 'c.report_store_id = e.id', 'left')
+            ->where($where_)
+            ->limit($page_size)
+            ->page($page_no)
+            ->select();
+    }
+
     public function getAddMarchInOrderList($field, $params)
     {
         $where_ = [];

application/model/OPayLogModel.php

@@ -238,6 +238,29 @@ class OPayLogModel extends Model
             ->select();
     }
 
+    public function getAddPayLogListPcInfo($params, $field, $page_no, $page_size){
+        $where_ = [];
+        if(isset($params["agent_id"])){
+            $where_["a.agent_id"] = $params["agent_id"];
+        }
+        if(isset($params["create_time"])){
+            $where_["a.create_time"] = $params["create_time"];
+        }
+        if(isset($params["house_ids"])){
+            $where_["b.house_id"] = array("in",$params["house_ids"]);
+        }
+        return Db::table($this->table)
+            ->field($field)
+            ->alias("a")
+            ->join("o_order b","a.order_id = b.id","left")
+            ->join("g_houses h","b.house_id = h.id","left")
+            ->join("o_report c","b.f_id = c.id","left")
+            ->where($where_)
+            ->limit($page_size)
+            ->page($page_no)
+            ->select();
+    }
+
 
     /**
      * @param $field

application/route.php

@@ -544,6 +544,10 @@ Route::group('broker', [
     'superviseList'         => [ 'api_broker/Performance/superviseList', [ 'method' => 'POST|GET' ] ], //监督执行list
     'officialReceiptsList'  => [ 'api_broker/Performance/officialReceiptsList', [ 'method' => 'POST|GET' ] ], //实收list
 
+    'paylogListPcInfo'           => [ 'api_broker/Performance/paylogListPcInfo', [ 'method' => 'POST|GET' ] ], //进场list
+    'marchInListPcInfo'           => [ 'api_broker/Performance/marchInListPcInfo', [ 'method' => 'POST|GET' ] ], //进场list
+
+
     //user
     'returnSearchCondition' => [ 'api_broker/User/returnSearchCondition', [ 'method' => 'get' ] ], //客户搜索条件
     'searchUser'            => [ 'api_broker/User/searchUser', [ 'method' => 'get|post' ] ], //客户搜索