liutk
/
old-hotel-new
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

调整续住费用计算兼容

develop
vine_liutk 2023-06-26 13:00:02 +08:00
parent 9be3b31eb2
commit f79a1ee60a
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/Admin/Controllers/OldmenController.php
View File

@ -342,12 +342,12 @@ class OldmenController extends AdminController
$type = $request->input('type', 'live_fee'); $type = $request->input('type', 'live_fee');
$dateRange = $request->input('live_in_date', null); $dateRange = $request->input('live_in_date', null);
//处理续住时间传递 //处理续住时间传递
$startDay = $dateRange ? explode(',', $dateRange)[0].' 00:00:00' : $request->input('start_at', null); $startDay = $dateRange ? explode(',', $dateRange)[0] : $request->input('start_at', null);
$endDay = $dateRange ? explode(',', $dateRange)[1].' 23:59:59' : $request->input('end_at', null); $endDay = $dateRange ? explode(',', $dateRange)[1] : $request->input('end_at', null);
if($startDay && $endDay){ if($startDay && $endDay){
$startDay = Carbon::parse($startDay); $startDay = Carbon::parse($startDay.' 00:00:00');
$endDay = Carbon::parse($endDay)->addSecond(1); $endDay = Carbon::parse($endDay.' 23:59:59')->addSecond(1);
$diffYears = $startDay->diffInYears($endDay); $diffYears = $startDay->diffInYears($endDay);
$diffMonths = $startDay->addYears($diffYears)->diffInMonths($endDay); $diffMonths = $startDay->addYears($diffYears)->diffInMonths($endDay);
$diffAbMonths = $startDay->diffInMonths($endDay); $diffAbMonths = $startDay->diffInMonths($endDay);
@ -364,11 +364,11 @@ class OldmenController extends AdminController
$_feeValue = 0; $_feeValue = 0;
if(isset($feeKeyHelp[$fee->key])){ if(isset($feeKeyHelp[$fee->key])){
$_feeValues = []; $_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){ array_map(function($item) use(&$_feeValues){
$_feeValues[$item['lv']][$item['time_type']] = $item['fee']; $_feeValues[$item['lv']][$item['time_type']] = $item['fee'];
}, $feeKeyHelp[$fee->key]['values']); }, $feeKeyHelp[$fee->key]['values']);
if(isset($_feeValues[$lv]['day'])){ if(isset($_feeValues[$lv]['day'])){
//判断是否有设置年份 //判断是否有设置年份