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

fix: 就餐模式接口修改

Browse Source
This commit is contained in:
张松
2024-11-12 13:45:12 +08:00
parent dfdf02ffbe
commit f4d364fd21
1 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java
View File

@@ -1541,13 +1541,25 @@ public class CartService {
} else { } else {
// 查询购物车所有信息 // 查询购物车所有信息
LambdaQueryWrapper<TbCashierCart> queryWrapper = new LambdaQueryWrapper<TbCashierCart>() LambdaQueryWrapper<TbCashierCart> queryWrapper;
.eq(TbCashierCart::getShopId, choseEatModelDTO.getShopId()) if (StrUtil.isBlank(choseEatModelDTO.getTableId())) {
.gt(TbCashierCart::getCreatedAt, DateUtil.offsetDay(DateUtil.date(), -1).getTime()) queryWrapper = new LambdaQueryWrapper<TbCashierCart>()
.isNull(TbCashierCart::getOrderId) .eq(TbCashierCart::getShopId, choseEatModelDTO.getShopId())
.eq(TbCashierCart::getTableId, choseEatModelDTO.getTableId()) .gt(TbCashierCart::getCreatedAt, DateUtil.offsetDay(DateUtil.date(), -1).getTime())
.and(q -> q.eq(TbCashierCart::getUseType, shopEatTypeInfoDTO.getUseType()).or().isNull(TbCashierCart::getUseType).or().eq(TbCashierCart::getUseType, "")) .isNull(TbCashierCart::getOrderId)
.eq(TbCashierCart::getStatus, "create"); .eq(TbCashierCart::getUserId, choseEatModelDTO.getUserId())
// .eq(TbCashierCart::getTableId, choseEatModelDTO.getTableId())
.and(q -> q.eq(TbCashierCart::getUseType, shopEatTypeInfoDTO.getUseType()).or().isNull(TbCashierCart::getUseType).or().eq(TbCashierCart::getUseType, ""))
.eq(TbCashierCart::getStatus, "create");
}else {
queryWrapper = new LambdaQueryWrapper<TbCashierCart>()
.eq(TbCashierCart::getShopId, choseEatModelDTO.getShopId())
.gt(TbCashierCart::getCreatedAt, DateUtil.offsetDay(DateUtil.date(), -1).getTime())
.isNull(TbCashierCart::getOrderId)
.eq(TbCashierCart::getTableId, choseEatModelDTO.getTableId())
.and(q -> q.eq(TbCashierCart::getUseType, shopEatTypeInfoDTO.getUseType()).or().isNull(TbCashierCart::getUseType).or().eq(TbCashierCart::getUseType, ""))
.eq(TbCashierCart::getStatus, "create");
}
cashierCartList = mpCashierCartMapper.selectList(queryWrapper); cashierCartList = mpCashierCartMapper.selectList(queryWrapper);
} }