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

购物车列表展示已经退款的商品

Browse Source
This commit is contained in:
SongZhang
2024-10-10 10:12:43 +08:00
parent f0fe3fa75b
commit 078cd4a001
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java
View File

@@ -479,13 +479,14 @@ public class OrderService {
String day = DateUtils.getDay(); String day = DateUtils.getDay();
LambdaQueryWrapper<TbCashierCart> queryWrapper = new LambdaQueryWrapper<TbCashierCart>() LambdaQueryWrapper<TbCashierCart> queryWrapper = new LambdaQueryWrapper<TbCashierCart>()
.notIn(TbCashierCart::getStatus, "final", "refund", "closed", "pending") .notIn(TbCashierCart::getStatus, "final", "closed", "pending")
.eq(TbCashierCart::getUseType, shopEatTypeInfoDTO.getUseType()) .eq(TbCashierCart::getUseType, shopEatTypeInfoDTO.getUseType())
.eq(TbCashierCart::getShopId, shopId); .eq(TbCashierCart::getShopId, shopId);
// 普通点单 // 普通点单
if (StrUtil.isBlank(tableId)) { if (StrUtil.isBlank(tableId)) {
queryWrapper.eq(TbCashierCart::getMasterId, masterId) queryWrapper.eq(TbCashierCart::getMasterId, masterId)
.notIn(TbCashierCart::getStatus, "refund")
.eq(TbCashierCart::getTradeDay, day) .eq(TbCashierCart::getTradeDay, day)
.and(query -> query.isNull(TbCashierCart::getTableId).or().eq(TbCashierCart::getTableId, "")); .and(query -> query.isNull(TbCashierCart::getTableId).or().eq(TbCashierCart::getTableId, ""));
// 台桌点单 // 台桌点单