购物车列表展示已经退款的商品
This commit is contained in:
parent
f0fe3fa75b
commit
078cd4a001
|
|
@ -479,13 +479,14 @@ public class OrderService {
|
|||
String day = DateUtils.getDay();
|
||||
|
||||
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::getShopId, shopId);
|
||||
|
||||
// 普通点单
|
||||
if (StrUtil.isBlank(tableId)) {
|
||||
queryWrapper.eq(TbCashierCart::getMasterId, masterId)
|
||||
.notIn(TbCashierCart::getStatus, "refund")
|
||||
.eq(TbCashierCart::getTradeDay, day)
|
||||
.and(query -> query.isNull(TbCashierCart::getTableId).or().eq(TbCashierCart::getTableId, ""));
|
||||
// 台桌点单
|
||||
|
|
|
|||
Loading…
Reference in New Issue