|
|
@@ -9,16 +9,17 @@ import lombok.extern.slf4j.Slf4j;
|
|
|
import org.springframework.beans.BeanUtils;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
-import shop.alien.entity.store.UserReservation;
|
|
|
-import shop.alien.entity.store.UserReservationTable;
|
|
|
+import shop.alien.entity.store.*;
|
|
|
import shop.alien.entity.store.dto.UserReservationDTO;
|
|
|
import shop.alien.entity.store.vo.UserReservationVo;
|
|
|
import shop.alien.mapper.UserReservationMapper;
|
|
|
import shop.alien.mapper.UserReservationTableMapper;
|
|
|
+import shop.alien.store.service.StoreBookingCategoryService;
|
|
|
+import shop.alien.store.service.StoreBookingSettingsService;
|
|
|
+import shop.alien.store.service.StoreBookingTableService;
|
|
|
import shop.alien.store.service.UserReservationService;
|
|
|
|
|
|
-import java.util.Date;
|
|
|
-import java.util.List;
|
|
|
+import java.util.*;
|
|
|
import java.util.concurrent.ThreadLocalRandom;
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
@@ -35,6 +36,12 @@ public class UserReservationServiceImpl extends ServiceImpl<UserReservationMappe
|
|
|
|
|
|
private final UserReservationTableMapper userReservationTableMapper;
|
|
|
|
|
|
+ private final StoreBookingSettingsService storeBookingSettingsService;
|
|
|
+
|
|
|
+ private final StoreBookingTableService storeBookingTableService;
|
|
|
+
|
|
|
+ private final StoreBookingCategoryService storeBookingCategoryService;
|
|
|
+
|
|
|
private static final int STATUS_PENDING = 0;
|
|
|
|
|
|
@Override
|
|
|
@@ -127,6 +134,20 @@ public class UserReservationServiceImpl extends ServiceImpl<UserReservationMappe
|
|
|
return list.stream().map(this::toVoWithTableIds).collect(Collectors.toList());
|
|
|
}
|
|
|
|
|
|
+ @Override
|
|
|
+ public Map<String, Object> getBookingsByStoreId(Integer storeId) {
|
|
|
+ Map<String, Object> list = new HashMap<>();
|
|
|
+ //通过storeId查询商家预设的预订信息状态
|
|
|
+ LambdaQueryWrapper<StoreBookingSettings> eq = new LambdaQueryWrapper<StoreBookingSettings>().eq(StoreBookingSettings::getStoreId, storeId);
|
|
|
+ List<StoreBookingSettings> storeBookingSettings = storeBookingSettingsService.list(eq);
|
|
|
+ list.put("storeBookingSettings", storeBookingSettings);
|
|
|
+ List<StoreBookingTable> storeBookingTables = storeBookingTableService.list(new LambdaQueryWrapper<StoreBookingTable>().eq(StoreBookingTable::getStoreId, storeId));
|
|
|
+ list.put("storeBookingTables", storeBookingTables);
|
|
|
+ List<StoreBookingCategory> storeBookingCategorys = storeBookingCategoryService.list(new LambdaQueryWrapper<StoreBookingCategory>().eq(StoreBookingCategory::getStoreId, storeId));
|
|
|
+ list.put("storeBookingCategorys", storeBookingCategorys);
|
|
|
+ return list;
|
|
|
+ }
|
|
|
+
|
|
|
private LambdaQueryWrapper<UserReservation> buildListWrapper(Integer userId, Integer storeId, Integer status,
|
|
|
Date dateFrom, Date dateTo) {
|
|
|
LambdaQueryWrapper<UserReservation> wrapper = new LambdaQueryWrapper<>();
|