Commit 48e17eca authored by clone's avatar clone

bug

parent ee558fcf
...@@ -18,14 +18,14 @@ class InviteTotal extends Basic ...@@ -18,14 +18,14 @@ class InviteTotal extends Basic
public function getFirstLoginTotal() public function getFirstLoginTotal()
{ {
$params = $this->params; $params = $this->params;
/* $params = array( /* $params = array(
"district_id" => 5, "district_id" => 5,
//"store_id" => 1, //"store_id" => 1,
"start_time" => "2018-03-01", "start_time" => "2018-03-01",
"end_time" => "2018-10-01", "end_time" => "2018-10-01",
"page_no" => 1, "page_no" => 1,
"page_size" => 30 "page_size" => 30
);*/ );*/
if (empty($params["district_id"])) { if (empty($params["district_id"])) {
return $this->response("101", "请选择部门或门店"); return $this->response("101", "请选择部门或门店");
} else { } else {
...@@ -39,7 +39,7 @@ class InviteTotal extends Basic ...@@ -39,7 +39,7 @@ class InviteTotal extends Basic
if (empty($params["start_time"]) || empty($params["end_time"])) { if (empty($params["start_time"]) || empty($params["end_time"])) {
return $this->response("101", "请选择时间"); return $this->response("101", "请选择时间");
} else { } else {
$param["a.create_time"] = array( "between", array( $params["start_time"], $params["end_time"] ) ); $param["a.first_login_time"] = array( "between", array( $params["start_time"], $params["end_time"] . " 23:59:59" ) );
} }
$page_no = empty($params['page_no']) ? 1 : $params['page_no']; $page_no = empty($params['page_no']) ? 1 : $params['page_no'];
...@@ -49,9 +49,11 @@ class InviteTotal extends Basic ...@@ -49,9 +49,11 @@ class InviteTotal extends Basic
$field = 'count(a.id) num ,b.id,b.name,b.store_id,b.district_id'; $field = 'count(a.id) num ,b.id,b.name,b.store_id,b.district_id';
$param["a.referrer_source"] = 20; $param["a.referrer_source"] = 20;
$param["a.status"] = 0;
$userModel = new Users(); $userModel = new Users();
$data_list = $userModel->getInviteTotal($field, $param, $page_no, $page_size); $data_list = $userModel->getInviteTotal($field, $param, $page_no, $page_size);
$getInviteCount = $userModel->getInviteCount($param);
$storeModel = new AStore(); $storeModel = new AStore();
foreach ($data_list as $key => $item) { foreach ($data_list as $key => $item) {
...@@ -61,6 +63,8 @@ class InviteTotal extends Basic ...@@ -61,6 +63,8 @@ class InviteTotal extends Basic
$data_list[$key]["district_name"] = $info["district_name"]; $data_list[$key]["district_name"] = $info["district_name"];
$data_list[$key]["store_name"] = $info["store_name"]; $data_list[$key]["store_name"] = $info["store_name"];
} }
return $this->response("200", "success", $data_list); $result["list"] = $data_list;
$result["total"] = $getInviteCount;
return $this->response("200", "success", $result);
} }
} }
\ No newline at end of file
...@@ -923,5 +923,15 @@ class Users extends Model ...@@ -923,5 +923,15 @@ class Users extends Model
->limit($page_size) ->limit($page_size)
->select(); ->select();
} }
public function getInviteCount($params){
return Db::table($this->table)
->alias("a")
->join("a_agents b","a.referrer_id=b.id","left")
->where($params)
->group("b.id")
->count();
}
} }
...@@ -72,7 +72,7 @@ ...@@ -72,7 +72,7 @@
if(typeof data === 'object') { if(typeof data === 'object') {
if (data.code == 200) { if (data.code == 200) {
var doTtmpl = doT.template(document.getElementById('invite_statistics_list_tpl').innerHTML); var doTtmpl = doT.template(document.getElementById('invite_statistics_list_tpl').innerHTML);
$("#follow_list").html(doTtmpl(data.data)); $("#follow_list").html(doTtmpl(data.data.list));
/*分页代码*/ /*分页代码*/
add_page(data.data.total,pageNo,invitation.pageSize,invitation.getList); add_page(data.data.total,pageNo,invitation.pageSize,invitation.getList);
......
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