Commit fb554a9b authored by zhuwei's avatar zhuwei

bug

parent 1a74f28b
...@@ -704,6 +704,7 @@ class PerformanceService ...@@ -704,6 +704,7 @@ class PerformanceService
$addMarchInListTotal = $this->marchInModel->getAddMarchInListPcInfoTotal($params, $field); $addMarchInListTotal = $this->marchInModel->getAddMarchInListPcInfoTotal($params, $field);
//获取图片信息 //获取图片信息
foreach ($addMarchInList as $key => $val) { foreach ($addMarchInList as $key => $val) {
$addMarchInList[$key]["user_name"] = $val["user_name"]?$val["user_name"]:'';
$addMarchInList[$key]["user_phone"] = preg_replace('/(\d{3})\d{4}(\d{4})/', '$1****$2', $val["user_phone"]); $addMarchInList[$key]["user_phone"] = preg_replace('/(\d{3})\d{4}(\d{4})/', '$1****$2', $val["user_phone"]);
} }
return [ "code" => 200, "date" => $addMarchInList , "total" => $addMarchInListTotal ]; return [ "code" => 200, "date" => $addMarchInList , "total" => $addMarchInListTotal ];
...@@ -827,7 +828,7 @@ class PerformanceService ...@@ -827,7 +828,7 @@ class PerformanceService
}else{ }else{
$params["a.district_id"] = $id; $params["a.district_id"] = $id;
} }
$params['a.create_time'] = array( 'between', array( $start_time . " 00:00:00", $end_time . " 23:59:59" ) ); //$params['a.create_time'] = array( 'between', array( $start_time . " 00:00:00", $end_time . " 23:59:59" ) );
$field = "a.id,a.level,a.name,a.phone,a.create_time,b.store_name"; $field = "a.id,a.level,a.name,a.phone,a.create_time,b.store_name";
...@@ -862,6 +863,7 @@ class PerformanceService ...@@ -862,6 +863,7 @@ class PerformanceService
$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);
foreach ($list as $key => $val) { foreach ($list as $key => $val) {
$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"]);
} }
return [ "code" => 200, "date" => $list ]; return [ "code" => 200, "date" => $list ];
......
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