Commit 401e435a authored by clone's avatar clone

成交报告详情增加收款信息

parent bc295790
...@@ -48,15 +48,15 @@ class Performance extends Basic ...@@ -48,15 +48,15 @@ class Performance extends Basic
return $this->response("101", "请求参数错误"); return $this->response("101", "请求参数错误");
} }
//默认排序一周 2018-07-18改为本月 //默认排序一周 2018-07-18改为本月
$end_day = !empty($params["end_day"]) ? $params["end_day"] : date("Y-m-d", time()); $end_day = !empty($params["end_day"]) ? $params["end_day"] : date("Y-m-d", time());
$start_day = !empty($params["start_day"]) ? $params["start_day"] : date("Y-m-01", time()); $start_day = !empty($params["start_day"]) ? $params["start_day"] : date("Y-m-01", time());
$list = $this->service_->totalAgent($params["agent_id"], $params["type"], $start_day, $end_day,$params["site_id"]); $list = $this->service_->totalAgent($params["agent_id"], $params["type"], $start_day, $end_day, $params["site_id"]);
if (count($list) > 0) { if (count($list) > 0) {
$result["list"] = $list; $result["list"] = $list;
$result["start_time"] = $start_day; $result["start_time"] = $start_day;
$result["end_time"] = $end_day; $result["end_time"] = $end_day;
return $this->response("200", "request success", $result); return $this->response("200", "request success", $result);
} }
return $this->response("200", "request null"); return $this->response("200", "request null");
...@@ -86,7 +86,7 @@ class Performance extends Basic ...@@ -86,7 +86,7 @@ class Performance extends Basic
$house_id = $params["house_id"]; $house_id = $params["house_id"];
} }
try { try {
$result = $this->service_->personagePerformance($params["agent_id"], $params["start_time"], $params["end_time"] ." 23:59:59", $result = $this->service_->personagePerformance($params["agent_id"], $params["start_time"], $params["end_time"] . " 23:59:59",
$params["is_case"], $house_id); $params["is_case"], $house_id);
return $this->response("200", "request success", $result); return $this->response("200", "request success", $result);
} catch (Exception $exception) { } catch (Exception $exception) {
...@@ -108,11 +108,11 @@ class Performance extends Basic ...@@ -108,11 +108,11 @@ class Performance extends Basic
"start_time" => "2018-06-25", "start_time" => "2018-06-25",
"end_time" => "2018-06-25", "end_time" => "2018-06-25",
);*/ );*/
if (!isset($params["agent_id"]) || !isset($params["site_id"])) { if (!isset($params["agent_id"]) || !isset($params["site_id"])) {
return $this->response("101", "请求参数错误"); return $this->response("101", "请求参数错误");
} }
try { try {
$result = $this->service_->storePerformance($params["agent_id"], $params["start_time"], $params["end_time"]." 23:59:59",$params["site_id"]); $result = $this->service_->storePerformance($params["agent_id"], $params["start_time"], $params["end_time"] . " 23:59:59", $params["site_id"]);
return $this->response("200", "request success", $result); return $this->response("200", "request success", $result);
} catch (Exception $exception) { } catch (Exception $exception) {
return $this->response("101", "request error,msg:" . $exception); return $this->response("101", "request error,msg:" . $exception);
...@@ -127,14 +127,14 @@ class Performance extends Basic ...@@ -127,14 +127,14 @@ class Performance extends Basic
{ {
header('Access-Control-Allow-Origin:*'); header('Access-Control-Allow-Origin:*');
$params = $this->params; $params = $this->params;
/* $params = array( /* $params = array(
"agent_id" => 5740, "agent_id" => 5740,
"start_time" => "2018-08-08", "start_time" => "2018-08-08",
"end_time" => "2018-08-08", "end_time" => "2018-08-08",
"is_case" => 2,//1经纪人 2案场 "is_case" => 2,//1经纪人 2案场
"house_id" => 7311, "house_id" => 7311,
"type" => 4 // 1带看 2进场 3收款 4成交报告 "type" => 4 // 1带看 2进场 3收款 4成交报告
);*/ );*/
if (!isset($params["agent_id"]) || !isset($params["start_time"]) || !isset($params["end_time"]) || !isset($params["type"])) { if (!isset($params["agent_id"]) || !isset($params["start_time"]) || !isset($params["end_time"]) || !isset($params["type"])) {
return $this->response("101", "请求参数错误"); return $this->response("101", "请求参数错误");
} }
...@@ -168,14 +168,14 @@ class Performance extends Basic ...@@ -168,14 +168,14 @@ class Performance extends Basic
"end_time" => "2018-04-12", "end_time" => "2018-04-12",
);*/ );*/
if (!isset($params["agent_id"]) || !isset($params["start_time"]) || !isset($params["end_time"] )|| !isset($params["site_id"])) { if (!isset($params["agent_id"]) || !isset($params["start_time"]) || !isset($params["end_time"]) || !isset($params["site_id"])) {
return $this->response("101", "请求参数错误"); return $this->response("101", "请求参数错误");
} }
Log::write($params, 'storeOrAgentSort'); //记录日志 Log::write($params, 'storeOrAgentSort'); //记录日志
//城市选择 //城市选择
$site_id = $params["site_id"]? $params["site_id"]: ''; $site_id = $params["site_id"] ? $params["site_id"] : '';
try { try {
$result = $this->service_->storeSortByDistrictId($params["agent_id"], $params["is_store"], $params["start_time"], $params["end_time"]." 23:59:59",$site_id); $result = $this->service_->storeSortByDistrictId($params["agent_id"], $params["is_store"], $params["start_time"], $params["end_time"] . " 23:59:59", $site_id);
return $this->response("200", "request success", $result); return $this->response("200", "request success", $result);
} catch (Exception $exception) { } catch (Exception $exception) {
...@@ -205,10 +205,10 @@ class Performance extends Basic ...@@ -205,10 +205,10 @@ class Performance extends Basic
return $this->response("101", $checkResult); return $this->response("101", $checkResult);
} }
//默认排序一周 //默认排序一周
$end_day = !empty($params["end_time"]) ? $params["end_time"] : date("Y-m-d", strtotime("-1 day")); $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")); $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_no = empty($params['page_no']) ? 1 : $params['page_no'];
$page_size = empty($params['page_size']) ? 15 : $params['page_size']; $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); $result = $this->service_->getHousingResourceList($params["type"], $params["agent_id"], $start_day, $end_day, $page_no, $page_size);
...@@ -241,10 +241,10 @@ class Performance extends Basic ...@@ -241,10 +241,10 @@ class Performance extends Basic
return $this->response("101", $checkResult); return $this->response("101", $checkResult);
} }
//默认排序一周 //默认排序一周
$end_day = !empty($params["end_time"]) ? $params["end_time"] : date("Y-m-d", strtotime("-1 day")); $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")); $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_no = empty($params['page_no']) ? 1 : $params['page_no'];
$page_size = empty($params['page_size']) ? 15 : $params['page_size']; $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); $result = $this->service_->getUserResourceList($params["type"], $params["agent_id"], $start_day, $end_day, $page_no, $page_size);
...@@ -277,10 +277,10 @@ class Performance extends Basic ...@@ -277,10 +277,10 @@ class Performance extends Basic
return $this->response("101", $checkResult); return $this->response("101", $checkResult);
} }
//默认排序一周 //默认排序一周
$end_day = !empty($params["end_time"]) ? $params["end_time"] : date("Y-m-d", strtotime("-1 day")); $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")); $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_no = empty($params['page_no']) ? 1 : $params['page_no'];
$page_size = empty($params['page_size']) ? 15 : $params['page_size']; $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); $result = $this->service_->getFollowList($params["agent_id"], $start_day, $end_day, $page_no, $page_size);
...@@ -299,23 +299,23 @@ class Performance extends Basic ...@@ -299,23 +299,23 @@ class Performance extends Basic
{ {
header('Access-Control-Allow-Origin:*'); header('Access-Control-Allow-Origin:*');
$params = $this->params; $params = $this->params;
/* $params = array( /* $params = array(
"agent_id" => 80, "agent_id" => 80,
"start_time" => "2018-06-12", "start_time" => "2018-06-12",
"end_time" => "2018-06-19", "end_time" => "2018-06-19",
"page_no" => 1, "page_no" => 1,
"page_size" => 15 "page_size" => 15
);*/ );*/
$checkResult = $this->validate($params, "PerformanceValidate.verifyOther"); $checkResult = $this->validate($params, "PerformanceValidate.verifyOther");
if (true !== $checkResult) { if (true !== $checkResult) {
return $this->response("101", $checkResult); return $this->response("101", $checkResult);
} }
//默认排序一周 //默认排序一周
$end_day = !empty($params["end_time"]) ? $params["end_time"] : date("Y-m-d", strtotime("-1 day")); $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")); $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_no = empty($params['page_no']) ? 1 : $params['page_no'];
$page_size = empty($params['page_size']) ? 15 : $params['page_size']; $page_size = empty($params['page_size']) ? 15 : $params['page_size'];
$result = $this->service_->marchInList($params["agent_id"], $start_day, $end_day, $page_no, $page_size); $result = $this->service_->marchInList($params["agent_id"], $start_day, $end_day, $page_no, $page_size);
...@@ -347,10 +347,10 @@ class Performance extends Basic ...@@ -347,10 +347,10 @@ class Performance extends Basic
return $this->response("101", $checkResult); return $this->response("101", $checkResult);
} }
//默认排序一周 //默认排序一周
$end_day = !empty($params["end_time"]) ? $params["end_time"] : date("Y-m-d", strtotime("-1 day")); $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")); $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_no = empty($params['page_no']) ? 1 : $params['page_no'];
$page_size = empty($params['page_size']) ? 15 : $params['page_size']; $page_size = empty($params['page_size']) ? 15 : $params['page_size'];
$result = $this->service_->paylogList($params["agent_id"], $start_day, $end_day, $page_no, $page_size); $result = $this->service_->paylogList($params["agent_id"], $start_day, $end_day, $page_no, $page_size);
...@@ -369,24 +369,24 @@ class Performance extends Basic ...@@ -369,24 +369,24 @@ class Performance extends Basic
{ {
header('Access-Control-Allow-Origin:*'); header('Access-Control-Allow-Origin:*');
$params = $this->params; $params = $this->params;
/* $params = array( /* $params = array(
"type" => 1, //1个人,2经纪人 "type" => 1, //1个人,2经纪人
"agent_id" => 80, "agent_id" => 80,
"start_time" => "2018-06-12", "start_time" => "2018-06-12",
"end_time" => "2018-06-19", "end_time" => "2018-06-19",
"page_no" => 1, "page_no" => 1,
"page_size" => 15 "page_size" => 15
);*/ );*/
$checkResult = $this->validate($params, "PerformanceValidate.verify"); $checkResult = $this->validate($params, "PerformanceValidate.verify");
if (true !== $checkResult) { if (true !== $checkResult) {
return $this->response("101", $checkResult); return $this->response("101", $checkResult);
} }
//默认排序一周 //默认排序一周
$end_day = !empty($params["end_time"]) ? $params["end_time"] : date("Y-m-d", strtotime("-1 day")); $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")); $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_no = empty($params['page_no']) ? 1 : $params['page_no'];
$page_size = empty($params['page_size']) ? 15 : $params['page_size']; $page_size = empty($params['page_size']) ? 15 : $params['page_size'];
$result = $this->service_->performanceList($params["type"], $params["agent_id"], $start_day, $end_day, $page_no, $page_size); $result = $this->service_->performanceList($params["type"], $params["agent_id"], $start_day, $end_day, $page_no, $page_size);
...@@ -418,10 +418,10 @@ class Performance extends Basic ...@@ -418,10 +418,10 @@ class Performance extends Basic
return $this->response("101", $checkResult); return $this->response("101", $checkResult);
} }
//默认排序一周 //默认排序一周
$end_day = !empty($params["end_time"]) ? $params["end_time"] : date("Y-m-d", strtotime("-1 day")); $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")); $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_no = empty($params['page_no']) ? 1 : $params['page_no'];
$page_size = empty($params['page_size']) ? 15 : $params['page_size']; $page_size = empty($params['page_size']) ? 15 : $params['page_size'];
$result = $this->service_->superviseList($params["agent_id"], $start_day, $end_day, $page_no, $page_size); $result = $this->service_->superviseList($params["agent_id"], $start_day, $end_day, $page_no, $page_size);
...@@ -454,10 +454,10 @@ class Performance extends Basic ...@@ -454,10 +454,10 @@ class Performance extends Basic
return $this->response("101", $checkResult); return $this->response("101", $checkResult);
} }
//默认排序一周 //默认排序一周
$end_day = !empty($params["end_time"]) ? $params["end_time"] : date("Y-m-d", strtotime("-1 day")); $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")); $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_no = empty($params['page_no']) ? 1 : $params['page_no'];
$page_size = empty($params['page_size']) ? 15 : $params['page_size']; $page_size = empty($params['page_size']) ? 15 : $params['page_size'];
$result = $this->service_->officialReceipts($params["type"], $params["agent_id"], $start_day, $end_day, $page_no, $page_size); $result = $this->service_->officialReceipts($params["type"], $params["agent_id"], $start_day, $end_day, $page_no, $page_size);
...@@ -468,12 +468,6 @@ class Performance extends Basic ...@@ -468,12 +468,6 @@ class Performance extends Basic
} }
} }
/** /**
* 获取时间段实收数据 * 获取时间段实收数据
* @return \think\Response * @return \think\Response
...@@ -484,13 +478,13 @@ class Performance extends Basic ...@@ -484,13 +478,13 @@ class Performance extends Basic
$params = $this->params; $params = $this->params;
//默认排序一周 //默认排序一周
$end_day = !empty($params["end_time"]) ? $params["end_time"] : date("Y-m-d", strtotime("-1 day")); $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")); $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_no = empty($params['page_no']) ? 1 : $params['page_no'];
$page_size = empty($params['page_size']) ? 15 : $params['page_size']; $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); $result = $this->service_->paylogListPcInfo($params["id"], $params["type"], $start_day, $end_day, $page_no, $page_size);
if ($result["code"] == 101) { if ($result["code"] == 101) {
return $this->response("101", $result["date"]); return $this->response("101", $result["date"]);
...@@ -508,18 +502,18 @@ class Performance extends Basic ...@@ -508,18 +502,18 @@ class Performance extends Basic
header('Access-Control-Allow-Origin:*'); header('Access-Control-Allow-Origin:*');
$params = $this->params; $params = $this->params;
//默认排序一周 //默认排序一周
$end_day = !empty($params["end_time"]) ? $params["end_time"] : date("Y-m-d", strtotime("-1 day")); $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")); $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_no = empty($params['page_no']) ? 1 : $params['page_no'];
$page_size = empty($params['page_size']) ? 15 : $params['page_size']; $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); $result = $this->service_->marchInListPcInfo($params["id"], $params["type"], $start_day, $end_day, $page_no, $page_size);
if ($result["code"] == 101) { if ($result["code"] == 101) {
return $this->response("101", $result["date"]); return $this->response("101", $result["date"]);
} else { } else {
// return $this->response("200", "success", $result["date"]); // return $this->response("200", "success", $result["date"]);
return $this->response("200", "success", [ "date" => $result["date"] , "total" => $result["total"] ]); return $this->response("200", "success", ["date" => $result["date"], "total" => $result["total"]]);
} }
} }
...@@ -533,28 +527,28 @@ class Performance extends Basic ...@@ -533,28 +527,28 @@ class Performance extends Basic
header('Access-Control-Allow-Origin:*'); header('Access-Control-Allow-Origin:*');
$params = $this->params; $params = $this->params;
/* $params = array( /* $params = array(
"id" => 80, "id" => 80,
"type" => 1, //1表示个人业绩排行 2门店79 3区域7 "type" => 1, //1表示个人业绩排行 2门店79 3区域7
"start_time" => "2018-06-12", "start_time" => "2018-06-12",
"end_time" => "2018-06-19", "end_time" => "2018-06-19",
"page_no" => 1, "page_no" => 1,
"page_size" => 15 "page_size" => 15
);*/ );*/
//默认排序一周 //默认排序一周
$end_day = !empty($params["end_time"]) ? $params["end_time"] : date("Y-m-d", strtotime("-1 day")); $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")); $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_no = empty($params['page_no']) ? 1 : $params['page_no'];
$page_size = empty($params['page_size']) ? 15 : $params['page_size']; $page_size = empty($params['page_size']) ? 15 : $params['page_size'];
$result = $this->service_->getFollowListPcInfo($params["id"],$params["type"], $start_day, $end_day, $page_no, $page_size); $result = $this->service_->getFollowListPcInfo($params["id"], $params["type"], $start_day, $end_day, $page_no, $page_size);
if ($result["code"] == 101) { if ($result["code"] == 101) {
return $this->response("101", $result["date"]); return $this->response("101", $result["date"]);
} else { } else {
//return $this->response("200", "success", $result["date"]); //return $this->response("200", "success", $result["date"]);
return $this->response("200", "success", [ "date" => $result["date"] , "total" => $result["total"] ]); return $this->response("200", "success", ["date" => $result["date"], "total" => $result["total"]]);
} }
} }
...@@ -570,14 +564,14 @@ class Performance extends Basic ...@@ -570,14 +564,14 @@ class Performance extends Basic
$params = $this->params; $params = $this->params;
//默认排序一周 //默认排序一周
$end_day = !empty($params["end_time"]) ? $params["end_time"] : date("Y-m-d", strtotime("-1 day")); $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")); $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_no = empty($params['page_no']) ? 1 : $params['page_no'];
$page_size = empty($params['page_size']) ? 15 : $params['page_size']; $page_size = empty($params['page_size']) ? 15 : $params['page_size'];
//todo 最后跟进时间 //todo 最后跟进时间
$result = $this->service_->getHousingResourceListPcInfo($params["id"],$params["type"], $start_day, $end_day, $page_no, $page_size); $result = $this->service_->getHousingResourceListPcInfo($params["id"], $params["type"], $start_day, $end_day, $page_no, $page_size);
if ($result["code"] == 101) { if ($result["code"] == 101) {
return $this->response("101", $result["date"]); return $this->response("101", $result["date"]);
} else { } else {
...@@ -596,14 +590,14 @@ class Performance extends Basic ...@@ -596,14 +590,14 @@ class Performance extends Basic
$params = $this->params; $params = $this->params;
//默认排序一周 //默认排序一周
$end_day = !empty($params["end_time"]) ? $params["end_time"] : date("Y-m-d", strtotime("-1 day")); $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")); $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_no = empty($params['page_no']) ? 1 : $params['page_no'];
$page_size = empty($params['page_size']) ? 15 : $params['page_size']; $page_size = empty($params['page_size']) ? 15 : $params['page_size'];
$result = $this->service_->getUserResourceListPcInfo($params["id"],$params["type"], $start_day, $end_day, $result = $this->service_->getUserResourceListPcInfo($params["id"], $params["type"], $start_day, $end_day,
$page_no, $page_size,$this->siteId); $page_no, $page_size, $this->siteId);
if ($result["code"] == 101) { if ($result["code"] == 101) {
return $this->response("101", $result["date"]); return $this->response("101", $result["date"]);
} else { } else {
...@@ -622,13 +616,13 @@ class Performance extends Basic ...@@ -622,13 +616,13 @@ class Performance extends Basic
$params = $this->params; $params = $this->params;
//默认排序一周 //默认排序一周
$end_day = !empty($params["end_time"]) ? $params["end_time"] : date("Y-m-d", strtotime("-1 day")); $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")); $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_no = empty($params['page_no']) ? 1 : $params['page_no'];
$page_size = empty($params['page_size']) ? 15 : $params['page_size']; $page_size = empty($params['page_size']) ? 15 : $params['page_size'];
// dump($params); // dump($params);
$result = $this->service_->getTeamNumPcInfo($params["id"],$params["type"], $page_no, $page_size,$this->siteId); $result = $this->service_->getTeamNumPcInfo($params["id"], $params["type"], $page_no, $page_size, $this->siteId);
if ($result["code"] == 101) { if ($result["code"] == 101) {
return $this->response("101", $result["date"]); return $this->response("101", $result["date"]);
} else { } else {
...@@ -646,17 +640,17 @@ class Performance extends Basic ...@@ -646,17 +640,17 @@ class Performance extends Basic
$params = $this->params; $params = $this->params;
//默认排序一周 //默认排序一周
$end_day = !empty($params["end_time"]) ? $params["end_time"] : date("Y-m-d", strtotime("-1 day")); $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")); $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_no = empty($params['page_no']) ? 1 : $params['page_no'];
$page_size = empty($params['page_size']) ? 15 : $params['page_size']; $page_size = empty($params['page_size']) ? 15 : $params['page_size'];
//request_source_type true int 请求来源默认0:App 1:PC后台 //request_source_type true int 请求来源默认0:App 1:PC后台
$request_source_type = !empty($params["request_source_type"]) ? $params["request_source_type"] : 0; $request_source_type = !empty($params["request_source_type"]) ? $params["request_source_type"] : 0;
$result = $this->service_->getBargainSumPcInfo($params["id"],$params["type"], $start_day, $end_day, $page_no, $page_size,$request_source_type); $result = $this->service_->getBargainSumPcInfo($params["id"], $params["type"], $start_day, $end_day, $page_no, $page_size, $request_source_type);
if ($result["code"] == 101) { if ($result["code"] == 101) {
return $this->response("101", $result["date"]); return $this->response("101", $result["date"]);
} else { } else {
...@@ -664,4 +658,27 @@ class Performance extends Basic ...@@ -664,4 +658,27 @@ class Performance extends Basic
} }
} }
/**
* 收款信息
* @return \think\Response
*/
public function collectionListByBargainId()
{
header('Access-Control-Allow-Origin:*');
$params = $this->params;
/* $params = array(
"bargain_id" => 1,
"agent_id" => 80,
);*/
$checkResult = $this->validate($params, "PerformanceValidate.verifyCollectionList");
if (true !== $checkResult) {
return $this->response("101", $checkResult);
}
$result = $this->service_->collectionList($params["bargain_id"]);
return $this->response("200", "success", $result);
}
} }
...@@ -894,5 +894,17 @@ class PerformanceService ...@@ -894,5 +894,17 @@ class PerformanceService
return [ "code" => 200, "date" => $list ]; return [ "code" => 200, "date" => $list ];
} }
/**
* @param $bargain_id
* @return false|\PDOStatement|string|\think\Collection
*/
public function collectionList($bargain_id){
$paylogModel = new OPayLogModel();
$orderParams["bargain_id"] = $bargain_id;
$field_pay_log = "a.id,a.create_time,a.bargain_id,a.money,a.type,a.income_time,a.source,c.id as agent_id,c.name,d.store_name";
return $paylogModel->getPayLogByOrderId($field_pay_log,$orderParams);
}
} }
\ No newline at end of file
...@@ -22,6 +22,7 @@ class PerformanceValidate extends Validate ...@@ -22,6 +22,7 @@ class PerformanceValidate extends Validate
'push_id' => 'require', 'push_id' => 'require',
'is_forbidden' => 'require|in:0,1', 'is_forbidden' => 'require|in:0,1',
'operator_id' => 'require|number', 'operator_id' => 'require|number',
'bargain_id' => 'require|number',
]; ];
protected $message = [ protected $message = [
...@@ -39,6 +40,8 @@ class PerformanceValidate extends Validate ...@@ -39,6 +40,8 @@ class PerformanceValidate extends Validate
'is_forbidden.in' => '是否绑定字段值只能为0或1', 'is_forbidden.in' => '是否绑定字段值只能为0或1',
'operator_id.require' => '操作人为必填字段', 'operator_id.require' => '操作人为必填字段',
'operator_id.number' => '操作人编号只能为数字', 'operator_id.number' => '操作人编号只能为数字',
'bargain_id.require' => '成交报告编号为必填字段',
'bargain_id.number' => '成交报告编号只能为数字',
]; ];
protected $scene = [ protected $scene = [
...@@ -47,5 +50,6 @@ class PerformanceValidate extends Validate ...@@ -47,5 +50,6 @@ class PerformanceValidate extends Validate
'login' => [ 'phone', 'pwd', 'device_id', "push_id" ], 'login' => [ 'phone', 'pwd', 'device_id', "push_id" ],
'verifyStatus' => [ 'agent_id', 'device_id' ], 'verifyStatus' => [ 'agent_id', 'device_id' ],
'verifyIsForbidden' => [ 'phone', 'device_id', 'is_forbidden', 'operator_id' ], 'verifyIsForbidden' => [ 'phone', 'device_id', 'is_forbidden', 'operator_id' ],
'verifyCollectionList' => [ 'agent_id', 'bargain_id'],
]; ];
} }
\ No newline at end of file
...@@ -138,6 +138,9 @@ class OPayLogModel extends Model ...@@ -138,6 +138,9 @@ class OPayLogModel extends Model
if (isset($params["house_title"])) { if (isset($params["house_title"])) {
$where_["b.house_title"] = $params["house_title"]; $where_["b.house_title"] = $params["house_title"];
} }
if (isset($params["bargain_id"])) {
$where_["a.bargain_id"] = $params["bargain_id"];
}
$where_["a.is_del"] = 0; $where_["a.is_del"] = 0;
return Db::table($this->table) return Db::table($this->table)
->field($field) ->field($field)
......
...@@ -710,14 +710,15 @@ Route::group('broker', [ ...@@ -710,14 +710,15 @@ Route::group('broker', [
'userFollowUpListV2' => ['api_broker/HomePageLog/userFollowUpListV2', ['method' => 'post|get']], 'userFollowUpListV2' => ['api_broker/HomePageLog/userFollowUpListV2', ['method' => 'post|get']],
'houseFollowUpList' => ['api_broker/HomePageLog/houseFollowUpList', ['method' => 'post']], 'houseFollowUpList' => ['api_broker/HomePageLog/houseFollowUpList', ['method' => 'post']],
'housingResource' => ['api_broker/Performance/housingResource', ['method' => 'POST|GET']], //获取房源list 'housingResource' => ['api_broker/Performance/housingResource', ['method' => 'POST|GET']], //获取房源list
'userResource' => ['api_broker/Performance/userResource', ['method' => 'POST|GET']], //获取客源list 'userResource' => ['api_broker/Performance/userResource', ['method' => 'POST|GET']], //获取客源list
'followList' => ['api_broker/Performance/followList', ['method' => 'POST|GET']], //报备list 'followList' => ['api_broker/Performance/followList', ['method' => 'POST|GET']], //报备list
'marchInList' => ['api_broker/Performance/marchInList', ['method' => 'POST|GET']], //进场list 'marchInList' => ['api_broker/Performance/marchInList', ['method' => 'POST|GET']], //进场list
'paylogList' => ['api_broker/Performance/paylogList', ['method' => 'POST|GET']], //收款list 'paylogList' => ['api_broker/Performance/paylogList', ['method' => 'POST|GET']], //收款list
'performanceList' => ['api_broker/Performance/performanceList', ['method' => 'POST|GET']], //业绩list 'performanceList' => ['api_broker/Performance/performanceList', ['method' => 'POST|GET']], //业绩list
'superviseList' => ['api_broker/Performance/superviseList', ['method' => 'POST|GET']], //监督执行list 'superviseList' => ['api_broker/Performance/superviseList', ['method' => 'POST|GET']], //监督执行list
'officialReceiptsList' => ['api_broker/Performance/officialReceiptsList', ['method' => 'POST|GET']], //实收list 'officialReceiptsList' => ['api_broker/Performance/officialReceiptsList', ['method' => 'POST|GET']], //实收list
'collectionListByBargainId' => ['api_broker/Performance/collectionListByBargainId', ['method' => 'POST|GET']], //实收list
'paylogListPcInfo' => ['api_broker/Performance/paylogListPcInfo', ['method' => 'POST|GET']], // 'paylogListPcInfo' => ['api_broker/Performance/paylogListPcInfo', ['method' => 'POST|GET']], //
'marchInListPcInfo' => ['api_broker/Performance/marchInListPcInfo', ['method' => 'POST|GET']], // 'marchInListPcInfo' => ['api_broker/Performance/marchInListPcInfo', ['method' => 'POST|GET']], //
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment