From 80d990de1727c811c13c55245bd9a875c25d75c9 Mon Sep 17 00:00:00 2001 From: SongZhang <2064194730@qq.com> Date: Thu, 31 Oct 2024 14:17:24 +0800 Subject: [PATCH] =?UTF-8?q?1.=20=E5=8F=96=E6=B6=88=E4=BC=9A=E5=91=98?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/shopimpl/TbShopTableServiceImpl.java | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) 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 c53e855d..fad25b5b 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 @@ -1439,6 +1439,10 @@ public class TbShopTableServiceImpl implements TbShopTableService { shouldPayAmount = shouldPayAmount.subtract(discountAmount); memberPointsService.deductPoints(memberId, pointsNum, "霸王餐充值抵扣", Long.valueOf(orderInfo.getId())); } + + if (!userCouponList.isEmpty()) { + + } } @@ -1762,15 +1766,16 @@ public class TbShopTableServiceImpl implements TbShopTableService { .in(TbCashierCart::getPlatformType, OrderPlatformTypeEnum.PC.getValue(), OrderPlatformTypeEnum.CASH.getValue()); } - TbShopUser shopUser = tbShopUserMapper.selectById(updateVipDTO.getVipUserId()); - if (shopUser == null) { - throw new BadRequestException("用户信息不存在"); - } + List tbCashierCarts = cashierCartMapper.selectList(queryWrapper.isNotNull(TbCashierCart::getOrderId)); if (!tbCashierCarts.isEmpty()) { Integer orderId = tbCashierCarts.get(0).getOrderId(); if (updateVipDTO.getType() == 0) { + TbShopUser shopUser = tbShopUserMapper.selectById(updateVipDTO.getVipUserId()); + if (shopUser == null) { + throw new BadRequestException("用户信息不存在"); + } return orderInfoMapper.update(null, new LambdaUpdateWrapper() .eq(TbOrderInfo::getId, orderId) .set(TbOrderInfo::getUserId, shopUser.getUserId())