|
...
|
...
|
@@ -57,7 +57,7 @@ class ZjOrderController extends AdminBaseController |
|
|
|
->join('user u', 'o.uid=u.id', 'left')
|
|
|
|
->where($where)->where($where1)
|
|
|
|
->order('create_time', 'desc')
|
|
|
|
->field('o.*,u.user_nickname,sum(whole_num) as whole_num')
|
|
|
|
->field('o.*,u.user_nickname')
|
|
|
|
->paginate(15);
|
|
|
|
$all->appends($arr);
|
|
|
|
|
|
...
|
...
|
@@ -74,6 +74,14 @@ class ZjOrderController extends AdminBaseController |
|
|
|
}
|
|
|
|
$cate1 = array_values($cate1);
|
|
|
|
$cate2 = array_values($cate2);
|
|
|
|
//计算总金额和总积分
|
|
|
|
$whole = 0;
|
|
|
|
$whole_num = 0;
|
|
|
|
foreach ($all as $item) {
|
|
|
|
$whole+=$item['whole'];
|
|
|
|
$whole_num+=$item['whole_num'];
|
|
|
|
}
|
|
|
|
$total = $whole - $whole_num;
|
|
|
|
$this->assign('start_time', !empty($arr['start_time']) ? $arr['start_time'] : '');
|
|
|
|
$this->assign('end_time', !empty($arr['end_time']) ? $arr['end_time'] : '');
|
|
|
|
$this->assign('uid', !empty($arr['uid']) ? $arr['uid'] : '');
|
|
...
|
...
|
@@ -87,6 +95,8 @@ class ZjOrderController extends AdminBaseController |
|
|
|
$this->assign('all', $all->items());
|
|
|
|
$this->assign('cate1', $cate1);
|
|
|
|
$this->assign('cate2', $cate2);
|
|
|
|
$this->assign('total', $total);
|
|
|
|
$this->assign('whole_num', $whole_num);
|
|
|
|
return $this->fetch();
|
|
|
|
}
|
|
|
|
|
...
|
...
|
|
