diff --git a/Laravel/app/Services/ComboItemGroupService.php b/Laravel/app/Services/ComboItemGroupService.php index d218853..d055da6 100644 --- a/Laravel/app/Services/ComboItemGroupService.php +++ b/Laravel/app/Services/ComboItemGroupService.php @@ -92,18 +92,23 @@ class ComboItemGroupService $crowd_name=isset($beizhu['适用人群'])?$beizhu['适用人群']:''; } $youxiaoEndTime=$combo['有效截止日期']; - try { - $EndTime = Carbon::parse($combo['有效截止日期']); + if(!empty($combo['有效开始日期']) && empty($youxiaoEndTime)){ + $youxiaoEndTime='2099-12-31 23:59:59'; + }else{ + try { + $EndTime = Carbon::parse($combo['有效截止日期']); - // 判断是否是当天的开始时间(00:00:00) - if ($EndTime->isStartOfDay()) { // Carbon 提供的方法 - $youxiaoEndTime = $EndTime->endOfDay()->format('Y-m-d H:i:s'); - } else { - $youxiaoEndTime = $EndTime->format('Y-m-d H:i:s'); + // 判断是否是当天的开始时间(00:00:00) + if ($EndTime->isStartOfDay()) { // Carbon 提供的方法 + $youxiaoEndTime = $EndTime->endOfDay()->format('Y-m-d H:i:s'); + } else { + $youxiaoEndTime = $EndTime->format('Y-m-d H:i:s'); + } + } catch (\Exception $e) { + $youxiaoEndTime = $EndTime; // 解析失败则保持原样 } - } catch (\Exception $e) { - $youxiaoEndTime = $EndTime; // 解析失败则保持原样 } + $comboData = [ 'combo_id' => $combo['Id'], 'sex' => $sex,