From 42fbfcbe1ac9abe595cbb557b16b354723b92b67 Mon Sep 17 00:00:00 2001 From: SongZhang <2064194730@qq.com> Date: Fri, 27 Sep 2024 13:35:57 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A4=90=E4=BD=8D=E8=B4=B9=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/cashierservice/entity/dto/ChoseCountDTO.java | 2 -- .../system/cashierservice/service/ProductService.java | 8 +++++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/entity/dto/ChoseCountDTO.java b/src/main/java/com/chaozhanggui/system/cashierservice/entity/dto/ChoseCountDTO.java index a405163..3d64bd5 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/entity/dto/ChoseCountDTO.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/entity/dto/ChoseCountDTO.java @@ -15,6 +15,4 @@ public class ChoseCountDTO { @NotNull @Min(1) private Integer num; - @NotNull - private String userId; } diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/ProductService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/ProductService.java index e0cf900..b917ce7 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/service/ProductService.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/ProductService.java @@ -892,13 +892,15 @@ public class ProductService { throw new MsgException("当前台桌最大人数为: " + shopTable.getMaxCapacity()); } + Integer userId = TokenUtil.getUserId(); + LambdaQueryWrapper query = new LambdaQueryWrapper() .eq(TbCashierCart::getShopId, choseCountDTO.getShopId()) .eq(TbCashierCart::getProductId, "-999") .eq(TbCashierCart::getSkuId, "-999") .eq(TbCashierCart::getStatus, "create") .gt(TbCashierCart::getCreatedAt, DateUtil.offsetDay(DateUtil.date(), -1).getTime()) - .and(r -> r.eq(TbCashierCart::getUserId, choseCountDTO.getUserId()).or().isNull(TbCashierCart::getUserId)) + .and(r -> r.eq(TbCashierCart::getUserId, userId).or().isNull(TbCashierCart::getUserId)) .eq(TbCashierCart::getUseType, shopEatTypeInfoDTO.getUseType()) .eq(TbCashierCart::getTableId, choseCountDTO.getTableId()); TbCashierCart tbCashierCart = mpCashierCartMapper.selectOne(query); @@ -922,7 +924,7 @@ public class ProductService { tbCashierCart.setTotalNumber(choseCountDTO.getNum()); tbCashierCart.setUseType(shopEatTypeInfoDTO.getUseType()); tbCashierCart.setPlatformType(PlatformTypeEnum.MINI_APP.getValue()); - tbCashierCart.setUserId(Integer.valueOf(choseCountDTO.getUserId())); + tbCashierCart.setUserId(userId); mpCashierCartMapper.insert(tbCashierCart); } else { tbCashierCart.setTotalAmount(new BigDecimal(choseCountDTO.getNum()).multiply(shopInfo.getTableFee())); @@ -930,7 +932,7 @@ public class ProductService { tbCashierCart.setTotalNumber(choseCountDTO.getNum()); tbCashierCart.setUseType(shopEatTypeInfoDTO.getUseType()); tbCashierCart.setPlatformType(PlatformTypeEnum.MINI_APP.getValue()); - tbCashierCart.setUserId(Integer.valueOf(choseCountDTO.getUserId())); + tbCashierCart.setUserId(userId); mpCashierCartMapper.updateById(tbCashierCart); }