Merge branch 'goods_activity_1020'

app/Admin/Actions/Exporter/GoodsActivitySales.php

@@ -25,6 +25,7 @@ class GoodsActivitySales implements FromArray, WithStrictNullComparison
             '店铺',
             '售价(元)',
             '原价(元)',
+            '下单时间',
             '销量(单)',
             '补贴(元)',
         ]];
@@ -32,6 +33,7 @@ class GoodsActivitySales implements FromArray, WithStrictNullComparison
         $markets = MarketModel::getMarketArray();
         $stores = StoreModel::getStoreArray();
         foreach ($data as $value){
+            $createdAt = $value['created_at']??0;
             $item = [
                 $value['goods_id'],
                 $value['name']??'',
@@ -39,6 +41,7 @@ class GoodsActivitySales implements FromArray, WithStrictNullComparison
                 $stores[$value['store_id']]??'',
                 $value['price']??0,
                 $value['original_price']??0,
+                date('Y-m-d H:i:s',$createdAt),
                 $value['total']??0,
                 $value['subsidy_total']??0
             ];
@@ -55,9 +58,9 @@ class GoodsActivitySales implements FromArray, WithStrictNullComparison
     {
         $params = $option;
         $repository = new GoodsActivityReport();
-        $selects = 'SUM(number) as total,SUM((original_price-price)*number) as subsidy_total,price,original_price,lanzu_order_goods.goods_id,lanzu_order_goods.name,lanzu_order_goods.cover_img,lanzu_order_main.market_id,lanzu_order.store_id';
+        $selects = 'number as total,(original_price-price)*number as subsidy_total,price,original_price,lanzu_order_goods.goods_id,lanzu_order_goods.name,lanzu_order_goods.cover_img,lanzu_order_goods.created_at,lanzu_order_main.market_id,lanzu_order.store_id';
         $orderGoodsActivity = $repository->getDataModel($selects,$params);
-        $list = $orderGoodsActivity->orderBy('total','desc')->groupBy('goods_id','lanzu_order_goods.name','cover_img','market_id','store_id','price','original_price')->get()->toArray();
+        $list = $orderGoodsActivity->orderBy('total','desc')->get()->toArray();
         
         return $list;
     }