房间详情过滤首次下单

share-system/src/main/java/share/system/service/impl/SRoomServiceImpl.java

@@ -11,6 +11,7 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.util.ObjectUtils;
 import share.common.enums.DeviceType;
 import share.common.enums.RoleTypeEnum;
+import share.common.enums.YesNoEnum;
 import share.common.exception.base.BaseException;
 import share.common.utils.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -303,7 +304,10 @@ public class SRoomServiceImpl extends ServiceImpl<SRoomMapper, SRoom> implements
         SRoom room = sRoomMapper.selectById(id);
         SStore sStore = sStoreService.selectSStoreById(room.getStoreId());
         room.setOpenShopUuid(sStore.getOpenShopUuid());
-        room.setPackList(getPackByRoomId(room.getId()));
+        List<Long> packIds = roomPackService.selectPackListByRoomId(id);
+        //过滤首次下单套餐
+        List<SPack> packs = packService.selectPackListByIds(packIds);
+        room.setPackList(packs);
         SRoomVo vo = null;
         if (Objects.nonNull(room)) {
             vo = new SRoomVo();