From cddbe8d1953275de6ed08dae15787fcfb8ea5c73 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, 4 Dec 2024 14:22:07 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=A2=9E=E5=8A=A0=E8=B4=AD=E7=89=A9?=
 =?UTF-8?q?=E8=BD=A6=E5=95=86=E5=93=81=E7=B1=BB=E5=9E=8B=EF=BC=8C=E5=8D=95?=
 =?UTF-8?q?=E4=BD=8D=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/cn/ysk/cashier/pojo/order/TbCashierCart.java  | 2 ++
 .../service/impl/shopimpl/TbShopTableServiceImpl.java       | 6 +++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/pojo/order/TbCashierCart.java b/eladmin-system/src/main/java/cn/ysk/cashier/pojo/order/TbCashierCart.java
index 23d579ad..50c9bb49 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/pojo/order/TbCashierCart.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/pojo/order/TbCashierCart.java
@@ -183,6 +183,8 @@ public class TbCashierCart implements Serializable {
     private Integer isWaitCall;
     // 套餐商品，选择的商品信息
     private String proGroupInfo;
+    // 商品类型
+    private String typeEnum;
 
     public void copy(TbCashierCart source) {
         BeanUtil.copyProperties(source, this, CopyOptions.create().setIgnoreNullValue(true));
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 7a15b760..1b162722 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
@@ -610,7 +610,11 @@ public class TbShopTableServiceImpl implements TbShopTableService {
         if (tbCashierCart == null) {
             tbCashierCart = new TbCashierCart();
             resetGroupProductCart(addCartDTO.getGroupProductIdList(), product, tbCashierCart);
-
+            TbShopUnit tbShopUnit = mpShopUnitMapper.selectById(product.getId());
+            if (tbShopUnit != null) {
+                tbCashierCart.setUnit(tbShopUnit.getName());
+            }
+            tbCashierCart.setTypeEnum(product.getTypeEnum());
             tbCashierCart.setUseType(shopEatTypeInfoDTO.getUseType());
             tbCashierCart.setCoverImg(product.getCoverImg());
             tbCashierCart.setCreatedAt(System.currentTimeMillis());