在房间查询接口增加套餐信息

share-front/src/main/java/share/web/controller/system/SRoomController.java

 package share.web.controller.system;
 
-import java.util.Date;
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -15,6 +13,7 @@ import share.system.domain.SPack;
 import share.system.domain.SRoom;
 import share.system.domain.vo.RoomStatusVo;
 import share.system.domain.vo.SRoomVo;
+import share.system.service.IPackService;
 import share.system.service.ISRoomService;
 import share.common.core.page.TableDataInfo;
 import share.system.service.RoomStatusService;
@@ -35,6 +34,9 @@ public class SRoomController extends BaseController {
     @Autowired
     private RoomStatusService roomStatusService;
 
+    @Autowired
+    private IPackService packService;
+
     /**
      * 查询房间列表
      */
@@ -52,7 +54,7 @@ public class SRoomController extends BaseController {
     @ApiOperation(value = "房间详情")
     @RequestMapping(value = "/info", method = RequestMethod.GET)
     public R<SRoomVo> getInfo(@RequestParam("id") Long id) {
-        SRoom room = sRoomService.getById(id);
+        SRoom room = sRoomService.queryById(id);
         SRoomVo vo = null;
         if (Objects.nonNull(room)) {
             vo = new SRoomVo();

share-system/src/main/java/share/system/domain/SRoom.java

@@ -8,6 +8,7 @@ import share.common.annotation.Excel;
 import share.common.core.domain.BaseEntity;
 
 import java.math.BigDecimal;
+import java.util.List;
 
 /**
  * 房间对象 s_room
@@ -81,4 +82,12 @@ public class SRoom extends BaseEntity
     @TableField(exist = false)
     private String packIds;
 
+    /**
+     * 套餐集合
+     */
+    @TableField(exist = false)
+    private List<SPack> packList;
+
+
+
 }

share-system/src/main/java/share/system/domain/vo/SRoomVo.java

@@ -8,8 +8,10 @@ import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import share.common.annotation.Excel;
 import share.common.core.domain.BaseEntity;
+import share.system.domain.SPack;
 
 import java.math.BigDecimal;
+import java.util.List;
 
 /**
  * 房间对象 s_room
@@ -88,6 +90,14 @@ public class SRoomVo extends BaseEntity
     @TableField(exist = false)
     private String packIds;
 
+    /**
+     * 套餐列表
+     */
+    @TableField(exist = false)
+    private List<SPack> packList;
+
+
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

share-system/src/main/java/share/system/request/OrderComputedPriceRequest.java

 package share.system.request;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -42,11 +43,13 @@ public class OrderComputedPriceRequest {
     private Integer buyType;
 
     /** 预约开始时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
     @ApiModelProperty(value = "预约开始时间 yyyy-MM-dd HH:mm", required = true)
     @NotNull(message = "预约开始时间不能为空")
     private Date preStartDate;
 
     /** 预约结束时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
     @ApiModelProperty(value = "预约结束时间 yyyy-MM-dd HH:mm", required = true)
     @NotNull(message = "预约结束时间不能为空")
     private Date preEndDate;

share-system/src/main/java/share/system/service/ISRoomService.java

@@ -86,4 +86,6 @@ public interface ISRoomService extends IService<SRoom>
     String openDoor(Long id);
 
     List<SPack> getPackByRoomId(Long id);
+
+    SRoom queryById(Long id);
 }

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

@@ -72,7 +72,9 @@ public class SRoomServiceImpl extends ServiceImpl<SRoomMapper,SRoom> implements
     {
         List<SRoom> roomList = sRoomMapper.selectSRoomList(sRoom);
         roomList.forEach(o -> {
-            o.setPackIds(roomPackService.selectPackListByRoomId(o.getId()).stream().map(String::valueOf).collect(Collectors.joining(",")));
+            List<Long> roomId = roomPackService.selectPackListByRoomId(o.getId());
+            o.setPackIds(roomId.stream().map(String::valueOf).collect(Collectors.joining(",")));
+            o.setPackList(packService.selectPackListByIds(roomId));
         });
         return convertVoList(roomList);
     }
@@ -239,6 +241,13 @@ public class SRoomServiceImpl extends ServiceImpl<SRoomMapper,SRoom> implements
         return packService.selectPackListByIds(packIds);
     }
 
+    @Override
+    public SRoom queryById(Long id) {
+        SRoom room = sRoomMapper.selectById(id);
+        room.setPackList(getPackByRoomId(room.getId()));
+        return room;
+    }
+
 
     private List<SRoomVo> convertDoListToVoList(List<SRoom> roomList){
         List<SRoomVo> voList = new ArrayList<>();

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

@@ -21,10 +21,12 @@ import share.system.domain.*;
 import share.system.domain.vo.FrontTokenComponent;
 import share.system.domain.vo.SRoomVo;
 import share.system.domain.vo.SStoreVo;
+import share.system.mapper.RoomPackMapper;
 import share.system.mapper.SRoomMapper;
 import share.system.mapper.SStoreConsumerMapper;
 import share.system.mapper.SStoreMapper;
 import share.system.request.SStoreRequest;
+import share.system.service.IPackService;
 import share.system.service.ISRoomService;
 import share.system.service.ISStoreService;
 
@@ -42,6 +44,10 @@ public class SStoreServiceImpl extends ServiceImpl<SStoreMapper, SStore> impleme
     private SStoreConsumerMapper storeConsumerMapper;
     @Autowired
     private ISRoomService sRoomService;
+    @Autowired
+    private RoomPackMapper roomPackMapper;
+    @Autowired
+    private IPackService packService;
 
     /**
      * 查询门店
@@ -219,6 +225,8 @@ public class SStoreServiceImpl extends ServiceImpl<SStoreMapper, SStore> impleme
             List<SRoomVo> roomVoList = sRoomService.listByStoreIds(storeIds);
             voList.stream().forEach(storeVo -> {
                 storeVo.setRoomVoList(roomVoList.stream().filter(roomVo -> {
+                    List<Long> roomId = roomPackMapper.selectPackListByRoomId(roomVo.getId());
+                    roomVo.setPackList(packService.selectPackListByIds(roomId));
                     if (Long.compare(roomVo.getStoreId(), storeVo.getId()) == 0) {
                         return true;
                     }