From 04dc7091e29df814198fe4faf1dda851393a45cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=AD=E5=87=AF=E5=87=AF?= <tankaikai@aliyun.com>
Date: Tue, 26 Nov 2024 14:45:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=B4=E6=97=B6=E8=8F=9C=E5=B0=8F=E7=A5=A8?=
 =?UTF-8?q?=E6=89=93=E5=8D=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/cashierservice/entity/TbOrderDetail.java           | 2 +-
 .../system/cashierservice/rabbit/print/PrinterHandler.java    | 4 ++++
 src/main/resources/mapper/TbOrderDetailMapper.xml             | 3 ++-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbOrderDetail.java b/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbOrderDetail.java
index f88a117..4e909fa 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbOrderDetail.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbOrderDetail.java
@@ -51,5 +51,5 @@ public class TbOrderDetail implements Serializable {
 
     private static final long serialVersionUID = 1L;
     private Integer isMember;
-
+    private Integer isTemporary;
 }
diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/rabbit/print/PrinterHandler.java b/src/main/java/com/chaozhanggui/system/cashierservice/rabbit/print/PrinterHandler.java
index ee2c163..95dca90 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/rabbit/print/PrinterHandler.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/rabbit/print/PrinterHandler.java
@@ -134,6 +134,10 @@ public abstract class PrinterHandler {
             if (ObjectUtil.isNotEmpty(tbProductSkuWithBLOBs) && ObjectUtil.isNotEmpty(tbProductSkuWithBLOBs.getSpecSnap())) {
                 remark = tbProductSkuWithBLOBs.getSpecSnap();
             }
+            Integer isTemporary = ObjectUtil.defaultIfNull(it.getIsTemporary(), 0);
+            if(isTemporary == 1) {
+                it.setProductName("【临时菜】"+it.getProductName());
+            }
             OrderDetailPO.Detail detail = new OrderDetailPO.Detail(it.getProductName(), it.getNum().toString(), NumberUtil.mul(it.getNum(),it.getPrice()).toPlainString(), remark);
             detailList.add(detail);
 
diff --git a/src/main/resources/mapper/TbOrderDetailMapper.xml b/src/main/resources/mapper/TbOrderDetailMapper.xml
index ba0243e..1e59c72 100644
--- a/src/main/resources/mapper/TbOrderDetailMapper.xml
+++ b/src/main/resources/mapper/TbOrderDetailMapper.xml
@@ -18,10 +18,11 @@
         <result column="price" jdbcType="DECIMAL" property="price"/>
         <result column="price_amount" jdbcType="DECIMAL" property="priceAmount"/>
         <result column="pack_amount" jdbcType="DECIMAL" property="packAmount"/>
+        <result column="is_temporary" jdbcType="INTEGER" property="isTemporary"/>
     </resultMap>
     <sql id="Base_Column_List">
     id, order_id, shop_id, product_id, product_sku_id, num, product_name, product_sku_name, 
-    product_img, create_time, update_time, price, price_amount,status,pack_amount,return_num
+    product_img, create_time, update_time, price, price_amount,status,pack_amount,return_num,is_temporary
   </sql>
     <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
         select