From b7708d82e10ae07661c0a47ce54053254b326beb Mon Sep 17 00:00:00 2001 From: SongZhang <2064194730@qq.com> Date: Wed, 21 Aug 2024 10:23:24 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BB=A3=E5=AE=A2=E4=B8=8B=E5=8D=95=E5=90=8E?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E4=BC=9A=E5=91=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/OrderController.java | 2 +- .../cashierservice/entity/vo/TbShopTableVO.java | 11 +++++++++++ .../cashierservice/service/OrderService.java | 17 +++++++---------- src/main/resources/mapper/TbShopTableMapper.xml | 2 +- 4 files changed, 20 insertions(+), 12 deletions(-) create mode 100644 src/main/java/com/chaozhanggui/system/cashierservice/entity/vo/TbShopTableVO.java diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/controller/OrderController.java b/src/main/java/com/chaozhanggui/system/cashierservice/controller/OrderController.java index fc5f101..16a9aa7 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/controller/OrderController.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/controller/OrderController.java @@ -45,7 +45,7 @@ public class OrderController { String userId = jsonObject.getString("accountId"); return orderService.createCart(cartVo.getMasterId(),cartVo.getProductId(),cartVo.getShopId(), cartVo.getSkuId(),cartVo.getNumber(),userId,clientType,cartVo.getCartId(),cartVo.getIsGift(), - cartVo.getIsPack(),cartVo.getUuid(),cartVo.getType(), cartVo.getVipUserId(), cartVo.getTableId()); + cartVo.getIsPack(),cartVo.getUuid(),cartVo.getType(), cartVo.getTableId()); } @MyLog(value = "查询购物车信息", tag = LogTag.CART) diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/entity/vo/TbShopTableVO.java b/src/main/java/com/chaozhanggui/system/cashierservice/entity/vo/TbShopTableVO.java new file mode 100644 index 0000000..a5af751 --- /dev/null +++ b/src/main/java/com/chaozhanggui/system/cashierservice/entity/vo/TbShopTableVO.java @@ -0,0 +1,11 @@ +package com.chaozhanggui.system.cashierservice.entity.vo; + +import com.chaozhanggui.system.cashierservice.entity.TbShopTable; +import lombok.Data; +import lombok.EqualsAndHashCode; + +@EqualsAndHashCode(callSuper = true) +@Data +public class TbShopTableVO extends TbShopTable { + private Integer userId; +} diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java index 7b6685e..d15f670 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java @@ -108,7 +108,7 @@ public class OrderService { @Transactional(rollbackFor = Exception.class) public Result createCart(String masterId, String productId, String shopId, Integer skuId, Integer number, - String userId, String clientType, Integer cartId, String isGift, String isPack, String uuid, String type, Integer vipUserId, String tableId) { + String userId, String clientType, Integer cartId, String isGift, String isPack, String uuid, String type, String tableId) { if (Objects.isNull(number) || number < 0) { return Result.fail(CodeEnum.NUMBER); } @@ -209,7 +209,6 @@ public class OrderService { cashierCart.setNumber(cashierCart.getNumber()+number); cashierCart.setTotalNumber(cashierCart.getNumber()+number); cashierCart.setUpdatedAt(System.currentTimeMillis()); - cashierCart.setUserId(vipUserId); cashierCartMapper.updateByPrimaryKey(cashierCart); cashierCartMapper.deleteByPrimaryKey(cart.getId()); @@ -221,7 +220,6 @@ public class OrderService { cart.setNumber(number); cart.setIsGift(isGift); cart.setIsPack(isPack); - cart.setUserId(vipUserId); if (isPack.equals("false")){ cart.setPackFee(BigDecimal.ZERO); @@ -259,7 +257,6 @@ public class OrderService { cashierCart.setStatus("create"); cashierCart.setIsPack(isPack); cashierCart.setIsGift(isGift); - cashierCart.setUserId(vipUserId); if (isGift.equals("false")) { cashierCart.setTotalAmount(new BigDecimal(number).multiply(skuWithBLOBs.getSalePrice())); } else { @@ -281,7 +278,6 @@ public class OrderService { cashierCartMapper.insert(cashierCart); cart=cashierCart; } else { - cashierCart.setUserId(vipUserId); if (type.equals("add")) { cashierCart.setNumber(cashierCart.getNumber() + number); @@ -293,7 +289,6 @@ public class OrderService { }else { cashierCart.setPackFee(new BigDecimal(number).multiply(product.getPackFee())); } - cashierCart.setUserId(vipUserId); cashierCart.setTotalAmount(new BigDecimal(cashierCart.getNumber()).multiply(skuWithBLOBs.getSalePrice()).add(cashierCart.getPackFee())); mpCashierCartMapper.updateById(cashierCart); } @@ -984,12 +979,14 @@ public class OrderService { queryWrapper.eq(TbCashierCart::getMasterId, cartVo.getMasterId()); queryWrapper.isNull(TbCashierCart::getTableId); // 台桌点单 - }else if (StrUtil.isNotBlank(cartVo.getTableId()) && cartVo.getVipUserId() == null) { + }else if (StrUtil.isNotBlank(cartVo.getTableId()) ) { queryWrapper.eq(TbCashierCart::getTableId, cartVo.getTableId()) - .eq(TbCashierCart::getMasterId, cartVo.getMasterId()); + .and(query -> { + query.eq(TbCashierCart::getMasterId, cartVo.getMasterId()) + .or() + .isNull(TbCashierCart::getMasterId); + }); // 会员点单 - }else { - queryWrapper.eq(TbCashierCart::getUserId, cartVo.getVipUserId()); } List list = mpCashierCartMapper.selectList(queryWrapper); diff --git a/src/main/resources/mapper/TbShopTableMapper.xml b/src/main/resources/mapper/TbShopTableMapper.xml index b0e202a..0659e48 100644 --- a/src/main/resources/mapper/TbShopTableMapper.xml +++ b/src/main/resources/mapper/TbShopTableMapper.xml @@ -240,7 +240,7 @@ and a.status = #{status} - + GROUP BY a.id order by a.`sort` asc