切换就餐模式返回数据修改
This commit is contained in:
@@ -1602,15 +1602,16 @@ public class CartService {
|
|||||||
});
|
});
|
||||||
|
|
||||||
}else {
|
}else {
|
||||||
cashierCartList = new ArrayList<>();
|
// 查询购物车所有信息
|
||||||
String tableCartKey = RedisCst.getTableCartKey(choseEatModelDTO.getShopId().toString(), choseEatModelDTO.getTableId(), userId);
|
ShopEatTypeInfoDTO shopEatTypeInfoDTO = shopUtils.checkEatModel(choseEatModelDTO.getTableId(), choseEatModelDTO.getShopId());
|
||||||
String message = redisUtil.getMessage(tableCartKey);
|
LambdaQueryWrapper<TbCashierCart> queryWrapper = new LambdaQueryWrapper<TbCashierCart>()
|
||||||
if (StrUtil.isNotBlank(message)) {
|
.eq(TbCashierCart::getShopId, choseEatModelDTO.getShopId())
|
||||||
JSONObject.parseArray(message).forEach(item -> {
|
.gt(TbCashierCart::getCreatedAt, DateUtil.offsetDay(DateUtil.date(), -1).getTime())
|
||||||
TbCashierCart cart = JSONObject.parseObject(item.toString(), TbCashierCart.class);
|
.isNull(TbCashierCart::getOrderId)
|
||||||
cashierCartList.add(cart);
|
.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);
|
||||||
}
|
}
|
||||||
|
|
||||||
// 所有订单信息
|
// 所有订单信息
|
||||||
|
|||||||
Reference in New Issue
Block a user