Commit d91b6dec authored by zhuwei's avatar zhuwei

1

parent 9aa8ffc8
......@@ -78,7 +78,7 @@ class ClinchMap extends Basic
$m_bargain = new OBargainModel();
$conditions = [];
$performanceSum = $m_bargain->getAddBargainNumClinchMap($conditions);
$shop_bargain_num = isset($performanceSum[0]["num"]) ? $performanceSum[0]["num"] : 0;
$shop_bargain_num = $performanceSum ? count($performanceSum) : 0;
return $shop_bargain_num;
}
......@@ -136,12 +136,12 @@ class ClinchMap extends Basic
$conditions['a.create_time'] = array( 'between', array( $start_time . " 00:00:00", $end_time . " 23:59:59" ) );
$conditions['c.city'] = $v['city'];
$performanceSum = $m_bargain->getAddBargainNumClinchMap($conditions);
$month_bargain_num = isset($performanceSum[0]["num"]) ? $performanceSum[0]["num"] : 0;
$month_bargain_num = $performanceSum ? count($performanceSum) : 0;
$city_arr[$key]['month_bargain_num'] = $month_bargain_num;
$conditions = [];
$conditions['c.city'] = $key;
$performanceSum = $m_bargain->getAddBargainNumClinchMap($conditions);
$all_bargain_num = isset($performanceSum[0]["num"]) ? $performanceSum[0]["num"] : 0;
$all_bargain_num = $performanceSum ? count($performanceSum) : 0;
$city_arr[$key]['all_bargain_num'] = $all_bargain_num;
}
return $city_arr;
......
......@@ -1651,6 +1651,7 @@ class OBargainModel extends Model
->join("o_order b", "a.order_id = b.id", "left")
->join("g_houses c", "b.house_id = c.id", "left")
->where($params)
->group('b.house_id')
->select();
// big_log($this->getLastSql());
return $return;
......
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