From 0f9b73637d085eb3396fe969234b724e49ec3a1f Mon Sep 17 00:00:00 2001
From: ASUS <515617283@qq.com>
Date: Thu, 16 Apr 2026 15:49:52 +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/otherprint.php | 70 ++++++++++++++++++------------------------
 1 file changed, 30 insertions(+), 40 deletions(-)

diff --git a/scripts/otherprint.php b/scripts/otherprint.php
index 83849dd..2e6c390 100644
--- a/scripts/otherprint.php
+++ b/scripts/otherprint.php
@@ -42,48 +42,38 @@ try {
         // 如果是数字。则打印订单
         $is_log = false;
         $curl_error = '';
-        $order_id_t = strpos($data, '_');
-        if($order_id_t !== false) {
-            $order_id = substr($data, 0, $order_id_t);
+        $data = json_decode($data, true);
+        $rand = 'cashier_order' . Random::build();
+        $send_id = 'cashier_'. $data['shopId'];
+        // 收银机打印订单
+        $snd_data = [
+            'msg' => '收银机其他打印',
+            'type' => 'cashier',
+            'operate_type' => 'other_print',
+            'data_type' => 'other_print',
+            'status' => 1,
+            'method' => 'sendToUid',
+            'send_num' => 0,
+            'send_id' => $send_id,
+            'msg_id' => $rand,
+            'data' => $data
+        ];
+        $snd_data_json = json_encode($snd_data);
+        Gateway::$registerAddress = '127.0.0.1:1238';
+        $res = Gateway::sendToUid($send_id, $snd_data_json);
+        Log::info('订单打印推送结果-->' . $res);
+        $result = Redis::get($snd_data['send_id']);
+        if($result) {
+            $msg_id_arr = json_decode($result, true);
+            $msg_id_arr_c = count($msg_id_arr);
+            $msg_id_arr[$msg_id_arr_c] = $snd_data;
+            $result_n = json_encode($msg_id_arr);
+            Base::setredis_new($result_n, $snd_data['send_id']);
         }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'];
-            // 收银机打印订单
-            $snd_data = [
-                'msg' => '收银机其他订单打印',
-                'type' => 'cashier',
-                'operate_type' => 'other_print',
-                'data_type' => 'other_print',
-                'status' => 1,
-                'method' => 'sendToUid',
-                'send_num' => 0,
-                'send_id' => $send_id,
-                'msg_id' => $rand,
-                'data' => $data
-            ];
-            $snd_data_json = json_encode($snd_data);
-            Gateway::$registerAddress = '127.0.0.1:1238';
-            $res = Gateway::sendToUid($send_id, $snd_data_json);
-            Log::info('订单打印推送结果-->' . $res);
-            $result = Redis::get($snd_data['send_id']);
-            if($result) {
-                $msg_id_arr = json_decode($result, true);
-                $msg_id_arr_c = count($msg_id_arr);
-                $msg_id_arr[$msg_id_arr_c] = $snd_data;
-                $result_n = json_encode($msg_id_arr);
-                Base::setredis_new($result_n, $snd_data['send_id']);
-            }else {
-                $params_arr_n[] = $snd_data;
-                Base::setredis_new(json_encode($params_arr_n), $snd_data['send_id']);
-            }
-        }else {
-            $curl_error = 'order Data is empty';
-            $is_log = true;
+            $params_arr_n[] = $snd_data;
+            Base::setredis_new(json_encode($params_arr_n), $snd_data['send_id']);
         }
+
         if($is_log) {
             Db::table('tb_mq_log')->insert([
                 'queue' => $queue,