From 3745015592287f1b50de8f90f687d7186e84d5cd Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Fri, 2 Aug 2024 17:44:00 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E6=A0=B9=E6=8D=AE?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E7=AD=9B=E9=80=89=E8=AE=A2=E5=8D=95=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../StoreOrderCartInfoGroupLists.php          | 30 +++++++++++++++----
 1 file changed, 25 insertions(+), 5 deletions(-)

diff --git a/app/admin/lists/store_order_cart_info/StoreOrderCartInfoGroupLists.php b/app/admin/lists/store_order_cart_info/StoreOrderCartInfoGroupLists.php
index a5847e3a..49a9d270 100644
--- a/app/admin/lists/store_order_cart_info/StoreOrderCartInfoGroupLists.php
+++ b/app/admin/lists/store_order_cart_info/StoreOrderCartInfoGroupLists.php
@@ -49,18 +49,38 @@ class StoreOrderCartInfoGroupLists extends BaseAdminDataLists implements ListsSe
      */
     public function lists(): array
     {
-        $order_arr=StoreOrder::whereDay('create_time')->where(['paid'=>1,'refund_status'=>0])->column('id');
+        if($this->request->get('start_time')){
+            $arr[]=['paid','=',1];
+            $arr[]=['refund_status','=',0];
+            if($this->request->get('store_id')){
+                $this->searchWhere[]=['store_id','=',$this->request->get('store_id')];
+            }
+            $order_arr=StoreOrder::where($this->searchWhere)->where($arr)->column('id');
+        }elseif($this->request->get('store_id')){
+            $arr[]=['paid','=',1];
+            $arr[]=['refund_status','=',0];
+            $this->searchWhere[]=['store_id','=',$this->request->get('store_id')];
+            $order_arr=StoreOrder::where($this->searchWhere)->where($arr)->column('id');
+        }else{
+            $order_arr=StoreOrder::whereDay('create_time')->where(['paid'=>1,'refund_status'=>0])->column('id');
+        }
         if(!$order_arr){
             return [];
         }
         $this->order_arr=$order_arr;
         $this->searchWhere[]=['oid','in',$order_arr];
         if($this->request->get('is_all')){
-            return StoreOrderCartInfo::where($this->searchWhere)
-            ->field('store_id,product_id,price,total_price,cart_num')
-            ->order('store_id desc')
+            $query= StoreOrderCartInfo::where($this->searchWhere);
+            if($this->request->get('store_id')){
+                $query->field('store_id,product_id,price,SUM(total_price) as total_price,SUM(cart_num) as cart_num')->group('product_id');
+            }else{
+                $query->field('store_id,product_id,price,total_price,cart_num');
+            }
+
+            return $query->order('store_id desc')
             ->limit($this->limitOffset, $this->limitLength)
-            ->select()->each(function ($item) {
+            ->select()
+            ->each(function ($item) {
                 $find=StoreProduct::where('id',$item['product_id'])->field('image,unit,cate_id,store_name,store_info')->find();
                 $item['system_store']=SystemStore::where('id',$item['store_id'])->value('name');
                 if($find){