czg_team/cashier-admin-java
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: 取消会员修改

Browse Source
This commit is contained in:
张松
2024-11-06 16:29:29 +08:00
parent 260aedd6f4
commit 12602192de
1 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java
View File

@@ -2157,6 +2157,7 @@ public class TbShopTableServiceImpl implements TbShopTableService {
} }
@Override @Override
@Transactional
public Object updateVip(UpdateVipDTO updateVipDTO) { public Object updateVip(UpdateVipDTO updateVipDTO) {
Integer orderId = updateVipDTO.getOrderId(); Integer orderId = updateVipDTO.getOrderId();
if (orderId == null) { if (orderId == null) {
@@ -2182,28 +2183,40 @@ public class TbShopTableServiceImpl implements TbShopTableService {
} }
} }
TbOrderInfo orderInfo = mpOrderInfoService.getById(orderId);
if(!TableConstant.OrderInfo.Status.UNPAID.equalsVals(orderInfo.getStatus())) {
throw new BadRequestException("订单状态异常");
}
CreateOrderDTO dto = new CreateOrderDTO();
dto.setTableId(orderInfo.getTableId());
dto.setOrderId(orderInfo.getId());
dto.setShopId(Integer.valueOf(orderInfo.getShopId()));
dto.setMasterId(orderInfo.getMasterId());
dto.setUseType(orderInfo.getUseType());
if (updateVipDTO.getType() == 0) { if (updateVipDTO.getType() == 0) {
TbOrderInfo orderInfo = mpOrderInfoService.getById(orderId);
if(!TableConstant.OrderInfo.Status.UNPAID.equalsVals(orderInfo.getStatus())) {
throw new BadRequestException("订单状态异常");
}
TbShopUser shopUser = tbShopUserMapper.selectById(updateVipDTO.getVipUserId()); TbShopUser shopUser = tbShopUserMapper.selectById(updateVipDTO.getVipUserId());
if (shopUser == null) { if (shopUser == null) {
throw new BadRequestException("用户信息不存在"); throw new BadRequestException("用户信息不存在");
} }
return orderInfoMapper.update(null, new LambdaUpdateWrapper<TbOrderInfo>() orderInfoMapper.update(null, new LambdaUpdateWrapper<TbOrderInfo>()
.eq(TbOrderInfo::getId, orderId) .eq(TbOrderInfo::getId, orderId)
.set(TbOrderInfo::getUserId, shopUser.getUserId()) .set(TbOrderInfo::getUserId, shopUser.getUserId())
.set(TbOrderInfo::getMemberId, updateVipDTO.getVipUserId())); .set(TbOrderInfo::getMemberId, updateVipDTO.getVipUserId()));
} else { } else {
mpCashierCartService.updateMemberAndAmountByOrderId(orderId, false); mpCashierCartService.updateMemberAndAmountByOrderId(orderId, false);
return orderInfoMapper.update(null, new LambdaUpdateWrapper<TbOrderInfo>() orderInfoMapper.update(null, new LambdaUpdateWrapper<TbOrderInfo>()
.eq(TbOrderInfo::getId, orderId) .eq(TbOrderInfo::getId, orderId)
.set(TbOrderInfo::getUserId, null) .set(TbOrderInfo::getUserId, null)
.set(TbOrderInfo::getMemberId, null)); .set(TbOrderInfo::getMemberId, null));
} }
return createOrder(dto, true, true);
} }