Commit 130e5eae authored by zhuwei's avatar zhuwei

bug

parent 683b1641
...@@ -642,8 +642,12 @@ class Performance extends Basic ...@@ -642,8 +642,12 @@ 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'];
//request_source_type true int 请求来源默认0:App 1:PC后台
$result = $this->service_->getBargainSumPcInfo($params["id"],$params["type"], $start_day, $end_day, $page_no, $page_size); $request_source_type = !empty($params["request_source_type"]) ? $params["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 {
......
...@@ -852,7 +852,7 @@ class PerformanceService ...@@ -852,7 +852,7 @@ class PerformanceService
* @param $page_size * @param $page_size
* @return array * @return array
*/ */
public function getBargainSumPcInfo($id,$type, $start_time, $end_time, $page_no, $page_size) public function getBargainSumPcInfo($id,$type, $start_time, $end_time, $page_no, $page_size,$request_source_type)
{ {
$params = $this->getAgentIdPcInfo($id, $type, $start_time, $end_time); $params = $this->getAgentIdPcInfo($id, $type, $start_time, $end_time);
...@@ -861,7 +861,7 @@ class PerformanceService ...@@ -861,7 +861,7 @@ class PerformanceService
$field = "a.id,a.create_time,a.trade_type,a.scale_fee,c.landmark,d.user_phone,d.user_name,b.id as order_id"; $field = "a.id,a.create_time,a.trade_type,a.scale_fee,c.landmark,d.user_phone,d.user_name,b.id as order_id";
$m_bargain = new OBargainModel(); $m_bargain = new OBargainModel();
$list = $m_bargain->getBargainSumList($field, $params,$page_size,$page_no); $list = $m_bargain->getBargainSumList($field, $params,$page_size,$page_no,$request_source_type);
foreach ($list as $key => $val) { foreach ($list as $key => $val) {
$list[$key]["user_name"] = $val["user_name"]?$val["user_name"]:''; $list[$key]["user_name"] = $val["user_name"]?$val["user_name"]:'';
$list[$key]["user_phone"] = preg_replace('/(\d{3})\d{4}(\d{4})/', '$1****$2', $val["user_phone"]); $list[$key]["user_phone"] = preg_replace('/(\d{3})\d{4}(\d{4})/', '$1****$2', $val["user_phone"]);
......
...@@ -1435,7 +1435,7 @@ class OBargainModel extends Model ...@@ -1435,7 +1435,7 @@ class OBargainModel extends Model
public function getBargainSumList($field, $params,$page_size,$page_no) public function getBargainSumList($field, $params,$page_size,$page_no,$request_source_type)
{ {
$where_ = []; $where_ = [];
...@@ -1447,7 +1447,11 @@ class OBargainModel extends Model ...@@ -1447,7 +1447,11 @@ class OBargainModel extends Model
$where_["a.create_time"] = $params["create_time"]; $where_["a.create_time"] = $params["create_time"];
} }
$where_["a.status"] = array( "in", "10,11,13,20" ); $where_["a.status"] = array( "in", "10,11,13,20" );
//$where_["a.role"] = 3;//必须是反签方
if($request_source_type && $request_source_type == 1){
//pc后台业绩 成交单数 需要调用
$where_["a.role"] = 3;//必须是反签方
}
$result = $this->db_ $result = $this->db_
->field($field) ->field($field)
->alias("a") ->alias("a")
......
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