From 13c06c9b372bcfcb1f0f31d2e14825a08560b251 Mon Sep 17 00:00:00 2001
From: Hankin <hankin_h@126.com>
Date: Fri, 10 Jul 2026 15:43:13 +0800
Subject: [PATCH] send im msg

---
 app/Console/Kernel.php                       | 2 +-
 app/Http/Controllers/App/OrderController.php | 4 +++-
 app/Services/FatService.php                  | 4 ++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php
index 2f2e0a7..96c9ed3 100644
--- a/app/Console/Kernel.php
+++ b/app/Console/Kernel.php
@@ -80,7 +80,7 @@ class Kernel extends ConsoleKernel
                 $schedule->command("check:regular_activity")->everyMinute();
 
                 //app网易云信消息通知
-                $schedule->command('send:im:msg', [1])->dailyAt("18:00");
+                $schedule->command('send:im:msg', [1])->dailyAt("17:30");
                 $schedule->command('send:im:msg', [2])->dailyAt("10:00");
                 $schedule->command('send:im:msg', [3])->everyThirtyMinutes();
 
diff --git a/app/Http/Controllers/App/OrderController.php b/app/Http/Controllers/App/OrderController.php
index eb7359c..ecef94e 100644
--- a/app/Http/Controllers/App/OrderController.php
+++ b/app/Http/Controllers/App/OrderController.php
@@ -109,7 +109,9 @@ class OrderController extends Controller
     {
         $orders = Order::with('service:id,title,pic,subtitle')->where('user_id', auth()->id())->where('pay_status', 'PAID')->orderByDesc('id')->simplePaginate();
         foreach ($orders as $order) {
-            $order->service->title = $order->desc;
+            if ($order->service) {
+                $order->service->title = $order->desc;
+            }
         }
 
         return $this->success('OK', $orders);
diff --git a/app/Services/FatService.php b/app/Services/FatService.php
index f91cd5c..4acc126 100644
--- a/app/Services/FatService.php
+++ b/app/Services/FatService.php
@@ -887,7 +887,7 @@ class FatService
             if ($user->sex == 1) {
                 if ($da['score'] <= 16) {
                     $desc_key = 'Protein.1002';
-                } elseif ($da['score'] >= 16 && $da['score'] <= 18) {
+                } elseif ($da['score'] > 16 && $da['score'] <= 18) {
                     $desc_key = 'Protein.1003';
                 } elseif ($da['score'] > 18) {
                     $desc_key = 'Protein.1004';
@@ -895,7 +895,7 @@ class FatService
             } elseif ($user->sex == 2) {
                 if ($da['score'] <= 14) {
                     $desc_key = 'Protein.1002';
-                } elseif ($da['score'] >= 14 && $da['score'] <= 16) {
+                } elseif ($da['score'] > 14 && $da['score'] <= 16) {
                     $desc_key = 'Protein.1003';
                 } elseif ($da['score'] > 16) {
                     $desc_key = 'Protein.1004';