From cf9ff5c380dae0187564bcc4468f67d851e65f08 Mon Sep 17 00:00:00 2001 From: SongZhang <2064194730@qq.com> Date: Fri, 27 Sep 2024 09:41:54 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=B1=E9=A4=90=E6=A8=A1=E5=BC=8F=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/product/TbPlaceController.java | 4 ++-- .../cashier/dto/shoptable/ClearCartDTO.java | 2 +- .../cashier/dto/shoptable/RemoveCartDTO.java | 2 +- .../dto/shoptable/ShopEatTypeInfoDTO.java | 2 +- .../impl/shopimpl/TbShopTableServiceImpl.java | 23 ++++++++++--------- .../service/shop/TbShopTableService.java | 4 ++-- 6 files changed, 19 insertions(+), 18 deletions(-) diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/controller/product/TbPlaceController.java b/eladmin-system/src/main/java/cn/ysk/cashier/controller/product/TbPlaceController.java index cbf25d89..f4925703 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/controller/product/TbPlaceController.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/controller/product/TbPlaceController.java @@ -120,7 +120,7 @@ public class TbPlaceController { public ResponseEntity getCart( @RequestParam(defaultValue = "1") Integer page, @RequestParam(defaultValue = "10") Integer size, - @RequestParam(required = false) Long tableId, + @RequestParam(required = false) String tableId, @RequestParam Integer shopId, @RequestParam String masterId, @RequestParam String useType @@ -146,7 +146,7 @@ public class TbPlaceController { @ApiOperation("代客下单 ") public ResponseEntity getMasterId( @RequestParam Integer shopId, - @RequestParam Long tableId, + @RequestParam String tableId, @RequestParam(defaultValue = "") String useType ) { return ResponseEntity.ok(tbShopTableService.getMasterId(shopId, tableId, useType)); diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/dto/shoptable/ClearCartDTO.java b/eladmin-system/src/main/java/cn/ysk/cashier/dto/shoptable/ClearCartDTO.java index aebe89de..3e155a64 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/dto/shoptable/ClearCartDTO.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/dto/shoptable/ClearCartDTO.java @@ -13,5 +13,5 @@ import javax.validation.constraints.NotNull; private String shopId; @NotEmpty private String useType; - private Long tableId; + private String tableId; } diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/dto/shoptable/RemoveCartDTO.java b/eladmin-system/src/main/java/cn/ysk/cashier/dto/shoptable/RemoveCartDTO.java index 0ea3d483..591b6d2f 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/dto/shoptable/RemoveCartDTO.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/dto/shoptable/RemoveCartDTO.java @@ -12,7 +12,7 @@ public class RemoveCartDTO { private Integer cartId; @NotNull private Integer shopId; - private Long tableId; + private String tableId; @NotBlank private String useType; } diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/dto/shoptable/ShopEatTypeInfoDTO.java b/eladmin-system/src/main/java/cn/ysk/cashier/dto/shoptable/ShopEatTypeInfoDTO.java index 4c7195e4..b4a9cbe0 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/dto/shoptable/ShopEatTypeInfoDTO.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/dto/shoptable/ShopEatTypeInfoDTO.java @@ -14,5 +14,5 @@ public class ShopEatTypeInfoDTO { private TbShopInfo shopInfo; private String useType; private Object shopId; - private Object tableId; + private String tableId; } 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 85f337bc..e75ada8c 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 @@ -155,12 +155,12 @@ public class TbShopTableServiceImpl implements TbShopTableService { * @param shopId 店铺id * @return 就餐类型信息 */ - public ShopEatTypeInfoDTO checkEatModel(Object shopId, Object tableId) { - String eatModel = StrUtil.isBlank(tableId == null ? "" : tableId.toString()) ? ShopInfoEatModelEnum.TAKE_OUT.getValue() : ShopInfoEatModelEnum.DINE_IN.getValue(); + public ShopEatTypeInfoDTO checkEatModel(Object shopId, String tableId) { + String eatModel = StrUtil.isBlank(tableId) ? ShopInfoEatModelEnum.TAKE_OUT.getValue() : ShopInfoEatModelEnum.DINE_IN.getValue(); return getShopEatTypeInfoDTO(shopId, eatModel, tableId); } - private ShopEatTypeInfoDTO getShopEatTypeInfoDTO(Object shopId, String eatModel, Object tableId) { + private ShopEatTypeInfoDTO getShopEatTypeInfoDTO(Object shopId, String eatModel, String tableId) { TbShopInfo shopInfo = mpShopInfoMapper.selectOne(new LambdaQueryWrapper() .eq(TbShopInfo::getId, shopId) .eq(TbShopInfo::getStatus, 1)); @@ -235,7 +235,7 @@ public class TbShopTableServiceImpl implements TbShopTableService { itemMap.put("tableId", date.getQrcode()); } - ShopEatTypeInfoDTO shopEatTypeInfoDTO = checkEatModel(criteria.getShopId(), criteria.getQrcode()); + ShopEatTypeInfoDTO shopEatTypeInfoDTO = checkEatModel(criteria.getShopId(), criteria.getQrcode() != null ? String.valueOf(criteria.getQrcode()) : ""); TbOrderInfo orderInfo = getCurrentOrder(shopEatTypeInfoDTO); itemMap.put("orderId", orderInfo == null ? null : orderInfo.getId()); itemMap.put("useType", orderInfo == null ? null : orderInfo.getUseType()); @@ -342,7 +342,7 @@ public class TbShopTableServiceImpl implements TbShopTableService { throw new BadRequestException("购物车商品不存在"); } - ShopEatTypeInfoDTO shopEatTypeInfoDTO = checkEatModel(updateCartDTO.getShopId(), tbCashierCart.getUseType()); + ShopEatTypeInfoDTO shopEatTypeInfoDTO = checkEatModel(updateCartDTO.getShopId(), String.valueOf(tbCashierCart.getTableId())); int currentPlaceNum = getCurrentPlaceNum(shopEatTypeInfoDTO); if (tbCashierCart.getPlaceNum() != null && !tbCashierCart.getPlaceNum().equals(currentPlaceNum)) { @@ -419,7 +419,7 @@ public class TbShopTableServiceImpl implements TbShopTableService { @Override public TbCashierCart addCartForUser(AddCartDTO addCartDTO) { - ShopEatTypeInfoDTO shopEatTypeInfoDTO = checkEatModel(addCartDTO.getShopId(), addCartDTO.getUseType()); + ShopEatTypeInfoDTO shopEatTypeInfoDTO = checkEatModel(addCartDTO.getShopId(), addCartDTO.getTableId()); TbProductSku productSku = productMapper.selectSkuByIdAndShopId(addCartDTO.getShopId(), addCartDTO.getSkuId()); TbProduct product = productMapper.selectByIdAndShopId(addCartDTO.getShopId(), addCartDTO.getProductId()); @@ -703,9 +703,9 @@ public class TbShopTableServiceImpl implements TbShopTableService { } @Override - public Map getCart(Long tableId, Integer page, + public Map getCart(String tableId, Integer page, Integer size, Integer shopId, String masterId, String useType) { - ShopEatTypeInfoDTO shopEatTypeInfoDTO = checkEatModel(shopId, useType); + ShopEatTypeInfoDTO shopEatTypeInfoDTO = checkEatModel(shopId, tableId); LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper() .in(TbCashierCart::getStatus, "create", "return") .eq(TbCashierCart::getShopId, shopId) @@ -1004,7 +1004,7 @@ public class TbShopTableServiceImpl implements TbShopTableService { private final StringRedisTemplate redisTemplate; @Override - public JSONObject getMasterId(Integer shopId, Long tableId,String useType) { + public JSONObject getMasterId(Integer shopId, String tableId,String useType) { String account = tokenProvider.getSubject(); if (account == null) { throw new BadRequestException("token解析失败"); @@ -1048,7 +1048,7 @@ public class TbShopTableServiceImpl implements TbShopTableService { if (shopInfo == null) throw new BadRequestException("店铺信息不存在"); // 就餐模式信息 - ShopEatTypeInfoDTO shopEatTypeInfoDTO = checkEatModel(createOrderDTO.getShopId(), createOrderDTO.getUseType()); + ShopEatTypeInfoDTO shopEatTypeInfoDTO = checkEatModel(createOrderDTO.getShopId(), createOrderDTO.getTableId()); // 传递orderId直接取否则取当前缓存id Integer orderId = shopEatTypeInfoDTO.isDineInAfter() ? @@ -1638,7 +1638,7 @@ public class TbShopTableServiceImpl implements TbShopTableService { @Override public Object choseTable(ChoseTableDTO choseTableDTO) { - String masterId = getMasterId(choseTableDTO.getShopId(), Long.valueOf(choseTableDTO.getNewTableId()), null).getString("masterId"); + String masterId = getMasterId(choseTableDTO.getShopId(), choseTableDTO.getNewTableId(), null).getString("masterId"); TbShopTable shopTable = mpShopTableMapper.selectOne(new LambdaQueryWrapper() .eq(TbShopTable::getQrcode, choseTableDTO.getNewTableId()) @@ -1710,6 +1710,7 @@ public class TbShopTableServiceImpl implements TbShopTableService { .eq(TbCashierCart::getSkuId, "-999") .eq(TbCashierCart::getUseType, choseCountDTO.getUseType()) .eq(TbCashierCart::getTradeDay, cn.ysk.cashier.utils.DateUtils.getDay()) + .eq(TbCashierCart::getStatus, "create") .eq(TbCashierCart::getTableId, choseCountDTO.getTableId()); TbCashierCart tbCashierCart = cashierCartMapper.selectOne(query); diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/service/shop/TbShopTableService.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/shop/TbShopTableService.java index ca463849..1b5a27eb 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/service/shop/TbShopTableService.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/shop/TbShopTableService.java @@ -104,7 +104,7 @@ public interface TbShopTableService { void clearCart(ClearCartDTO clearCartDTO); - Map getCart(Long tableId, Integer page, Integer size, Integer shopId, String masterId, String useType); + Map getCart(String tableId, Integer page, Integer size, Integer shopId, String masterId, String useType); TbCashierCart updateCart(UpdateCartDTO updateCartDTO); @@ -112,7 +112,7 @@ public interface TbShopTableService { Object createOrder(CreateOrderDTO createOrderDTO, boolean addMasterId, boolean isPrint); - JSONObject getMasterId(Integer shopId, Long tableId, String useType); + JSONObject getMasterId(Integer shopId, String tableId, String useType); Object pending(PendingDTO pendingDTO);