From 1c8461f4209b3bb691c5ff432d635f821d526eee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?=
 <8605635+zhang3064194730@user.noreply.gitee.com>
Date: Wed, 11 Dec 2024 09:12:38 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E6=95=B0=E9=87=8F?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E=E7=9A=84=E8=B4=AD=E7=89=A9=E8=BD=A6=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E4=B8=8D=E6=AD=A3=E5=B8=B8=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/shopimpl/TbShopTableServiceImpl.java     | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java
index cb285821..5b47f00d 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java
@@ -464,8 +464,12 @@ public class TbShopTableServiceImpl implements TbShopTableService {
         tbCashierCart.setSalePrice(tbCashierCart.getSalePrice());
         tbCashierCart.setTotalAmount(updateCartDTO.getNum().multiply(tbCashierCart.getSalePrice()));
         tbCashierCart.setNote(updateCartDTO.getNote());
-        tbCashierCart.setIsPrint(updateCartDTO.getIsPrint());
-        tbCashierCart.setIsWaitCall(updateCartDTO.getIsWaitCall());
+        if (updateCartDTO.getIsPrint() != null) {
+            tbCashierCart.setIsPrint(updateCartDTO.getIsPrint());
+        }
+        if (updateCartDTO.getIsWaitCall() != null) {
+            tbCashierCart.setIsWaitCall(updateCartDTO.getIsWaitCall());
+        }
 
         if (updateCartDTO.getIsPack() != null) {
             if (!updateCartDTO.getIsPack()) {

From 5fc070b75e5c82baae8404989b1c4aadc2ad41d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?=
 <8605635+zhang3064194730@user.noreply.gitee.com>
Date: Wed, 11 Dec 2024 09:27:45 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E6=94=AF=E4=BB=98=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=8C=82=E8=B4=A6=E6=94=AF=E4=BB=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ysk/cashier/service/impl/order/TbOrderInfoServiceImpl.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/order/TbOrderInfoServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/order/TbOrderInfoServiceImpl.java
index b27dfb3a..5db9d6a2 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/order/TbOrderInfoServiceImpl.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/order/TbOrderInfoServiceImpl.java
@@ -316,6 +316,9 @@ public class TbOrderInfoServiceImpl implements TbOrderInfoService {
                 case "deposit":
                     dto.setPayType("储值卡支付");
                     break;
+                case "creditBuyer":
+                    dto.setPayType("挂账支付");
+                    break;
                 default:
                     dto.setPayType(tbOrderInfo.getSendType());
                     break;