From 28874a59f1a7b25616fa290e721516920af519a6 Mon Sep 17 00:00:00 2001 From: SongZhang <2064194730@qq.com> Date: Fri, 23 Aug 2024 11:48:02 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BB=A3=E5=AE=A2=E4=B8=8B=E5=8D=95=20?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=B4=AD=E7=89=A9=E8=BD=A6=20=E4=B8=8D?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=98=A8=E6=97=A5=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/shopimpl/TbShopTableServiceImpl.java | 42 ++++++++++++++----- 1 file changed, 31 insertions(+), 11 deletions(-) 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 44baa54a..dbe19ecd 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 @@ -320,14 +320,19 @@ public class TbShopTableServiceImpl implements TbShopTableService { .eq(TbCashierCart::getShopId, addCartDTO.getShopId()) .eq(TbCashierCart::getSkuId, addCartDTO.getSkuId()) .eq(TbCashierCart::getProductId, addCartDTO.getProductId()) - .eq(TbCashierCart::getTableId, addCartDTO.getTableId()); - if (addCartDTO.getVipUserId() != null) { - query.eq(TbCashierCart::getUserId, addCartDTO.getVipUserId()); - } else { - query.eq(TbCashierCart::getMasterId, addCartDTO.getMasterId()); - query.isNull(TbCashierCart::getUserId); - } - + .eq(TbCashierCart::getTableId, addCartDTO.getTableId()) + .and(query2 -> { + query2.and(query3 -> { + query3.eq(TbCashierCart::getTradeDay, DateUtils.getDay()) + .eq(TbCashierCart::getMasterId, addCartDTO.getMasterId()); + }) + .or() + .and(query4 -> { + query4.isNull(TbCashierCart::getTradeDay) + .eq(TbCashierCart::getMasterId, ""); + }) + ; + }); TbCashierCart tbCashierCart = cashierCartMapper.selectOne(query); // 首次加入 if (tbCashierCart == null) { @@ -435,9 +440,17 @@ public class TbShopTableServiceImpl implements TbShopTableService { .eq(TbCashierCart::getTableId, tableId) .in(TbCashierCart::getStatus, "create") .eq(TbCashierCart::getShopId, shopId) - .and(query -> { - query.eq(TbCashierCart::getMasterId, masterId).or() - .isNull(TbCashierCart::getMasterId); + .and(query2 -> { + query2.and(query3 -> { + query3.eq(TbCashierCart::getTradeDay, DateUtils.getDay()) + .eq(TbCashierCart::getMasterId, masterId); + }) + .or() + .and(query4 -> { + query4.isNull(TbCashierCart::getTradeDay) + .eq(TbCashierCart::getMasterId, ""); + }) + ; }); // if (vipUserId != null) { @@ -839,6 +852,13 @@ public class TbShopTableServiceImpl implements TbShopTableService { orderInfo.setRemark(createOrderDTO.getNote()); orderInfo.setUserId(String.valueOf(createOrderDTO.getVipUserId())); orderInfo.setCreatedAt(DateUtil.current()); + TbMerchantAccount merchantAccount = merchantAccountMapper.selectOne(new LambdaQueryWrapper() + .eq(TbMerchantAccount::getShopId, createOrderDTO.getShopId()) + .eq(TbMerchantAccount::getStatus, 1)); + if (merchantAccount == null) { + throw new BadRequestException("商户信息不存在"); + } + orderInfo.setMerchantId(merchantAccount.getId().toString()); orderInfoMapper.insert(orderInfo); }