pc

application/admin/controller/seller/MyTeam.php

@@ -92,11 +92,10 @@ class MyTeam extends Backend
             }else{
                 $list=OrderGoods::filterDate($dateArr)
                     ->filterAdmin($this->admin('id'))
-                    ->group('goods_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_id) as num,order_info.goods_name as name')
+                    ->field('count(order_goods.order_id) as num,order_info.goods_name as name')
                     ->order('num','desc')
-                    ->group('order_goods.goods_id')
                     ->paginate(1000000);
             }
             $all=0;

application/admin/model/OrderInfo.php

@@ -17,7 +17,7 @@ class OrderInfo extends \app\common\model\OrderInfo
     }
     public function scopeFilterAdmin(Query $query,$admin_id){
         $query->whereExists(
-            Orders::whereRaw("orders.id=order_info.order_id and orders.admin_id=$admin_id")
+            Orders::whereRaw("orders.id=order_info.order_id and orders.admin_id=$admin_id")->buildSql()
         );
     }
 }

application/common/model/OrderGoods.php

@@ -24,7 +24,7 @@ class OrderGoods extends Model
     public function scopeFilterAdmin(Query $query,$admin_id){
         $table=$this->getTable();
         $query->whereExists(
-            Orders::whereRaw("orders.id={$table}.order_id and orders.admin_id=$admin_id")
+            Orders::whereRaw("orders.id={$table}.order_id and orders.admin_id=$admin_id")->buildSql()
         );
     }
 }

thinkphp/library/think/Model.php

@@ -2364,7 +2364,7 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
                 $date[0]=strtotime($date[0]);
                 $date[1]=strtotime($date[1]);
             }
-            $query->whereBetween($column,$date);
+            $query->whereBetween($this->getTable().'.'.$column,$date);
         }
     }
 }