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();