房间详情增加标签状态字段

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

@@ -51,7 +51,7 @@ public class SRoomController extends BaseController {
      */
     @ApiOperation(value = "房间详情")
     @RequestMapping(value = "/info", method = RequestMethod.GET)
-    public R<SRoomVo> getInfo(@RequestParam("id") Long id, @RequestParam("id") Long type) {
+    public R<SRoomVo> getInfo(@RequestParam("id") Long id, @RequestParam("type") Long type) {
         return R.ok(sRoomService.queryById(id, type));
     }
 

share-system/src/main/resources/mapper/system/RoomLabelMapper.xml

@@ -78,7 +78,7 @@
             #{promotionDuration}
         </if>
         <if test="promotionAmount != null ">and r.promotion_amount = #{promotionAmount}</if>
-        <if test="l.type != null ">and l.type = #{type}</if>
+        <if test="type != null ">and l.type = #{type}</if>
         order by l.duration,l.type desc
     </select>