Commit a7264d59 authored by clone's avatar clone

bug

parent f85e4774
......@@ -226,10 +226,10 @@ class Shop extends Basic
$conditions['a.id'] = array( "eq", $params["id"] );
$result = $this->gHousesModel->getHouseDetailById($field, $conditions);
$result["rent_price"] = $result["rent_price"] * 0.01;
$result["management_fee"] = $result["management_fee"] * 0.01;
$result["slotting_fee"] = $result["slotting_fee"] * 0.01;
$result = $this->gHousesModel->getHouseDetailById($field, $conditions);
$result["rent_price"] = $result["rent_price"] * 0.01;
$result["management_fee"] = $result["management_fee"] * 0.01;
$result["slotting_fee"] = $result["slotting_fee"] * 0.01;
$result["api_path"] = CK_IMG_URL.'images/';
$param["house_id"] = $params['id'];
//todo 这里的是否要更改成b端后台上传的类型
......
......@@ -370,9 +370,7 @@ class PerformanceService
return null;
}
$field = "store_id,agent_id,sum(add_house_num) as add_house_num,sum(add_user_num) as add_user_num,sum(march_in_num) as march_in_num,
sum(performance) as performance,sum(official_receipts) as official_receipts";
$list = [];
$list = [];
$now_date = date("Y-m-d", time());
......@@ -416,6 +414,10 @@ class PerformanceService
} else {
$field = "store_id,agent_id,sum(add_house_num) as add_house_num,sum(add_user_num) as add_user_num,sum(march_in_num) as march_in_num,
sum(performance) as performance,sum(official_receipts) as official_receipts";
$params['total_time'] = array( 'between', array( $start_time . " 00:00:00", $end_time . " 23:59:59" ) );
$order = "total_time desc";
......
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