From 19533f37b4726ae69f4d8d1e8cc17c9950921f9a Mon Sep 17 00:00:00 2001
From: SongZhang <2064194730@qq.com>
Date: Fri, 27 Sep 2024 10:05:49 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E8=AE=A2=E5=8D=95=E4=BF=9D?=
 =?UTF-8?q?=E5=AD=98sendType?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/ysk/cashier/dto/shoptable/ShopEatTypeInfoDTO.java     | 1 +
 .../service/impl/shopimpl/TbShopTableServiceImpl.java        | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/dto/shoptable/ShopEatTypeInfoDTO.java b/eladmin-system/src/main/java/cn/ysk/cashier/dto/shoptable/ShopEatTypeInfoDTO.java
index b4a9cbe0..4cb0e85c 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/dto/shoptable/ShopEatTypeInfoDTO.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/dto/shoptable/ShopEatTypeInfoDTO.java
@@ -15,4 +15,5 @@ public class ShopEatTypeInfoDTO {
     private String useType;
     private Object shopId;
     private String tableId;
+    private String sendType;
 }
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 e75ada8c..076daa4b 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
@@ -180,7 +180,8 @@ public class TbShopTableServiceImpl implements TbShopTableService {
         boolean isDineInBefore = isMunchies && !isTakeout;
 
         return new ShopEatTypeInfoDTO(isTakeout, isMunchies, isDineInAfter, isDineInBefore, shopInfo, isTakeout ? OrderUseTypeEnum.TAKEOUT.getValue() :
-                isMunchies ? OrderUseTypeEnum.DINE_IN_BEFORE.getValue() : OrderUseTypeEnum.DINE_IN_AFTER.getValue(), shopId, tableId);
+                isMunchies ? OrderUseTypeEnum.DINE_IN_BEFORE.getValue() : OrderUseTypeEnum.DINE_IN_AFTER.getValue(),
+                shopId, tableId, isTakeout ? OrderSendTypeEnums.TAKE_SELF.getValue() : OrderSendTypeEnums.TABLE.getValue());
     }
 
 
@@ -1198,6 +1199,7 @@ public class TbShopTableServiceImpl implements TbShopTableService {
                 orderInfo.setCreatedAt(DateUtil.current());
                 orderInfo.setSeatAmount(mealAmount);
                 orderInfo.setSeatCount(mealNum);
+                orderInfo.setSendType(shopEatTypeInfoDTO.getSendType());
                 // 存在新添加的商品，增加下单次数
                 if (hasNewInfo) {
                     orderInfo.setPlaceNum(placeNum);
@@ -1232,6 +1234,7 @@ public class TbShopTableServiceImpl implements TbShopTableService {
                 orderInfo.setUseType(createOrderDTO.getUseType());
                 orderInfo.setSeatAmount(mealAmount);
                 orderInfo.setSeatCount(mealNum);
+                orderInfo.setSendType(shopEatTypeInfoDTO.getSendType());
                 TbMerchantAccount merchantAccount = merchantAccountMapper.selectOne(new LambdaQueryWrapper<TbMerchantAccount>()
                         .eq(TbMerchantAccount::getShopId, createOrderDTO.getShopId())
                         .eq(TbMerchantAccount::getStatus, 1));