1. 取消会员接口修改
This commit is contained in:
@@ -1439,6 +1439,10 @@ public class TbShopTableServiceImpl implements TbShopTableService {
|
|||||||
shouldPayAmount = shouldPayAmount.subtract(discountAmount);
|
shouldPayAmount = shouldPayAmount.subtract(discountAmount);
|
||||||
memberPointsService.deductPoints(memberId, pointsNum, "霸王餐充值抵扣", Long.valueOf(orderInfo.getId()));
|
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());
|
.in(TbCashierCart::getPlatformType, OrderPlatformTypeEnum.PC.getValue(), OrderPlatformTypeEnum.CASH.getValue());
|
||||||
}
|
}
|
||||||
|
|
||||||
TbShopUser shopUser = tbShopUserMapper.selectById(updateVipDTO.getVipUserId());
|
|
||||||
if (shopUser == null) {
|
|
||||||
throw new BadRequestException("用户信息不存在");
|
|
||||||
}
|
|
||||||
|
|
||||||
List<TbCashierCart> tbCashierCarts = cashierCartMapper.selectList(queryWrapper.isNotNull(TbCashierCart::getOrderId));
|
List<TbCashierCart> tbCashierCarts = cashierCartMapper.selectList(queryWrapper.isNotNull(TbCashierCart::getOrderId));
|
||||||
if (!tbCashierCarts.isEmpty()) {
|
if (!tbCashierCarts.isEmpty()) {
|
||||||
Integer orderId = tbCashierCarts.get(0).getOrderId();
|
Integer orderId = tbCashierCarts.get(0).getOrderId();
|
||||||
if (updateVipDTO.getType() == 0) {
|
if (updateVipDTO.getType() == 0) {
|
||||||
|
TbShopUser shopUser = tbShopUserMapper.selectById(updateVipDTO.getVipUserId());
|
||||||
|
if (shopUser == null) {
|
||||||
|
throw new BadRequestException("用户信息不存在");
|
||||||
|
}
|
||||||
return orderInfoMapper.update(null, new LambdaUpdateWrapper<TbOrderInfo>()
|
return orderInfoMapper.update(null, new LambdaUpdateWrapper<TbOrderInfo>()
|
||||||
.eq(TbOrderInfo::getId, orderId)
|
.eq(TbOrderInfo::getId, orderId)
|
||||||
.set(TbOrderInfo::getUserId, shopUser.getUserId())
|
.set(TbOrderInfo::getUserId, shopUser.getUserId())
|
||||||
|
|||||||
Reference in New Issue
Block a user