From 34173023bc77a16c357941673f3bf4b16400fabe Mon Sep 17 00:00:00 2001
From: SongZhang <2064194730@qq.com>
Date: Thu, 26 Sep 2024 14:21:42 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E8=AE=A2=E5=8D=95=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/cashierservice/service/CartService.java             | 2 +-
 .../system/cashierservice/service/OrderService.java            | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java
index 7113400..835c0f1 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java
@@ -853,7 +853,7 @@ public class CartService {
             // 设置餐位费
             TbShopInfo shopInfo = mpShopInfoMapper.selectById(shopId);
             if (!shopEatTypeInfoDTO.isTakeout() && shopInfo.getIsTableFee() != null && shopInfo.getIsTableFee() == 0
-                    && (orderInfo == null || orderInfo.getSeatCount() == null)) {
+                    && (orderInfo != null && orderInfo.getSeatCount() == null)) {
                 seatNum = jsonObject.getInteger("dinersNum");
                 if (seatNum == null) {
                     MsgException.throwException("dinersNum不能为空");
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 5ce6ce6..c639433 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java
@@ -1,6 +1,7 @@
 package com.chaozhanggui.system.cashierservice.service;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONObject;
@@ -484,7 +485,7 @@ public class OrderService {
         groupedByPlaceNum.forEach((k, v) -> {
             HashMap<String, Object> item = new HashMap<>();
             item.put("placeNum", k);
-            item.put("placeTime", v.isEmpty() ? null : v.get(0).getCreateTime());
+            item.put("placeTime", v.isEmpty() ? null : DateUtil.format(v.get(0).getCreateTime(), "yyyy-MM-dd HH:mm:ss"));
             item.put("info", v);
             BigDecimal totalPrice = BigDecimal.ZERO;
             for (TbOrderDetail d : v) {