shish 2 лет назад
Родитель
Сommit
fbda198d1e
1 измененных файлов с 7 добавлено и 3 удалено
  1. 7 3
      app-hd/controllers/StatCgController.php

+ 7 - 3
app-hd/controllers/StatCgController.php

@@ -37,6 +37,8 @@ class StatCgController extends BaseController
         $ids = array_unique(array_filter($ids));
         $productInfo = ProductClass::getByIds($ids, null, 'id');
         $stat = [];
+        $totalNum = 0;
+        $totalAmount = 0;
         foreach ($list as $key => $val) {
             $productId = $val['productId'] ?? 0;
             $xhUnitType = $val['xhUnitType'] ?? 0;
@@ -48,9 +50,9 @@ class StatCgController extends BaseController
             } else {
                 $num = bcdiv($beforeNum, $ratio, 2);
             }
-
             $amount = bcmul($num, $xhUnitPrice, 2);
-
+            $totalNum = bcadd($totalNum, $num, 2);
+            $totalAmount = bcadd($totalAmount, $amount, 2);
             $name = $productInfo[$productId]['name'] ?? '';
             $py = $productInfo[$productId]['py'] ?? '';
             $stat[$productId]['productId'] = $productId;
@@ -68,7 +70,9 @@ class StatCgController extends BaseController
             }
         }
         $stat = arrayUtil::arraySort($stat, 'num');
-        util::success(['list' => $stat]);
+        $totalNum = floatval($totalNum);
+        $totalAmount = floatval($totalAmount);
+        util::success(['list' => $stat, 'totalNum' => $totalNum, 'totalAmount' => $totalAmount]);
     }
 
 }