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 35348113..0ed7237b 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 @@ -142,7 +142,7 @@ public class TbPlaceController { public ResponseEntity createOrder( @RequestBody CreateOrderDTO createOrderDTO ) { - return ResponseEntity.ok(tbShopTableService.createOrder(createOrderDTO)); + return ResponseEntity.ok(tbShopTableService.createOrder(createOrderDTO, true)); } @AnonymousAccess 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 d415e46d..9fe9d29b 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 @@ -710,7 +710,7 @@ public class TbShopTableServiceImpl implements TbShopTableService { @Override - public TbOrderInfo createOrder(CreateOrderDTO createOrderDTO) { + public TbOrderInfo createOrder(CreateOrderDTO createOrderDTO, boolean addMaterId) { String day = DateUtils.getDay(); LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper() @@ -839,7 +839,7 @@ public class TbShopTableServiceImpl implements TbShopTableService { cashierCart.setUpdatedAt(System.currentTimeMillis()); cashierCartMapper.updateById(cashierCart); } - if (isFirst) { + if (isFirst && addMaterId) { String key = "SHOP:CODE:USER:pc" + ":" + createOrderDTO.getShopId() + ":" + day + ":" + createOrderDTO.getTableId(); redisTemplate.delete(key); @@ -904,7 +904,7 @@ public class TbShopTableServiceImpl implements TbShopTableService { createOrderDTO.setShopId(pendingDTO.getShopId()); createOrderDTO.setMasterId(pendingDTO.getMasterId()); createOrderDTO.setVipUserId(pendingDTO.getVipUserId()); - orderId = createOrder(createOrderDTO).getId(); + orderId = createOrder(createOrderDTO, false).getId(); } 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 e8eea1b2..f1a7bca0 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 @@ -108,7 +108,7 @@ public interface TbShopTableService { void pack(PackCartDTO packCartDTO); - Object createOrder(CreateOrderDTO createOrderDTO); + Object createOrder(CreateOrderDTO createOrderDTO, boolean addMasterId); Object getMasterId(Integer shopId, Long tableId, Integer vipUserId);