From 9758171b397d62e14aa4f0374e99e5b6127de2fd Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Sun, 1 Sep 2024 16:58:21 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=9B=B4=E6=96=B0=E4=BB=93=E5=BA=93?= =?UTF-8?q?=E9=80=BB=E8=BE=91=E4=BB=A5=E8=AE=A1=E7=AE=97=E5=95=86=E5=93=81?= =?UTF-8?q?=E5=92=8C=E9=97=A8=E5=BA=97=E7=9A=84=E6=80=BB=E5=BA=93=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/logic/statistic/WarehouseLogic.php | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/app/admin/logic/statistic/WarehouseLogic.php b/app/admin/logic/statistic/WarehouseLogic.php index e5051445..1f34fc83 100644 --- a/app/admin/logic/statistic/WarehouseLogic.php +++ b/app/admin/logic/statistic/WarehouseLogic.php @@ -48,12 +48,16 @@ class WarehouseLogic extends BaseLogic 'value' => [], 'type' => 1, ]; - $toreProduct = StoreProduct::where('stock', '>', 0)->field('sum(stock) as stock,sum(total_price) as total_price')->find(); + // $toreProduct = StoreProduct::where('stock', '>', 0)->field('sum(stock) as stock,sum(total_price) as total_price')->find(); + $warehouseProductStorege = WarehouseProductStorege::where('nums', '>', 0)->field('sum(nums) as nums,sum(total_price) as total_price')->find(); + + $storeBranchProduct = StoreBranchProduct::where('stock', '>', 0)->field('sum(stock) as stock,sum(total_price) as total_price')->find(); + $topData[] = [ 'title' => '总商品库存', 'desc' => '平台统计商品总库存、含门店仓库', - 'total_money' => $toreProduct['stock'], - 'cash_title' => $toreProduct['total_price'], + 'total_money' => bcadd($warehouseProductStorege['nums'],$storeBranchProduct['stock'],2), + 'cash_title' => bcadd($warehouseProductStorege['total_price'],$storeBranchProduct['total_price'],2), 'value' => [], 'type' => 1, ]; @@ -84,7 +88,6 @@ class WarehouseLogic extends BaseLogic 'value' => [], 'type' => 1, ]; - $storeBranchProduct = StoreBranchProduct::where('stock', '>', 0)->field('sum(stock) as stock,sum(total_price) as total_price')->find(); $topData[] = [ 'title' => '总门店库存', 'desc' => '平台统计门店库存',