|
@@ -21,12 +21,12 @@ class MyTeam extends Backend
|
|
|
list($where, $sort, $order, $offset, $limit) = $this->buildparams();
|
|
|
$type=input('type',1);
|
|
|
if($type==1){
|
|
|
- $list=OrderInfo::whereExists(
|
|
|
- Orders::whereRaw("orders.id=order_info.order_id and admin_id={$this->admin('id')}")->buildSql()
|
|
|
- )
|
|
|
- ->filterDate($dateArr)
|
|
|
- ->group('category_id')
|
|
|
- ->field('count(order_id) as num,group_concat(order_id) as order_ids,category_name,category_id')
|
|
|
+ $list=OrderGoods::filterDate($dateArr)
|
|
|
+ ->filterAdmin($this->admin('id'))
|
|
|
+ ->group('order_goods.goods_id')
|
|
|
+ ->join('order_info','order_info.order_id=order_goods.order_id and order_info.goods_id=order_goods.goods_id')
|
|
|
+ ->field('count(order_goods.order_id) as num,order_info.category_name as category_name')
|
|
|
+ ->order('num','desc')
|
|
|
->select();
|
|
|
}else{
|
|
|
$list=OrderInfo::whereExists(
|
|
@@ -89,7 +89,7 @@ class MyTeam extends Backend
|
|
|
->field('sum(amount_pay) as num,user_id')
|
|
|
->order('num','desc')
|
|
|
->paginate($limit);
|
|
|
- }else{
|
|
|
+ }elseif($type==3){
|
|
|
$list=OrderGoods::filterDate($dateArr)
|
|
|
->filterAdmin($this->admin('id'))
|
|
|
->group('order_goods.goods_id')
|
|
@@ -97,6 +97,12 @@ class MyTeam extends Backend
|
|
|
->field('count(order_goods.order_id) as num,order_info.goods_name as name')
|
|
|
->order('num','desc')
|
|
|
->paginate($limit);
|
|
|
+ }else{
|
|
|
+ $list=Orders::filterDate($dateArr)
|
|
|
+ ->where('admin_id',$this->admin('id'))
|
|
|
+ ->field('amount_pay as num,order_no as name')
|
|
|
+ ->order('amount_pay','desc')
|
|
|
+ ->paginate($limit);
|
|
|
}
|
|
|
$all=0;
|
|
|
foreach ($list as $k=>&$item){
|