虚拟和没有删除的库存

app-ghs/controllers/ConsoleController.php

@@ -33,11 +33,13 @@ class ConsoleController extends BaseController
         $totalCost = 0;
         if (!empty($itemList)) {
             foreach ($itemList as $item) {
-                $stock = $item->stock ?? 0;
-                $cost = $item->cost ?? 0;
-                $totalItemNum = bcadd($stock, $totalItemNum, 2);
-                $currentCost = bcmul($stock, $cost, 2);
-                $totalCost = bcadd($currentCost, $totalCost, 2);
+                if ($item->virtualStock == 0 && $item->delStatus == 0) {
+                    $stock = $item->stock ?? 0;
+                    $cost = $item->cost ?? 0;
+                    $totalItemNum = bcadd($stock, $totalItemNum, 2);
+                    $currentCost = bcmul($stock, $cost, 2);
+                    $totalCost = bcadd($currentCost, $totalCost, 2);
+                }
             }
         }
         $totalItemNum = floor($totalItemNum);
@@ -47,8 +49,8 @@ class ConsoleController extends BaseController
         $totalVisit = $main->totalVisit ?? 0;
         $totalOrder = $main->finishOrder ?? 0;
         $overview = [
-            ['name' => "库存(扎)", "url" => '/admin/stat/stock', 'value' => $totalItemNum, 'type' => 1],
-            ['name' => "库存(元)", "url" => '/admin/stat/stock', 'value' => $totalCost, 'type' => 1],
+            ['name' => "库存数", "url" => '/admin/stat/stock', 'value' => $totalItemNum, 'type' => 1],
+            ['name' => "库存值", "url" => '/admin/stat/stock', 'value' => $totalCost, 'type' => 1],
             ['name' => "总赊账", "url" => '/admin/shop/debtChange', 'value' => $totalDebt, 'type' => 1],
             ['name' => "总客户", "url" => '/admin/home/member', 'value' => $totalCustom, 'type' => 4],
             ['name' => "总访客", "url" => '/admin/home/member', 'value' => $totalVisit, 'type' => 4],