xieruidong 2 years ago
parent
commit
f954c27209

+ 13 - 7
application/admin/controller/seller/MyTeam.php

@@ -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){

+ 6 - 0
application/admin/view/seller/my_team/order_num_amount_rank.html

@@ -34,6 +34,7 @@
                 <li class="active"><a href="#one" data-toggle="tab"><i class="fa fa-magic"></i> 用户订单量排名</a></li>
                 <li><a href="#two" data-toggle="tab"><i class="fa fa-search"></i> 用户总金额排名</a></li>
                 <li><a href="#three" data-toggle="tab"><i class="fa fa-search"></i> 单品订单数量排名</a></li>
+                <li><a href="#three" data-toggle="tab"><i class="fa fa-search"></i> 单品订单金额排名</a></li>
             </ul>
         </div>
         <div class="panel-body">
@@ -53,6 +54,11 @@
                         <table id="table2" class="table table-striped table-bordered table-hover table-nowrap" width="100%"></table>
                     </div>
                 </div>
+                <div class="tab-pane fade in" id="four">
+                    <div class="widget-body no-padding">
+                        <table id="table3" class="table table-striped table-bordered table-hover table-nowrap" width="100%"></table>
+                    </div>
+                </div>
             </div>
         </div>
     </div>

+ 18 - 0
public/assets/js/backend/seller/my_team.js

@@ -123,6 +123,7 @@ define(['jquery', 'bootstrap', 'backend', 'addtabs', 'table', 'echarts', 'echart
             var table = $("#table");
             var table1 = $("#table1");
             var table2 = $("#table2");
+            var table3 = $("#table3");
             // 初始化表格
             table.bootstrapTable({
                 url: location.href+'&type=1',
@@ -243,9 +244,26 @@ define(['jquery', 'bootstrap', 'backend', 'addtabs', 'table', 'echarts', 'echart
                     ]
                 ]
             });
+            table3.bootstrapTable({
+                url: location.href+'&type=4',
+                pk: 'id',
+                sortName: 'id',
+                searchFormVisible: false,
+                showExport: true,
+                commonSearch: false,
+                search: false,
+                columns: [
+                    [
+                        {field: 'rank', title: __('排名'), operate: false,},
+                        {field: 'name', title: __('订单号'), operate: false,},
+                        {field: 'num', title: __('金额'), operate: false,},
+                    ]
+                ]
+            });
             Table.api.bindevent(table);
             Table.api.bindevent(table1);
             Table.api.bindevent(table2);
+            Table.api.bindevent(table3);
         }
     };
 });