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

代客下单调整

Browse Source
This commit is contained in:
SongZhang
2024-09-26 15:47:59 +08:00
parent d6d1691098
commit 1d5c6d7f69
1 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -688,17 +688,18 @@ public class TbShopTableServiceImpl implements TbShopTableService {
@Override @Override
public Map<String, Object> getCart(Long tableId, Integer page, public Map<String, Object> getCart(Long tableId, Integer page,
Integer size, Integer shopId, String masterId, String useType) { Integer size, Integer shopId, String masterId, String useType) {
ShopEatTypeInfoDTO shopEatTypeInfoDTO = checkEatModel(shopId, useType);
LambdaQueryWrapper<TbCashierCart> queryWrapper = new LambdaQueryWrapper<TbCashierCart>() LambdaQueryWrapper<TbCashierCart> queryWrapper = new LambdaQueryWrapper<TbCashierCart>()
.in(TbCashierCart::getStatus, "create", "refund", "return") .in(TbCashierCart::getStatus, "create", "return")
.eq(TbCashierCart::getShopId, shopId) .eq(TbCashierCart::getShopId, shopId)
.eq(TbCashierCart::getUseType, useType) .eq(TbCashierCart::getUseType, useType)
.and(query2 -> query2.or(query3 -> query3.eq(TbCashierCart::getTradeDay, DateUtils.getDay()) .and(q -> q.eq(TbCashierCart::getMasterId, masterId).or().isNull(TbCashierCart::getMasterId));
.eq(TbCashierCart::getMasterId, masterId))
.or((query4 -> query4.isNull(TbCashierCart::getTradeDay)
.isNull(TbCashierCart::getMasterId))));
if (tableId != null) { if (!shopEatTypeInfoDTO.isTakeout()) {
queryWrapper.eq(TbCashierCart::getTableId, tableId); queryWrapper.eq(TbCashierCart::getTableId, tableId);
}else {
queryWrapper.and(q -> q.isNull(TbCashierCart::getTableId).or().eq(TbCashierCart::getTableId, ""))
.in(TbCashierCart::getPlatformType, OrderPlatformTypeEnum.PC.getValue(), OrderPlatformTypeEnum.CASH.getValue());
} }
com.baomidou.mybatisplus.extension.plugins.pagination.Page<TbCashierCart> cartPage = cashierCartMapper com.baomidou.mybatisplus.extension.plugins.pagination.Page<TbCashierCart> cartPage = cashierCartMapper
@@ -1232,8 +1233,12 @@ public class TbShopTableServiceImpl implements TbShopTableService {
orderDetail.setOrderId(orderId); orderDetail.setOrderId(orderId);
} }
// 删除已经移除购物车的订单 修改并保存数据 // 删除已经移除购物车的订单 修改并保存数据
mpOrderDetailService.saveOrUpdateBatch(orderDetails); if (!orderDetails.isEmpty()) {
orderDetailMapper.deleteBatchIds(removeOrderDetailIds); mpOrderDetailService.saveOrUpdateBatch(orderDetails);
}
if (!removeOrderDetailIds.isEmpty()) {
orderDetailMapper.deleteBatchIds(removeOrderDetailIds);
}
// 更新购物车记录的orderId // 更新购物车记录的orderId