From be710b83794284116e857524970140a937583ed9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?=
 <8605635+zhang3064194730@user.noreply.gitee.com>
Date: Thu, 28 Nov 2024 14:27:15 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=A2=9E=E5=8A=A0=E9=9D=A2=E5=8E=A8?=
 =?UTF-8?q?=E6=89=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/cashierservice/entity/TbCashierCart.java            | 2 +-
 .../system/cashierservice/entity/TbOrderDetail.java            | 1 +
 .../chaozhanggui/system/cashierservice/entity/vo/CartVo.java   | 2 +-
 .../system/cashierservice/service/OrderService.java            | 3 ++-
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbCashierCart.java b/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbCashierCart.java
index 708d764..d6f05c0 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbCashierCart.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbCashierCart.java
@@ -83,7 +83,7 @@ public class TbCashierCart implements Serializable {
     private String unit;
     private BigDecimal discountSaleAmount;
     private String discountSaleNote;
-    private Boolean isPrint;
+    private Integer isPrint;
     private String useCouponInfo;
     private int isThirdCoupon;
 
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 f109164..13d5e1d 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbOrderDetail.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbOrderDetail.java
@@ -57,6 +57,7 @@ public class TbOrderDetail implements Serializable {
     private String useCouponInfo;
     private BigDecimal canReturnAmount;
     private BigDecimal returnAmount;
+    private Integer isPrint;
 
 
 }
diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/entity/vo/CartVo.java b/src/main/java/com/chaozhanggui/system/cashierservice/entity/vo/CartVo.java
index 99b11eb..0d754bc 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/entity/vo/CartVo.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/entity/vo/CartVo.java
@@ -26,5 +26,5 @@ public class CartVo {
     private String masterId;
     private String tableId;
     private Integer orderId;
-    private Boolean isPrint;
+    private Integer isPrint;
 }
diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java
index 06accc0..683ed23 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java
@@ -216,7 +216,7 @@ public class OrderService {
 
     @Transactional(rollbackFor = Exception.class)
     public Result createCart(String masterId, Integer productId, Integer shopId, Integer skuId, BigDecimal number,
-                             String userId, String clientType, Integer cartId, String isGift, String isPack, String uuid, String type, String tableId, Boolean isPrint) {
+                             String userId, String clientType, Integer cartId, String isGift, String isPack, String uuid, String type, String tableId, Integer isPrint) {
         if (number == null) {
             return Result.fail(CodeEnum.PARAM);
         }
@@ -934,6 +934,7 @@ public class OrderService {
                 saleAmount = saleAmount.add(shopInfo.getTableFee());
             }
 
+            orderDetail.setIsPrint(cashierCart.getIsPrint());
             orderDetail.setMemberPrice(cashierCart.getMemberPrice());
             orderDetail.setCreateTime(new Date());
             orderDetail.setNum(cashierCart.getNumber());