From 0bed9313b9e1280daa8870efcbdc6c1f531ca493 Mon Sep 17 00:00:00 2001
From: ASUS <515617283@qq.com>
Date: Tue, 23 Dec 2025 17:01:23 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BD=AC=E6=A1=8C=E9=99=90=E6=97=B6=E6=8A=98?=
 =?UTF-8?q?=E6=89=A3=E7=9B=B8=E5=85=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 extend/workermans/model/Base.php | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/extend/workermans/model/Base.php b/extend/workermans/model/Base.php
index 06185e3..1f2a05f 100644
--- a/extend/workermans/model/Base.php
+++ b/extend/workermans/model/Base.php
@@ -924,15 +924,21 @@ class Base
     // 获取限时折扣
     public function getTimeInfo($message)
     {
-        $redis_str = Base::get_shopping_time_str($message['shop_id'], $message['table_code']) . ':time_discount';
-        $time_dis_info = Redis::get($redis_str);
-        if($time_dis_info) {
-            $time_dis_info = json_decode($time_dis_info, true);
+
+        return !is_array($message['time_dis_info'])?json_decode($message['time_dis_info'], true):$message['time_dis_info'];
+        if(empty($message['time_dis_info'])) {
+            $time_dis_info = null;
         }else {
-            if(!empty($message['time_dis_info'])) {
-                $time_dis_info = !is_array($message['time_dis_info'])?json_decode($message['time_dis_info'], true):$message['time_dis_info'];
+            $redis_str = Base::get_shopping_time_str($message['shop_id'], $message['table_code']) . ':time_discount';
+            $time_dis_info = Redis::get($redis_str);
+            if($time_dis_info) {
+                $time_dis_info = json_decode($time_dis_info, true);
             }else {
-                $time_dis_info = null;
+                if(!empty($message['time_dis_info'])) {
+                    $time_dis_info = !is_array($message['time_dis_info'])?json_decode($message['time_dis_info'], true):$message['time_dis_info'];
+                }else {
+                    $time_dis_info = null;
+                }
             }
         }
         return $time_dis_info;