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:
SongZhang
2024-10-08 15:20:43 +08:00
parent e7ca92eaaf
commit b9cce3bdf1
1 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1322,7 +1322,7 @@ public class TbShopTableServiceImpl implements TbShopTableService {
@Override @Override
public Object pending(PendingDTO pendingDTO) { public Object pending(PendingDTO pendingDTO) {
if (pendingDTO.getOrderId() != null) { if (pendingDTO.getOrderId() != null && pendingDTO.getIsPending()) {
TbOrderInfo tbOrderInfo = orderInfoMapper.selectOne(new LambdaQueryWrapper<TbOrderInfo>() TbOrderInfo tbOrderInfo = orderInfoMapper.selectOne(new LambdaQueryWrapper<TbOrderInfo>()
.eq(TbOrderInfo::getId, pendingDTO.getOrderId()) .eq(TbOrderInfo::getId, pendingDTO.getOrderId())
.eq(TbOrderInfo::getStatus, "pending")); .eq(TbOrderInfo::getStatus, "pending"));
@@ -1335,13 +1335,7 @@ public class TbShopTableServiceImpl implements TbShopTableService {
.eq(TbCashierCart::getUseType, pendingDTO.getUseType()) .eq(TbCashierCart::getUseType, pendingDTO.getUseType())
.eq(TbCashierCart::getShopId, pendingDTO.getShopId()); .eq(TbCashierCart::getShopId, pendingDTO.getShopId());
if (!pendingDTO.getIsPending()) { if (pendingDTO.getIsPending()) {
if (pendingDTO.getOrderId() == null) {
throw new BadRequestException("取消挂起订单id不为空");
}
queryWrapper.eq(TbCashierCart::getOrderId, pendingDTO.getOrderId());
} else {
queryWrapper queryWrapper
.eq(TbCashierCart::getStatus, "create") .eq(TbCashierCart::getStatus, "create")
.and(query2 -> query2.or(query3 -> query3.eq(TbCashierCart::getTradeDay, DateUtils.getDay()) .and(query2 -> query2.or(query3 -> query3.eq(TbCashierCart::getTradeDay, DateUtils.getDay())
@@ -1352,8 +1346,11 @@ public class TbShopTableServiceImpl implements TbShopTableService {
if (StrUtil.isNotBlank(pendingDTO.getTableId())) { if (StrUtil.isNotBlank(pendingDTO.getTableId())) {
queryWrapper.eq(TbCashierCart::getTableId, pendingDTO.getTableId()); queryWrapper.eq(TbCashierCart::getTableId, pendingDTO.getTableId());
} }
} else {
if (pendingDTO.getOrderId() == null) {
throw new BadRequestException("取消挂起订单id不为空");
}
queryWrapper.eq(TbCashierCart::getOrderId, pendingDTO.getOrderId());
} }
List<TbCashierCart> cashierCarts = cashierCartMapper List<TbCashierCart> cashierCarts = cashierCartMapper
.selectList(queryWrapper); .selectList(queryWrapper);
@@ -1393,7 +1390,7 @@ public class TbShopTableServiceImpl implements TbShopTableService {
TbCashierCart cashierCart = new TbCashierCart(); TbCashierCart cashierCart = new TbCashierCart();
cashierCart.setStatus(pendingDTO.getIsPending() ? "refund" : "create"); cashierCart.setStatus(pendingDTO.getIsPending() ? "refund" : "create");
cashierCart.setPendingAt(pendingDTO.getIsPending() ? DateUtil.current() : cashierCart.getPendingAt()); cashierCart.setPendingAt(pendingDTO.getIsPending() ? DateUtil.current() : cashierCart.getPendingAt() == null ? DateUtil.current() : cashierCart.getPendingAt());
cashierCartMapper.update(cashierCart, new LambdaUpdateWrapper<TbCashierCart>() cashierCartMapper.update(cashierCart, new LambdaUpdateWrapper<TbCashierCart>()
.eq(TbCashierCart::getOrderId, orderId)); .eq(TbCashierCart::getOrderId, orderId));