From 6c940850cbba64f574e6a81b1a51d1ec6c38c1ef 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, 19 Dec 2024 14:40:18 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=B5=A0=E9=80=81=E5=8D=95=E5=BC=80?=
 =?UTF-8?q?=E5=95=86=E5=93=81=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/cashierservice/service/OrderService.java  | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

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 b012363..babf8bd 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java
@@ -305,6 +305,7 @@ public class OrderService {
         LambdaQueryWrapper<TbCashierCart> cartQuery = new LambdaQueryWrapper<TbCashierCart>()
                 .eq(TbCashierCart::getShopId, shopId)
                 .eq(TbCashierCart::getUseType, shopEatTypeInfoDTO.getUseType())
+                .eq(TbCashierCart::getIsGift, isGift)
                 .gt(TbCashierCart::getCreatedAt, DateUtil.offsetDay(DateUtil.date(), -1).getTime())
                 .and(r -> r.eq(TbCashierCart::getMasterId, finalMasterId).or().isNull(TbCashierCart::getMasterId).or().eq(TbCashierCart::getMasterId, ""))
                 .in(TbCashierCart::getStatus, "create");
@@ -366,7 +367,7 @@ public class OrderService {
         List<TbCashierCart> list = cashierCartMapper.selectALlByMasterId(masterId, "create");
         TbCashierCart cashierCart = null;
         if (type.equals("edit")) {
-            cashierCart = getCashierInfo(shopId, skuId, productId, tableId, masterId, shopEatTypeInfoDTO, cartId);
+            cashierCart = getCashierInfo(shopId, skuId, productId, tableId, masterId, shopEatTypeInfoDTO, cartId, isGift);
             if (cashierCart == null) {
                 needNew = true;
             } else {
@@ -413,6 +414,7 @@ public class OrderService {
                 cashierCart.setTotalNumber(number);
                 cashierCart.setIsPrint(isPrint);
                 cashierCart.setIsPack(isPack);
+                cashierCart.setIsGift(isGift);
                 cashierCart.resetTotalAmount();
                 cashierCart.setUuid(uuid);
                 cashierCart.setIsPrint(isPrint);
@@ -428,7 +430,7 @@ public class OrderService {
 
         if (type.equals("add") || needNew) {
             if (product == null || product.getGroupType() == null || product.getGroupType() != 1) {
-                cashierCart = getCashierInfo(shopId, skuId, productId, tableId, masterId, shopEatTypeInfoDTO, cartId);
+                cashierCart = getCashierInfo(shopId, skuId, productId, tableId, masterId, shopEatTypeInfoDTO, cartId, isGift);
             }
 
             if (cashierCart != null) {
@@ -555,7 +557,7 @@ public class OrderService {
         return Result.success(CodeEnum.SUCCESS, masterId);
     }
 
-    private TbCashierCart getCashierInfo(Object shopId, Object skuId, Object productId, String tableId, String MasterId, ShopEatTypeInfoDTO shopEatTypeInfoDTO, Integer cartId) {
+    private TbCashierCart getCashierInfo(Object shopId, Object skuId, Object productId, String tableId, String MasterId, ShopEatTypeInfoDTO shopEatTypeInfoDTO, Integer cartId, String isGift) {
         LambdaQueryWrapper<TbCashierCart> query = new LambdaQueryWrapper<TbCashierCart>()
                 .eq(TbCashierCart::getShopId, shopId)
                 .eq(TbCashierCart::getSkuId, skuId)
@@ -563,6 +565,10 @@ public class OrderService {
                 .in(TbCashierCart::getStatus, "create")
                 .eq(TbCashierCart::getUseType, shopEatTypeInfoDTO.getUseType());
 
+        if (StrUtil.isNotBlank(isGift)) {
+            query.eq(TbCashierCart::getIsGift, isGift);
+        }
+
         if (cartId != null) {
             query.eq(TbCashierCart::getId, cartId);
         }