diff --git a/app/Http/Controllers/Admin/OrderController.php b/app/Http/Controllers/Admin/OrderController.php index 46ed603..693efb0 100644 --- a/app/Http/Controllers/Admin/OrderController.php +++ b/app/Http/Controllers/Admin/OrderController.php @@ -851,7 +851,7 @@ class OrderController extends Controller return $this->failure("用户不存在"); $fatService = new FatService(); - $res = $fatService->getFatStat($name, $start_date, $end_date, $user); + $res = $fatService->getFatStat($name, $start_date, $end_date, $user, "斤"); if (!$res['status']) { return $this->failure($res['msg']); diff --git a/app/Services/FatService.php b/app/Services/FatService.php index 8c85648..f91cd5c 100644 --- a/app/Services/FatService.php +++ b/app/Services/FatService.php @@ -1150,7 +1150,7 @@ class FatService * @param $end_date * @return array */ - public function getFatStat($name, $start_date, $end_date, $user) + public function getFatStat($name, $start_date, $end_date, $user, $unit = "") { if ($start_date && $end_date) { // 将日期时间字符串转换为 Carbon 实例 @@ -1169,7 +1169,9 @@ class FatService } $user_id = $user->id; $type = $user->fat_device; - $unit = $user->unit; + if (empty($unit)) { + $unit = $user->unit; + } $language = $user->language; $x_arr = []; $y_arr = [];