diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/service/MpCashierCartService.java b/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/service/MpCashierCartService.java index ded16692..ca9ca5a6 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/service/MpCashierCartService.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/service/MpCashierCartService.java @@ -70,5 +70,8 @@ public interface MpCashierCartService extends IService { * @param status 状态 可为空 */ List selectByOrderIdAndState(Integer orderId, TableConstant.OrderInfo.Status status); + + + boolean updateMemberByOrderId(Integer orderId, boolean isMember); } diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/service/impl/MpCashierCartServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/service/impl/MpCashierCartServiceImpl.java index da4e44fa..ee749e70 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/service/impl/MpCashierCartServiceImpl.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/service/impl/MpCashierCartServiceImpl.java @@ -98,6 +98,13 @@ public class MpCashierCartServiceImpl extends ServiceImpl() + .eq(TbCashierCart::getOrderId, orderId) + .set(TbCashierCart::getIsMember, isMember ? 1 : 0)); + } + @Override public List selectByShopEatType(ShopEatTypeInfoDTO shopEatTypeInfoDTO, String masterId) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper() 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 a5f6fc2f..04cee1c2 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 @@ -1344,7 +1344,9 @@ public class TbShopTableServiceImpl implements TbShopTableService { if (TableConstant.CashierCart.Status.CREATE.equalsVals(tbCashierCart.getStatus())) { cartInfoDTO.setNewAddTotalAmount(cartInfoDTO.getNewAddTotalAmount().add(tbCashierCart.getTotalAmount())); } - tbCashierCart.setIsMember(tbCashierCart.getMemberPrice() == null && shopUser != null && shopUser.getIsVip() == 1 ? 0 : 1); + if (shopUser != null) { + tbCashierCart.setIsMember(tbCashierCart.getMemberPrice() == null && shopUser.getIsVip() == 1 ? 0 : 1); + } tbCashierCart.resetTotalAmount(); cartInfoDTO.setTotalAmount(cartInfoDTO.getTotalAmount().add(tbCashierCart.getTotalAmount())); @@ -2179,11 +2181,13 @@ public class TbShopTableServiceImpl implements TbShopTableService { if (shopUser == null) { throw new BadRequestException("用户信息不存在"); } + mpCashierCartService.updateMemberByOrderId(orderId, true); return orderInfoMapper.update(null, new LambdaUpdateWrapper() .eq(TbOrderInfo::getId, orderId) .set(TbOrderInfo::getUserId, shopUser.getUserId()) .set(TbOrderInfo::getMemberId, updateVipDTO.getVipUserId())); } else { + mpCashierCartService.updateMemberByOrderId(orderId, false); return orderInfoMapper.update(null, new LambdaUpdateWrapper() .eq(TbOrderInfo::getId, orderId) .set(TbOrderInfo::getUserId, null)