Commit bff4778f authored by clone's avatar clone

实收列表

parent e815cbb7
...@@ -381,7 +381,7 @@ class Performance extends Basic ...@@ -381,7 +381,7 @@ class Performance extends Basic
$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);
if ($result["code"] == 101) { if ($result["code"] == 101) {
return $this->response("101", $result["date"]); return $this->response("101", $result["date"]);
} else { } else {
...@@ -452,7 +452,7 @@ class Performance extends Basic ...@@ -452,7 +452,7 @@ class Performance extends Basic
$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);
if ($result["code"] == 101) { if ($result["code"] == 101) {
return $this->response("101", $result["date"]); return $this->response("101", $result["date"]);
} else { } else {
......
...@@ -741,7 +741,7 @@ class PerformanceService ...@@ -741,7 +741,7 @@ class PerformanceService
$params = $this->getAgentId($agent_id, $type, $start_time, $end_time); $params = $this->getAgentId($agent_id, $type, $start_time, $end_time);
if (!$params) if (!$params)
return [ "code" => 101, "date" => "传入的参数错误" ]; return [ "code" => 101, "date" => "传入的参数错误" ];
$field = "a.id,c.name,d.store_name,e.district_name,a.practical_fee,a.create_time"; $field = "a.id,c.name,d.store_name,e.district_name,b.practical_fee,b.create_time";
$where_["a.agent_id"] = $params["agent_id"]; $where_["a.agent_id"] = $params["agent_id"];
$where_["a.create_time"] = $params["create_time"]; $where_["a.create_time"] = $params["create_time"];
......
...@@ -683,11 +683,12 @@ class OBargainModel extends Model ...@@ -683,11 +683,12 @@ class OBargainModel extends Model
->join("o_partial_commission b", "a.id=b.bargain_id", "right") ->join("o_partial_commission b", "a.id=b.bargain_id", "right")
->join("a_agents c", "a.agent_id=c.id", "left") ->join("a_agents c", "a.agent_id=c.id", "left")
->join("a_store d", "c.store_id=d.id", "left") ->join("a_store d", "c.store_id=d.id", "left")
->join("a_district e", "c.district_id=c.id", "left") ->join("a_district e", "c.district_id=e.id", "left")
->where($where_) ->where($where_)
->page($page_no) ->page($page_no)
->limit($page_size) ->limit($page_size)
->select(); ->select();
// echo $this->getLastSql();
return $date; return $date;
} }
......
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