From e5d02d8eb93771b600035debd3bc3c6d29056775 Mon Sep 17 00:00:00 2001
From: ASUS <515617283@qq.com>
Date: Mon, 20 Apr 2026 17:13:37 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=B6=E4=BB=96=E8=AE=A2=E5=8D=95=E6=89=93?=
 =?UTF-8?q?=E5=8D=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 scripts/rabborderprint.php | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/scripts/rabborderprint.php b/scripts/rabborderprint.php
index 10b3d8b..94052db 100644
--- a/scripts/rabborderprint.php
+++ b/scripts/rabborderprint.php
@@ -41,19 +41,20 @@ try {
         $date_time = date('Y-m-d H:i:s');
         $data = $msg->body;
         Log::info('MQ收到消息[订单打印]--->' . $data .  '--->' . $date_time . "\n");
+        $order = json_decode($data, true);
         // 如果是数字。则打印订单
         $is_log = false;
         $curl_error = '';
-        $order_id_t = strpos($data, '_');
-        if($order_id_t !== false) {
-            $order_id = substr($data, 0, $order_id_t);
-        }else {
-            $order_id = $data;
-        }
-        $order = Db::table('tb_order_info')->where(['id' => $order_id])->find();
-        if($order) {
+//        $order_id_t = strpos($data, '_');
+//        if($order_id_t !== false) {
+//            $order_id = substr($data, 0, $order_id_t);
+//        }else {
+//            $order_id = $data;
+//        }
+//        $order = Db::table('tb_order_info')->where(['id' => $order_id])->find();
+//        if($order) {
             $rand = 'cashier_order' . Random::build();
-            $send_id = 'cashier_'. $order['shop_id'];
+            $send_id = 'cashier_'. $order['shopId'];
             // 收银机打印订单
             $snd_data = [
                 'msg' => '收银机订单打印',
@@ -96,10 +97,10 @@ try {
 //            }
 //            curl_close($ch);
 //            Log::info('内部通讯结果(订单打印)--->' . $output . '通讯ID--->cashier_' .$order['shop_id']. '---' . date('Y-m-d H:i:s') . "\n");
-        }else {
-            $curl_error = 'order Data is empty';
-            $is_log = true;
-        }
+//        }else {
+//            $curl_error = 'order Data is empty';
+//            $is_log = true;
+//        }
         if($is_log) {
             Db::table('tb_mq_log')->insert([
                 'queue' => $queue,