From 1f95c441aad8c24cf8df3f68449da8a18442aeaf Mon Sep 17 00:00:00 2001
From: liangyuyan <1103300295@qq.com>
Date: Mon, 16 Nov 2020 10:11:31 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E5=95=86=E5=93=81--=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA=E5=8A=9F=E8=83=BD=E8=81=94=E8=A1=A8=E5=8C=BA=E5=88=86?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Admin/Actions/Exporter/GoodsActivitySales.php | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/app/Admin/Actions/Exporter/GoodsActivitySales.php b/app/Admin/Actions/Exporter/GoodsActivitySales.php
index af96289..d252c36 100644
--- a/app/Admin/Actions/Exporter/GoodsActivitySales.php
+++ b/app/Admin/Actions/Exporter/GoodsActivitySales.php
@@ -7,6 +7,10 @@ use Maatwebsite\Excel\Concerns\WithStrictNullComparison;
 use App\Admin\Repositories\v3\GoodsActivityReport;
 use App\Models\v3\Market as MarketModel;
 use App\Models\v3\Store as StoreModel;
+use App\Models\ImsCjdcOrderMain as OrderMainModel;
+use App\Models\ImsCjdcOrder as OrderModel;
+use App\Models\LanzuOrderGoods as OrderGoodsModel;
+use App\Models\v3\GoodsActivity as GoodsActivityModel;
 
 class GoodsActivitySales implements FromArray, WithStrictNullComparison
 {
@@ -24,7 +28,7 @@ class GoodsActivitySales implements FromArray, WithStrictNullComparison
             '市场',
             '店铺',
             '售价(元)',
-            '原价(元)',
+            '采购价(元)',
             '下单时间',
             '销量(单)',
             '补贴(元)',
@@ -40,7 +44,7 @@ class GoodsActivitySales implements FromArray, WithStrictNullComparison
                 $markets[$value['market_id']]??'',
                 $stores[$value['store_id']]??'',
                 $value['price']??0,
-                $value['original_price']??0,
+                $value['purchase_price']??0,
                 date('Y-m-d H:i:s',$createdAt),
                 $value['total']??0,
                 $value['subsidy_total']??0
@@ -58,7 +62,7 @@ class GoodsActivitySales implements FromArray, WithStrictNullComparison
     {
         $params = $option;
         $repository = new GoodsActivityReport();
-        $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';
+        $selects = OrderGoodsModel::$tableName.'.number as total,('.GoodsActivityModel::TABLE_NAME.'.purchase_price-'.GoodsActivityModel::TABLE_NAME.'.price)*'.OrderGoodsModel::$tableName.'.number as subsidy_total,'.GoodsActivityModel::TABLE_NAME.'.price,'.GoodsActivityModel::TABLE_NAME.'.purchase_price,'.OrderGoodsModel::$tableName.'.goods_id,'.OrderGoodsModel::$tableName.'.name,'.OrderGoodsModel::$tableName.'.cover_img,'.OrderGoodsModel::$tableName.'.created_at,'.OrderMainModel::$tableName.'.market_id,'.OrderModel::$tableName.'.store_id';
         $orderGoodsActivity = $repository->getDataModel($selects,$params);
         $list = $orderGoodsActivity->orderBy('total','desc')->get()->toArray();