From ad9f0af8b590c7df764bdbaeff60746d834aed00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E4=B8=96=E7=95=8C?= <642747453@qq.com> Date: Tue, 23 Aug 2022 17:49:18 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20#10000=20=E6=97=A5=E5=BF=97=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Exports/GoodsSkusExport.php | 4 ++-- app/Http/Controllers/Goods/GoodsSkusController.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/Exports/GoodsSkusExport.php b/app/Exports/GoodsSkusExport.php index d9316a8..e3a4703 100644 --- a/app/Exports/GoodsSkusExport.php +++ b/app/Exports/GoodsSkusExport.php @@ -40,10 +40,10 @@ class GoodsSkusExport implements FromCollection, ShouldAutoSize '库存', ]; $inventoryTime = strtotime(date('Y-m-d 07:00:00')); - $ids = Log::query()->where('target_type', 'sku') + $ids = Log::query()->where('target_type', 'goods_sku') ->where('target_field', $this->type) ->where('created_at', '>', $inventoryTime) - ->pluck('sku_id') + ->pluck('target_id') ->toArray(); $data = GoodsSku::query() ->when($ids, function ($query, $ids) { diff --git a/app/Http/Controllers/Goods/GoodsSkusController.php b/app/Http/Controllers/Goods/GoodsSkusController.php index c1d47a5..5634b7e 100644 --- a/app/Http/Controllers/Goods/GoodsSkusController.php +++ b/app/Http/Controllers/Goods/GoodsSkusController.php @@ -42,10 +42,10 @@ class GoodsSkusController extends Controller // 状态变更时间查询,日志 $ids = []; if ($request->get('keyword_type', '') && $request->get('keyword_value', '')) { - $ids = Log::query()->where('target_type', 'sku') + $ids = Log::query()->where('target_type', 'goods_sku') ->where('target_field', $request->keyword_type) ->whereBetween('created_at', explode(' - ', $request->keyword_value)) - ->pluck('sku_id') + ->pluck('target_id') ->toArray(); } $day = DateTimeUtils::getToday();