推送套餐 有效截至时间为 23点

Laravel/app/Services/ComboItemGroupService.php

@@ -2,6 +2,7 @@
 namespace App\Services;
 
 use App\Http\Controllers\API\PEISApiController;
+use Carbon\Carbon;
 use Illuminate\Support\Facades\DB;
 
 class ComboItemGroupService
@@ -90,6 +91,19 @@ class ComboItemGroupService
             $beizhu=json_decode($combo['备注'], JSON_UNESCAPED_UNICODE);
             $crowd_name=isset($beizhu['适用人群'])?$beizhu['适用人群']:'';
           }
+          $youxiaoEndTime=$combo['有效截止日期'];
+          try {
+            $EndTime = Carbon::parse($combo['有效截止日期']);
+
+            // 判断是否是当天的开始时间（00:00:00）
+            if ($EndTime->isStartOfDay()) { // Carbon 提供的方法
+              $EndTime = $EndTime->endOfDay()->format('Y-m-d H:i:s');
+            } else {
+              $EndTime = $EndTime->format('Y-m-d H:i:s');
+            }
+          } catch (\Exception $e) {
+            $youxiaoEndTime = $EndTime; // 解析失败则保持原样
+          }
           $comboData = [
             'combo_id' => $combo['Id'],
             'sex' => $sex,
@@ -106,7 +120,7 @@ class ComboItemGroupService
             'keyue_start_time' => $combo['可约开始时间'],
             'keyue_end_time' => $combo['可约截止时间'],
             'youxiao_start_time' => $combo['有效开始日期'],
-            'youxiao_end_time' => $combo['有效截止日期'],
+            'youxiao_end_time' => $youxiaoEndTime,
             'status' => 1,
             'updated_at' => date('Y-m-d H:i:s'),
           ];