From ff27101e13209f9f4994349123ac79d6c8ec18cf Mon Sep 17 00:00:00 2001 From: SongZhang <2064194730@qq.com> Date: Thu, 12 Sep 2024 16:58:35 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BB=A3=E5=AE=A2=E4=B8=8B=E5=8D=95=20orderD?= =?UTF-8?q?etail=E5=90=8C=E6=AD=A5=E4=BF=9D=E5=AD=98cartid?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/ysk/cashier/pojo/order/TbOrderDetail.java | 3 +++ .../service/impl/shopimpl/TbShopTableServiceImpl.java | 6 ++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/pojo/order/TbOrderDetail.java b/eladmin-system/src/main/java/cn/ysk/cashier/pojo/order/TbOrderDetail.java index 379db52a..794d1ad7 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/pojo/order/TbOrderDetail.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/pojo/order/TbOrderDetail.java @@ -116,6 +116,9 @@ public class TbOrderDetail implements Serializable { @Column(name = "`note`") private String note; + @Column(name = "`cart_id`") + private Integer cartId; + public void copy(TbOrderDetail source){ BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true)); } 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 fc6d0f8b..883a05f7 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 @@ -547,12 +547,9 @@ public class TbShopTableServiceImpl implements TbShopTableService { TbOrderDetail tbOrderDetail = orderDetailMapper.selectOne(new LambdaQueryWrapper() .eq(TbOrderDetail::getShopId, removeCartDTO.getShopId()) - .eq(TbOrderDetail::getPlaceNum, cashierCart.getPlaceNum()) + .eq(TbOrderDetail::getCartId, cashierCart.getId()) .eq(TbOrderDetail::getProductId, cashierCart.getProductId()) .eq(TbOrderDetail::getProductSkuId, cashierCart.getSkuId()) - .eq(TbOrderDetail::getPlaceNum, cashierCart.getPlaceNum()) - .eq(TbOrderDetail::getNum, cashierCart.getNumber()) - .in(TbOrderDetail::getStatus, "unpaid") .eq(TbOrderDetail::getOrderId, cashierCart.getOrderId())); if (tbOrderDetail == null) { throw new BadRequestException("购物车商品不存在或已退单"); @@ -1071,6 +1068,7 @@ public class TbShopTableServiceImpl implements TbShopTableService { orderDetail.setPackAmount(cashierCart.getPackFee()); orderDetail.setStatus("unpaid"); orderDetail.setProductImg(cashierCart.getCoverImg()); + orderDetail.setCartId(cashierCart.getId()); orderDetails.add(orderDetail); if (cashierCart.getOrderId() != null) { orderId = cashierCart.getOrderId();