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-11 10:17:07 +08:00
parent cb2622591c
commit 95ac672597
1 changed files with 10 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -478,26 +478,19 @@ public class OrderService {
ShopEatTypeInfoDTO shopEatTypeInfoDTO = checkEatModel(Integer.valueOf(shopId), eatModel); ShopEatTypeInfoDTO shopEatTypeInfoDTO = checkEatModel(Integer.valueOf(shopId), eatModel);
String day = DateUtils.getDay(); String day = DateUtils.getDay();
String finalMasterId1 = masterId;
LambdaQueryWrapper<TbCashierCart> queryWrapper = new LambdaQueryWrapper<TbCashierCart>() LambdaQueryWrapper<TbCashierCart> queryWrapper = new LambdaQueryWrapper<TbCashierCart>()
.notIn(TbCashierCart::getStatus, "final", "closed", "pending") .in(TbCashierCart::getStatus, "create", "return")
.eq(TbCashierCart::getShopId, shopId)
.eq(TbCashierCart::getUseType, shopEatTypeInfoDTO.getUseType()) .eq(TbCashierCart::getUseType, shopEatTypeInfoDTO.getUseType())
.eq(TbCashierCart::getShopId, shopId); .gt(TbCashierCart::getCreatedAt, DateUtil.offsetDay(DateUtil.date(), -1).getTime())
.and(q -> q.eq(TbCashierCart::getMasterId, finalMasterId1).or().isNull(TbCashierCart::getMasterId));
// 普通点单 if (!shopEatTypeInfoDTO.isTakeout()) {
if (StrUtil.isBlank(tableId)) { queryWrapper.eq(TbCashierCart::getTableId, tableId);
queryWrapper.eq(TbCashierCart::getMasterId, masterId) } else {
.notIn(TbCashierCart::getStatus, "refund") queryWrapper.and(q -> q.isNull(TbCashierCart::getTableId).or().eq(TbCashierCart::getTableId, ""))
.eq(TbCashierCart::getTradeDay, day) .in(TbCashierCart::getPlatformType, OrderPlatformTypeEnum.PC.getValue(), OrderPlatformTypeEnum.CASH.getValue());
.and(query -> query.isNull(TbCashierCart::getTableId).or().eq(TbCashierCart::getTableId, ""));
// 台桌点单
} else if (StrUtil.isNotBlank(tableId)) {
String finalMasterId = masterId;
queryWrapper.eq(TbCashierCart::getTableId, tableId)
.and(query -> query.eq(TbCashierCart::getMasterId, finalMasterId)
.or()
.isNull(TbCashierCart::getMasterId)
.or()
.eq(TbCashierCart::getMasterId, ""));
} }
List<TbCashierCart> list = mpCashierCartMapper.selectList(queryWrapper); List<TbCashierCart> list = mpCashierCartMapper.selectList(queryWrapper);