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 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) {