diff --git a/extend/workermans/model/Cashier.php b/extend/workermans/model/Cashier.php index 1012a99..e347865 100644 --- a/extend/workermans/model/Cashier.php +++ b/extend/workermans/model/Cashier.php @@ -54,7 +54,14 @@ class Cashier extends Base `table_code`='{$message['table_code']}' "); } - + // 限时折扣 + $redis_str = Base::get_shopping_save_uid($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; + } $snd_data = [ 'msg' => '收银机初始化', 'type' => 'cashier', @@ -63,7 +70,8 @@ class Cashier extends Base 'status' => 1, 'msg_id' => $rand, 'table_code' => $message['table_code'], - 'data' => $car + 'data' => $car, + 'time_dis_info' => $time_dis_info, ]; self::gateway_query('sendToClient', [$client_id, json_encode($snd_data)]); diff --git a/extend/workermans/model/Manage.php b/extend/workermans/model/Manage.php index 0a4cee4..c6600b5 100644 --- a/extend/workermans/model/Manage.php +++ b/extend/workermans/model/Manage.php @@ -4,6 +4,7 @@ namespace extend\workermans\model; use ba\Exception; use ba\Random; +use support\Redis; use support\think\Db; use GatewayWorker\Lib\Gateway; use think\facade\Log; @@ -42,13 +43,21 @@ class Manage extends Base `table_code`= '{$message['table_code']}' "); } - + // 限时折扣 + $redis_str = Base::get_shopping_save_uid($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; + } $snd_data = [ 'msg' => '管理端代客下单初始化', 'operate_type' => 'manage_init', 'msg_id' => $rand, 'table_code' => $message['table_code'], - 'data' => $car + 'data' => $car, + 'time_dis_info' => $time_dis_info, ]; self::gateway_query('sendToClient', [$client_id, json_encode($snd_data)]); break; diff --git a/extend/workermans/model/Onboc.php b/extend/workermans/model/Onboc.php index 7626829..16c7e19 100644 --- a/extend/workermans/model/Onboc.php +++ b/extend/workermans/model/Onboc.php @@ -4,6 +4,7 @@ namespace extend\workermans\model; use ba\Exception; use ba\Random; +use support\Redis; use support\think\Db; use GatewayWorker\Lib\Gateway; use support\Log; @@ -43,12 +44,21 @@ class Onboc extends Base `table_code`= '{$message['table_code']}' "); } + // 限时折扣 + $redis_str = Base::get_shopping_save_uid($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; + } $snd_data = [ 'msg' => '代客下单初始化', 'operate_type' => 'onboc_init', 'msg_id' => $rand, 'table_code' => $message['table_code'], - 'data' => $car + 'data' => $car, + 'time_dis_info' => $time_dis_info, ]; self::gateway_query('sendToClient', [$client_id, json_encode($snd_data)]); break; diff --git a/extend/workermans/model/Pad.php b/extend/workermans/model/Pad.php index 55ad2b7..236df94 100644 --- a/extend/workermans/model/Pad.php +++ b/extend/workermans/model/Pad.php @@ -4,6 +4,7 @@ namespace extend\workermans\model; use ba\Exception; use ba\Random; +use support\Redis; Use support\think\Db; use support\Log; @@ -47,7 +48,14 @@ class Pad extends Base `table_code`='{$message['table_code']}' "); } - + // 限时折扣 + $redis_str = Base::get_shopping_save_uid($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; + } $snd_data = [ 'msg' => 'pad初始化', 'type' => 'pad', @@ -56,7 +64,8 @@ class Pad extends Base 'status' => 1, 'msg_id' => $rand, 'table_code' => $message['table_code'], - 'data' => $car + 'data' => $car, + 'time_dis_info' => $time_dis_info, ]; self::gateway_query('sendToClient', [$client_id, json_encode($snd_data)]); break; diff --git a/extend/workermans/model/Shopping.php b/extend/workermans/model/Shopping.php index 4763393..da1fd0f 100644 --- a/extend/workermans/model/Shopping.php +++ b/extend/workermans/model/Shopping.php @@ -4,6 +4,7 @@ namespace extend\workermans\model; use Exception; use ba\Random; +use support\Redis; use support\think\Db; use GatewayWorker\Lib\Gateway; use support\Log; @@ -65,13 +66,22 @@ class Shopping extends Base `shop_id`={$message['shop_id']} AND `table_code`='{$message['table_code']}' "); + // 限时折扣 + $redis_str = Base::get_shopping_save_uid($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; + } $snd_data = [ 'msg' => '购物车初始化', 'operate_type' => 'init', 'msg_id' => $rand, 'type' => 'shopping', 'table_code' => $message['table_code'], - 'data' => $car + 'data' => $car, + 'time_dis_info' => $time_dis_info, ]; self::gateway_query('sendToClient', [$client_id, json_encode($snd_data)]); break;