就餐模式获取调整

This commit is contained in:
2024-09-27 09:12:14 +08:00
parent 6686f0c549
commit 1b88298536

View File

@@ -121,7 +121,7 @@ public class TbShopTableServiceImpl implements TbShopTableService {
List<TbOrderInfo> orderInfoList = orderInfoMapper.selectPage(new com.baomidou.mybatisplus.extension.plugins.pagination.Page<>(1, 1), new LambdaQueryWrapper<TbOrderInfo>()
.eq(TbOrderInfo::getStatus, "unpaid")
.eq(TbOrderInfo::getUseType, eatTypeInfoDTO.getUseType())
.eq(TbOrderInfo::getShopId, eatTypeInfoDTO.getShopInfo().getId())
.eq(TbOrderInfo::getShopId, eatTypeInfoDTO.getShopId())
.eq(TbOrderInfo::getTableId, eatTypeInfoDTO.getTableId())
.eq(TbOrderInfo::getTradeDay, DateUtils.getDay())
.orderByDesc(TbOrderInfo::getId)).getRecords();
@@ -156,7 +156,7 @@ public class TbShopTableServiceImpl implements TbShopTableService {
* @return 就餐类型信息
*/
public ShopEatTypeInfoDTO checkEatModel(Object shopId, Object tableId) {
String eatModel = StrUtil.isBlank(tableId.toString()) ? ShopInfoEatModelEnum.TAKE_OUT.getValue() : ShopInfoEatModelEnum.DINE_IN.getValue();
String eatModel = StrUtil.isBlank(tableId == null ? "" : tableId.toString()) ? ShopInfoEatModelEnum.TAKE_OUT.getValue() : ShopInfoEatModelEnum.DINE_IN.getValue();
return getShopEatTypeInfoDTO(shopId, eatModel, tableId);
}