切换就餐模式返回数据修改

This commit is contained in:
2024-10-10 15:22:17 +08:00
parent 1aa729dc91
commit 1d14546407

View File

@@ -1602,15 +1602,16 @@ public class CartService {
});
}else {
cashierCartList = new ArrayList<>();
String tableCartKey = RedisCst.getTableCartKey(choseEatModelDTO.getShopId().toString(), choseEatModelDTO.getTableId(), userId);
String message = redisUtil.getMessage(tableCartKey);
if (StrUtil.isNotBlank(message)) {
JSONObject.parseArray(message).forEach(item -> {
TbCashierCart cart = JSONObject.parseObject(item.toString(), TbCashierCart.class);
cashierCartList.add(cart);
});
}
// 查询购物车所有信息
ShopEatTypeInfoDTO shopEatTypeInfoDTO = shopUtils.checkEatModel(choseEatModelDTO.getTableId(), choseEatModelDTO.getShopId());
LambdaQueryWrapper<TbCashierCart> 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);
}
// 所有订单信息