From 201be911278ba3e46e2142c05b0e486a930a4b8e Mon Sep 17 00:00:00 2001
From: ASUS <515617283@qq.com>
Date: Tue, 16 Dec 2025 16:50:43 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=86=8D=E6=9D=A5=E4=B8=80?=
 =?UTF-8?q?=E5=8D=95=E6=97=B6=E5=85=88=E5=88=A0=E9=99=A4=E4=B9=8B=E5=89=8D?=
 =?UTF-8?q?=E7=9A=84=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 extend/workermans/model/Shopping.php | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/extend/workermans/model/Shopping.php b/extend/workermans/model/Shopping.php
index 21e4ec4..17fe571 100644
--- a/extend/workermans/model/Shopping.php
+++ b/extend/workermans/model/Shopping.php
@@ -74,10 +74,15 @@ class Shopping extends Base
                 }
                 if(!empty($message['one_more_order'])) {
                     // 再来一单
-                    if(empty($message['order_id'])) {
-                        Gateway::sendToClient($client_id, json_encode(['msg' => 'order_id 必传']));
+                    if(empty($message['order_id']) || empty($message['user_id'])) {
+                        Gateway::sendToClient($client_id, json_encode(['msg' => 'order_id 或 user_id 必传']));
                         return;
                     }
+                    // 新增再来一单时先删除之前的数据
+                    Db::name('tb_cashier_cart')->where([
+                        'shop_id' => $message['shop_id'],
+                        'user_id' => $message['user_id'],
+                    ])->delete();
                     $order_arr = Db::name('tb_order_detail')->where(['order_id' => $message['order_id']])->select()->toArray();
                     foreach ($order_arr as $k => $order) {
                         self::add_data([
@@ -90,6 +95,7 @@ class Shopping extends Base
                             'sku_name' => $order['sku_name'],
                             'product_type' => $order['product_type'],
                             'is_print' => $order['is_print'],
+                            'user_id' => $message['user_id'],
                             'create_time' => d(),
                         ]);
                     }