From fbd8f306e752a91dddcf88ea3234fec1c16a5dc7 Mon Sep 17 00:00:00 2001 From: SongZhang <2064194730@qq.com> Date: Thu, 10 Oct 2024 09:34:13 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cashierservice/entity/TbCashierCart.java | 1 + .../cashierservice/service/OrderService.java | 23 +++++++------------ 2 files changed, 9 insertions(+), 15 deletions(-) diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbCashierCart.java b/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbCashierCart.java index fe427ba..b106978 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbCashierCart.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbCashierCart.java @@ -60,6 +60,7 @@ public class TbCashierCart implements Serializable { private String tableId; private String useType; private Integer placeNum; + private String platformType; @TableField(exist = false) private TbProductSpec tbProductSpec; 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 aa1c08e..f2f02e7 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java @@ -350,6 +350,7 @@ public class OrderService { cashierCart.setUuid(uuid); cashierCart.setCategoryId(product.getCategoryId()); cashierCart.setTableId(tableId); + cashierCart.setPlatformType(OrderPlatformTypeEnum.CASH.getValue()); list.add(cashierCart); mpCashierCartMapper.insert(cashierCart); } else { @@ -712,27 +713,18 @@ public class OrderService { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper() .eq(TbCashierCart::getShopId, orderVo.getShopId()) + .eq(TbCashierCart::getUseType, eatTypeInfoDTO.getUseType()) + .gt(TbCashierCart::getCreatedAt, DateUtil.offsetDay(DateUtil.date(), -1).getTime()) + .and(q -> q.eq(TbCashierCart::getMasterId, orderVo.getMasterId()).or().isNull(TbCashierCart::getMasterId)) .eq(TbCashierCart::getStatus, "create"); // 外带模式 if (eatTypeInfoDTO.isTakeout()) { - queryWrapper.eq(TbCashierCart::getMasterId, orderVo.getMasterId()) - .eq(TbCashierCart::getTradeDay, day) - .eq(TbCashierCart::getUseType, OrderUseTypeEnum.TAKEOUT.getValue()) - .and(query -> query.isNull(TbCashierCart::getTableId) - .or() - .eq(TbCashierCart::getTableId, "")); + queryWrapper.and(q -> q.isNull(TbCashierCart::getTableId).or().eq(TbCashierCart::getTableId, "")) + .in(TbCashierCart::getPlatformType, OrderPlatformTypeEnum.PC.getValue(), OrderPlatformTypeEnum.CASH.getValue()); // 台桌点单 } else if (StrUtil.isNotBlank(orderVo.getTableId())) { - queryWrapper.eq(TbCashierCart::getTableId, orderVo.getTableId()) - .eq(TbCashierCart::getUseType, eatTypeInfoDTO.getUseType()) - .and(query2 -> query2.or(query3 -> query3.eq(TbCashierCart::getTradeDay, DateUtils.getDay()) - .eq(TbCashierCart::getMasterId, orderVo.getMasterId())) - .or((query4 -> query4.isNull(TbCashierCart::getTradeDay) - .or() - .eq(TbCashierCart::getMasterId, "") - .or() - .isNull(TbCashierCart::getMasterId)))); + queryWrapper.eq(TbCashierCart::getTableId, orderVo.getTableId()); shopTable = mpShopTableMapper.selectOne(new LambdaUpdateWrapper() .eq(TbShopTable::getQrcode, orderVo.getTableId())); @@ -1773,6 +1765,7 @@ public class OrderService { tbCashierCart.setPackFee(BigDecimal.ZERO); tbCashierCart.setNumber(choseCountDTO.getNum()); tbCashierCart.setTotalNumber(choseCountDTO.getNum()); + tbCashierCart.setPlatformType(OrderPlatformTypeEnum.CASH.getValue()); tbCashierCartMapper.insert(tbCashierCart); } else { tbCashierCart.setTotalAmount(new BigDecimal(choseCountDTO.getNum()).multiply(shopInfo.getTableFee())); From 59c7fc4c9dc68f0a29069e393b77d944705f9b73 Mon Sep 17 00:00:00 2001 From: SongZhang <2064194730@qq.com> Date: Thu, 10 Oct 2024 09:35:18 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bean/OrderPlatformTypeEnum.java | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 src/main/java/com/chaozhanggui/system/cashierservice/bean/OrderPlatformTypeEnum.java diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/bean/OrderPlatformTypeEnum.java b/src/main/java/com/chaozhanggui/system/cashierservice/bean/OrderPlatformTypeEnum.java new file mode 100644 index 0000000..dcb9c02 --- /dev/null +++ b/src/main/java/com/chaozhanggui/system/cashierservice/bean/OrderPlatformTypeEnum.java @@ -0,0 +1,15 @@ +package com.chaozhanggui.system.cashierservice.bean; + +import lombok.Getter; + +@Getter +public enum OrderPlatformTypeEnum { + PC("pc"), + CASH("cash"), + MINI_APP("miniapp"); + private final String value; + + OrderPlatformTypeEnum(String value) { + this.value = value; + } +}