From f79a1ee60ad1c53cb9973d64590ce575ee694e8d Mon Sep 17 00:00:00 2001 From: vine_liutk <961510893@qq.com> Date: Mon, 26 Jun 2023 13:00:02 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=BB=AD=E4=BD=8F=E8=B4=B9?= =?UTF-8?q?=E7=94=A8=E8=AE=A1=E7=AE=97=E5=85=BC=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Admin/Controllers/OldmenController.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/app/Admin/Controllers/OldmenController.php b/app/Admin/Controllers/OldmenController.php index 715d13f..1b3fc95 100644 --- a/app/Admin/Controllers/OldmenController.php +++ b/app/Admin/Controllers/OldmenController.php @@ -342,12 +342,12 @@ class OldmenController extends AdminController $type = $request->input('type', 'live_fee'); $dateRange = $request->input('live_in_date', null); //处理续住时间传递 - $startDay = $dateRange ? explode(',', $dateRange)[0].' 00:00:00' : $request->input('start_at', null); - $endDay = $dateRange ? explode(',', $dateRange)[1].' 23:59:59' : $request->input('end_at', null); - + $startDay = $dateRange ? explode(',', $dateRange)[0] : $request->input('start_at', null); + $endDay = $dateRange ? explode(',', $dateRange)[1] : $request->input('end_at', null); + if($startDay && $endDay){ - $startDay = Carbon::parse($startDay); - $endDay = Carbon::parse($endDay)->addSecond(1); + $startDay = Carbon::parse($startDay.' 00:00:00'); + $endDay = Carbon::parse($endDay.' 23:59:59')->addSecond(1); $diffYears = $startDay->diffInYears($endDay); $diffMonths = $startDay->addYears($diffYears)->diffInMonths($endDay); $diffAbMonths = $startDay->diffInMonths($endDay); @@ -364,11 +364,11 @@ class OldmenController extends AdminController $_feeValue = 0; if(isset($feeKeyHelp[$fee->key])){ $_feeValues = []; - if($feeKeyHelp[$fee->key]['has_time'] == 2 && !empty($dateRange)){ + + if($feeKeyHelp[$fee->key]['has_time'] == 2 && !empty($startDay) && !empty($endDay)){ array_map(function($item) use(&$_feeValues){ $_feeValues[$item['lv']][$item['time_type']] = $item['fee']; }, $feeKeyHelp[$fee->key]['values']); - if(isset($_feeValues[$lv]['day'])){ //判断是否有设置年份