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 2af78c76..1d366ebc 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 @@ -117,8 +117,7 @@ public class TbPlaceController { @PutMapping("/returnCart") @ApiOperation("代客下单 清空购物车 /shop/table") public ResponseEntity returnOrder(@Validated @RequestBody ReturnCartDTO ReturnCartDTO) { - tbShopTableService.returnCart(ReturnCartDTO); - return new ResponseEntity<>(HttpStatus.OK); + return ResponseEntity.ok(tbShopTableService.returnCart(ReturnCartDTO)); } @DeleteMapping("/clearCart") 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 beb43f55..8bd78896 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 @@ -831,7 +831,7 @@ public class TbShopTableServiceImpl implements TbShopTableService { } @Override - public void returnCart(ReturnCartDTO removeCartDTO) { + public boolean returnCart(ReturnCartDTO removeCartDTO) { boolean isSeatCart = TableConstant.CashierCart.ID.equals(removeCartDTO.getCartId().toString()); // 会员点单 TbCashierCart cashierCart = cashierCartMapper.selectOne(new LambdaQueryWrapper() @@ -927,16 +927,16 @@ public class TbShopTableServiceImpl implements TbShopTableService { } ShopEatTypeInfoDTO shopEatTypeInfoDTO = checkEatModel(cashierCart.getShopId(), cashierCart.getTableId()); - checkTakeOutEmptyAndClear(cashierCart, shopEatTypeInfoDTO); + return checkTakeOutEmptyAndClear(cashierCart, shopEatTypeInfoDTO); } /** * 检查订单购物车是否为空并删除订单 */ - private void checkTakeOutEmptyAndClear(TbCashierCart cashierCart, ShopEatTypeInfoDTO shopEatTypeInfoDTO) { + private boolean checkTakeOutEmptyAndClear(TbCashierCart cashierCart, ShopEatTypeInfoDTO shopEatTypeInfoDTO) { if (TableConstant.OrderInfo.UseType.TAKEOUT.equalsVals(cashierCart.getUseType())) { - return; + return false; } List cashierCarts = mpCashierCartService.selectByShopEatTypeAndOrderId(shopEatTypeInfoDTO, cashierCart.getMasterId(), cashierCart.getOrderId() == null ? null : cashierCart.getOrderId(), false); int activateCount = 0; @@ -951,7 +951,9 @@ public class TbShopTableServiceImpl implements TbShopTableService { .eq(TbOrderDetail::getOrderId, cashierCart.getOrderId())); mpOrderInfoService.removeById(cashierCart.getOrderId()); mpCashierCartService.removeByIds(cashierCarts); + return true; } + return false; } @Override 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 a40364e5..85845499 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 @@ -107,7 +107,7 @@ public interface TbShopTableService { void removeCart(RemoveCartDTO removeCartDTO); - void returnCart(ReturnCartDTO returnCartDTO); + boolean returnCart(ReturnCartDTO returnCartDTO); void clearCart(ClearCartDTO clearCartDTO);