From a262f6f6b5f1f5f16d89af011051fb41f8581643 Mon Sep 17 00:00:00 2001 From: SongZhang <2064194730@qq.com> Date: Thu, 19 Sep 2024 10:58:16 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E5=AE=A2=E4=B8=8B=E5=8D=95=E5=B0=B1?= =?UTF-8?q?=E9=A4=90=E6=A8=A1=E5=BC=8F=E5=88=87=E6=8D=A2=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/product/TbPlaceController.java | 8 ++++++++ .../impl/shopimpl/TbShopTableServiceImpl.java | 15 ++++++++++++++- .../cashier/service/shop/TbShopTableService.java | 2 ++ 3 files changed, 24 insertions(+), 1 deletion(-) 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 758305fc..9a061710 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 @@ -61,6 +61,14 @@ public class TbPlaceController { return ResponseEntity.ok(tbShopTableService.addCartForUser(addCartDTO)); } + @AnonymousAccess + @PutMapping("/choseModel") + @Log("代客下单:#addCartDTO.tableId") + @ApiOperation("代客下单/shop/table") + public ResponseEntity choseModel(@Valid @RequestBody ChoseModelDTO choseModelDTO) { + return ResponseEntity.ok(tbShopTableService.choseModel(choseModelDTO)); + } + @AnonymousAccess @PutMapping("/updateCart") @Log("代客下单") 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 a1438339..b53ec8b2 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 @@ -389,7 +389,6 @@ public class TbShopTableServiceImpl implements TbShopTableService { if (tbCashierCart == null) { tbCashierCart = new TbCashierCart(); tbCashierCart.setUseType(addCartDTO.getUseType()); - tbCashierCart.setUserId(addCartDTO.getVipUserId()); tbCashierCart.setCoverImg(product.getCoverImg()); tbCashierCart.setCreatedAt(System.currentTimeMillis()); tbCashierCart.setIsSku(product.getTypeEnum()); @@ -1709,4 +1708,18 @@ public class TbShopTableServiceImpl implements TbShopTableService { rabbitMsgUtils.printDishesTicket(currentOrder.getId(), false, detailIds); return true; } + + @Override + public Object choseModel(ChoseModelDTO choseModelDTO) { + cashierCartMapper.update(null, new LambdaUpdateWrapper() + .eq(TbCashierCart::getShopId, choseModelDTO.getShopId()) + .in(TbCashierCart::getId, choseModelDTO.getCartIds()) + .set(TbCashierCart::getUseType, choseModelDTO.getUseType())); + + return orderDetailMapper.update(null, new LambdaUpdateWrapper() + .in(TbOrderDetail::getCartId, choseModelDTO.getCartIds()) + .set(TbOrderDetail::getUseType, choseModelDTO.getUseType())); + + + } } 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 e6329856..6ea74182 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 @@ -135,4 +135,6 @@ public interface TbShopTableService { Object generate(TableGenerateDTO generateDTO); Object printDishes(BaseTableDTO baseTableDTO); + + Object choseModel(ChoseModelDTO choseModelDTO); }