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;