|
|
@@ -62,10 +62,12 @@ class StatController extends BaseController
|
|
|
if (isset($arr[$time])) {
|
|
|
$arr[$time]['num'] = bcadd($arr[$time]['num'], $bigNum);
|
|
|
$arr[$time]['cost'] = bcadd($arr[$time]['cost'], $cost, 2);
|
|
|
+ $arr[$time]['price'] = bcadd($arr[$time]['price'], $price, 2);
|
|
|
$arr[$time]['time'] = $date;
|
|
|
} else {
|
|
|
$arr[$time]['num'] = $bigNum;
|
|
|
$arr[$time]['cost'] = $cost;
|
|
|
+ $arr[$time]['price'] = $price;
|
|
|
$arr[$time]['time'] = $date;
|
|
|
}
|
|
|
$totalNum = bcadd($totalNum, $bigNum);
|
|
|
@@ -74,7 +76,7 @@ class StatController extends BaseController
|
|
|
}
|
|
|
}
|
|
|
$totalCost = floatval($totalCost);
|
|
|
- util::success(['list' => $arr, 'totalNum' => $totalNum, 'totalCost' => $totalCost]);
|
|
|
+ util::success(['list' => $arr, 'totalNum' => $totalNum, 'totalCost' => $totalCost, 'totalPrice' => $totalPrice]);
|
|
|
}
|
|
|
|
|
|
//损耗花材
|