修改了用户接口，修改了房间接口，新增了小程序会议接口等等

ics-admin/src/main/java/com/ics/admin/controller/meeting/RoomServeController.java

@@ -38,7 +38,7 @@ public class RoomServeController extends BaseController {
     /**
      * 查询服务列表
      */
-    @RequiresPermissions("meeting:serve:list")
+    @RequiresPermissions("meeting:roomServe:list")
     @GetMapping("list")
     public R list(RoomServe roomServe) {
         startPage();
@@ -49,7 +49,7 @@ public class RoomServeController extends BaseController {
     /**
      * 新增保存服务
      */
-    @RequiresPermissions("meeting:serve:add")
+    @RequiresPermissions("meeting:roomServe:add")
     @PostMapping("save")
     public R addSave(@RequestBody RoomServe roomServe) {
         return toAjax(roomServeService.insertRoomServe(roomServe));
@@ -58,7 +58,7 @@ public class RoomServeController extends BaseController {
     /**
      * 修改保存服务
      */
-    @RequiresPermissions("meeting:serve:edit")
+    @RequiresPermissions("meeting:roomServe:edit")
     @PostMapping("update")
     public R editSave(@RequestBody RoomServe roomServe) {
         return toAjax(roomServeService.updateRoomServe(roomServe));
@@ -67,7 +67,7 @@ public class RoomServeController extends BaseController {
     /**
      * 删除服务
      */
-    @RequiresPermissions("meeting:serve:remove")
+    @RequiresPermissions("meeting:roomServe:remove")
     @PostMapping("remove")
     public R remove(String ids) {
         return toAjax(roomServeService.deleteRoomServeByIds(ids));

ics-admin/src/main/java/com/ics/admin/domain/meeting/CustomerTicket.java

@@ -1,9 +1,12 @@
 package com.ics.admin.domain.meeting;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.ics.common.core.domain.BaseEntity;
 import lombok.Data;
 
+import java.util.Date;
+
 /**
  * 企业优惠卷关联对象 tb_customer_ticket
  * 
@@ -27,4 +30,15 @@ public class CustomerTicket extends BaseEntity<CustomerTicket> {
     /** 是否已经核销 */
     private Integer isVerification;
 
+    @TableField(exist = false)
+    private Date startTime;
+
+    /** 结束时间 */
+
+    @TableField(exist = false)
+    private Date endDate;
+
+    @TableField(exist = false)
+    private String ticketName;
+
 }

ics-admin/src/main/java/com/ics/admin/domain/meeting/RoomContent.java

@@ -1,9 +1,13 @@
 package com.ics.admin.domain.meeting;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.ics.common.core.domain.BaseEntity;
 import lombok.Data;
+
+import java.math.BigDecimal;
 import java.util.Date;
+import java.util.List;
 
 /**
  * 房间主体内容对象 tb_room_content
@@ -52,4 +56,23 @@ public class RoomContent extends BaseEntity<RoomContent> {
     /** 形状（U型，O型） */
     private String shape;
 
+
+    @TableField(exist = false)
+    private List<RoomItem> roomItemList;
+
+    @TableField(exist = false)
+    private String roomName;
+
+    @TableField(exist = false)
+    private String buildingName;
+
+    @TableField(exist = false)
+    private List<RoomServe> roomServeList;
+
+    @TableField(exist = false)
+    private BigDecimal area;
+
+    @TableField(exist = false)
+    private BigDecimal renArea;
+
 }

ics-admin/src/main/java/com/ics/admin/domain/meeting/RoomItem.java

@@ -33,7 +33,6 @@ public class RoomItem extends BaseEntity<RoomItem> {
     /** 备注 */
     private String remark;
 
-    /** 删除标志（0代表存在 2代表删除） */
+
-    private String delFlag;
 
 }

ics-admin/src/main/java/com/ics/admin/domain/meeting/Ticket.java

@@ -1,6 +1,7 @@
 package com.ics.admin.domain.meeting;
 
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ics.common.core.domain.BaseEntity;
 import lombok.Data;
 import java.util.Date;
@@ -38,10 +39,12 @@ public class Ticket extends BaseEntity<Ticket> {
     private Integer isShow;
 
     /** 开始时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date startTime;
 
     /** 结束时间 */
-    private String endTime;
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date endDate;
 
     /** 备注 */
     private String remark;

ics-admin/src/main/java/com/ics/admin/service/impl/meeting/CustomerTicketServiceImpl.java

@@ -2,9 +2,15 @@ package com.ics.admin.service.impl.meeting;
 
 import java.util.List;
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.lang.Assert;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ics.admin.domain.IcsCustomerStaff;
+import com.ics.admin.domain.meeting.Ticket;
+import com.ics.admin.mapper.IcsCustomerStaffMapper;
+import com.ics.admin.mapper.meeting.TicketMapper;
+import org.checkerframework.checker.units.qual.A;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ics.admin.mapper.meeting.CustomerTicketMapper;
@@ -22,6 +28,12 @@ public class CustomerTicketServiceImpl extends ServiceImpl<CustomerTicketMapper,
     @Autowired
     private CustomerTicketMapper customerTicketMapper;
 
+    @Autowired
+    private IcsCustomerStaffMapper customerStaffMapper;
+
+    @Autowired
+    private TicketMapper ticketMapper;
+
     /**
      * 查询企业优惠卷关联
      * 
@@ -89,4 +101,25 @@ public class CustomerTicketServiceImpl extends ServiceImpl<CustomerTicketMapper,
     public int deleteCustomerTicketById(Long id) {
         return customerTicketMapper.deleteCustomerTicketById(id);
     }
+
+    @Override
+    public List<CustomerTicket> getCustomerTicket(Long userId) {
+
+
+        IcsCustomerStaff icsCustomerStaff = customerStaffMapper.selectById(userId);
+        Assert.isTrue(icsCustomerStaff != null, "用户不存在，请联系管理员");
+
+
+        QueryWrapper<CustomerTicket> wrapper = new QueryWrapper<>();
+        wrapper.eq("customer_id", icsCustomerStaff.getIcsCustomerId());
+        List<CustomerTicket> customerTickets = customerTicketMapper.selectList(wrapper);
+        for (CustomerTicket customerTicket : customerTickets) {
+            Ticket ticket = ticketMapper.selectById(customerTicket.getTicketId());
+            customerTicket.setTicketName(ticket.getTitle());
+            customerTicket.setStartTime(ticket.getStartTime());
+            customerTicket.setEndDate(ticket.getEndDate());
+        }
+
+        return customerTickets;
+    }
 }

ics-admin/src/main/java/com/ics/admin/service/impl/meeting/RoomContentServiceImpl.java

@@ -1,16 +1,23 @@
 package com.ics.admin.service.impl.meeting;
 
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.lang.Assert;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ics.admin.domain.meeting.RoomContent;
+import com.ics.admin.domain.BuildingDetail;
+import com.ics.admin.domain.Room;
+import com.ics.admin.domain.meeting.*;
+import com.ics.admin.service.IBuildingDetailService;
+import com.ics.admin.service.IRoomService;
+import com.ics.admin.service.meeting.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ics.admin.mapper.meeting.RoomContentMapper;
 import com.ics.admin.domain.meeting.RoomContent;
-import com.ics.admin.service.meeting.IRoomContentService;
 
 /**
  * 房间主体内容Service业务层处理
@@ -23,6 +30,24 @@ public class RoomContentServiceImpl extends ServiceImpl<RoomContentMapper, RoomC
     @Autowired
     private RoomContentMapper roomContentMapper;
 
+    @Autowired
+    private IRoomItemByRoomService roomItemByRoomService;
+
+    @Autowired
+    private IRoomItemService roomItemService;
+
+    @Autowired
+    private IRoomService roomService;
+
+    @Autowired
+    private IBuildingDetailService buildingDetailService;
+
+    @Autowired
+    private IRoomServeService iRoomServeService;
+
+    @Autowired
+    private IRoomServeByRoomService iRoomServeByRoomService;
+
     /**
      * 查询房间主体内容
      * 
@@ -90,4 +115,67 @@ public class RoomContentServiceImpl extends ServiceImpl<RoomContentMapper, RoomC
     public int deleteRoomContentById(Long id) {
         return roomContentMapper.deleteRoomContentById(id);
     }
+
+    @Override
+    public List<RoomContent> selectApiRoomList(RoomContent roomContent) {
+
+        ArrayList<RoomItem> items = new ArrayList<>();
+        List<RoomContent> roomContents = roomContentMapper.selectList(new QueryWrapper<>(roomContent));
+        for (RoomContent content : roomContents) {
+            //查询房间号
+            Room room = roomService.selectRoomById(content.getRoomId());
+            if (room != null) {
+                content.setRoomName(room.getName());
+                //查询楼层号
+                BuildingDetail buildingDetail = buildingDetailService.selectBuildingDetailById(room.getBuildingDetailId());
+                if (buildingDetail != null) {
+                    content.setBuildingName(buildingDetail.getFloorName() +"F");
+                }
+            }
+            RoomItemByRoom roomItemByRoom = new RoomItemByRoom();
+            roomItemByRoom.setRoomContentId(content.getId());
+            List<RoomItemByRoom> roomItemByRooms = roomItemByRoomService.selectRoomItemByRoomList(roomItemByRoom);
+            if (CollUtil.isNotEmpty(roomItemByRooms)){
+                for (RoomItemByRoom itemByRoom : roomItemByRooms) {
+                    RoomItem roomItem = roomItemService.selectRoomItemById(itemByRoom.getItemId());
+                    items.add(roomItem);
+                }
+                content.setRoomItemList(items);
+            }
+        }
+        return roomContents;
+    }
+
+    @Override
+    public RoomContent selectInfoById(Long id) {
+        RoomContent roomContent = roomContentMapper.selectRoomContentById(id);
+        Assert.isTrue(roomContent != null, "未找到该房间信息");
+        //获取房间所有服务信息
+        RoomServeByRoom roomServeByRoom = new RoomServeByRoom();
+        roomServeByRoom.setRomeContentId(id);
+        List<RoomServe> roomServe1 = new ArrayList<>();
+        List<RoomServeByRoom> roomServeByRooms = iRoomServeByRoomService.selectRoomServeByRoomList(roomServeByRoom);
+        if (CollUtil.isNotEmpty(roomServeByRooms)){
+            for (RoomServeByRoom serveByRoom : roomServeByRooms) {
+                RoomServe roomServe = iRoomServeService.selectRoomServeById(serveByRoom.getServeId());
+                roomServe1.add(roomServe);
+            }
+            roomContent.setRoomServeList(roomServe1);
+        }
+        // 所在楼层，占地面积，办公面积
+        Room room = roomService.selectRoomById(roomContent.getRoomId());
+        if (room != null) {
+            roomContent.setRoomName(room.getName());
+            roomContent.setArea(room.getArea());
+            roomContent.setRenArea(room.getRentArea());
+            //查询楼层号
+            BuildingDetail buildingDetail = buildingDetailService.selectBuildingDetailById(room.getBuildingDetailId());
+            if (buildingDetail != null) {
+                roomContent.setBuildingName(buildingDetail.getFloorName() +"F");
+            }
+        }
+
+        return roomContent;
+
+    }
 }

ics-admin/src/main/java/com/ics/admin/service/meeting/ICustomerTicketService.java

@@ -58,4 +58,7 @@ public interface ICustomerTicketService extends IService<CustomerTicket> {
      * @return 结果
      */
     int deleteCustomerTicketById(Long id);
+
+    List<CustomerTicket> getCustomerTicket(Long userId);
+
 }

ics-admin/src/main/java/com/ics/admin/service/meeting/IRoomContentService.java

@@ -58,4 +58,8 @@ public interface IRoomContentService extends IService<RoomContent> {
      * @return 结果
      */
     int deleteRoomContentById(Long id);
+
+    List<RoomContent> selectApiRoomList(RoomContent roomContent);
+
+    RoomContent selectInfoById(Long id);
 }

ics-admin/src/main/resources/mapper/admin/IcsCustomerStaffMapper.xml

@@ -41,6 +41,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>
             <if test="username != null  and username != ''"> AND username LIKE CONCAT('%', #{username}, '%') </if>
             <if test="icsCustomerId != null  and icsCustomerId != ''"> AND ics_customer_id = #{icsCustomerId} </if>
+            <if test="mobile != null  and mobile != ''"> AND mobile = #{mobile} </if>
         </where>
     </select>
 

ics-admin/src/main/resources/mapper/admin/meeting/RoomItemMapper.xml

@@ -12,7 +12,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="picUrl"    column="pic_url"    />
         <result property="fileUrl"    column="file_url"    />
         <result property="remark"    column="remark"    />
-        <result property="delFlag"    column="del_flag"    />
+        <result property="deleteFlag"    column="delete_flag"    />
         <result property="createBy"    column="create_by"    />
         <result property="createTime"    column="create_time"    />
         <result property="updateBy"    column="update_by"    />
@@ -20,7 +20,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectRoomItemVo">
-        SELECT id, name, brand, specification, pic_url, file_url, remark, del_flag, create_by, create_time, update_by, update_time FROM tb_room_item
+        SELECT id, name, brand, specification, pic_url, file_url, remark, delete_flag, create_by, create_time, update_by, update_time FROM tb_room_item
     </sql>
 
     <select id="selectRoomItemList" parameterType="RoomItem" resultMap="RoomItemResult">
@@ -44,7 +44,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="picUrl != null  and picUrl != ''">pic_url,</if>
             <if test="fileUrl != null  and fileUrl != ''">file_url,</if>
             <if test="remark != null  and remark != ''">remark,</if>
-            <if test="delFlag != null  and delFlag != ''">del_flag,</if>
             <if test="createBy != null  and createBy != ''">create_by,</if>
             <if test="createTime != null ">create_time,</if>
             <if test="updateBy != null  and updateBy != ''">update_by,</if>
@@ -57,7 +56,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="picUrl != null  and picUrl != ''">#{picUrl},</if>
             <if test="fileUrl != null  and fileUrl != ''">#{fileUrl},</if>
             <if test="remark != null  and remark != ''">#{remark},</if>
-            <if test="delFlag != null  and delFlag != ''">#{delFlag},</if>
             <if test="createBy != null  and createBy != ''">#{createBy},</if>
             <if test="createTime != null ">#{createTime},</if>
             <if test="updateBy != null  and updateBy != ''">#{updateBy},</if>
@@ -74,7 +72,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="picUrl != null  and picUrl != ''">pic_url = #{picUrl},</if>
             <if test="fileUrl != null  and fileUrl != ''">file_url = #{fileUrl},</if>
             <if test="remark != null  and remark != ''">remark = #{remark},</if>
-            <if test="delFlag != null  and delFlag != ''">del_flag = #{delFlag},</if>
             <if test="createBy != null  and createBy != ''">create_by = #{createBy},</if>
             <if test="createTime != null ">create_time = #{createTime},</if>
             <if test="updateBy != null  and updateBy != ''">update_by = #{updateBy},</if>

ics-admin/src/main/resources/mapper/admin/meeting/TicketMapper.xml

@@ -14,7 +14,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="isVerification"    column="is_verification"    />
         <result property="isShow"    column="is_show"    />
         <result property="startTime"    column="start_time"    />
-        <result property="endTime"    column="end_time"    />
+        <result property="endDate"    column="end_date"    />
         <result property="remark"    column="remark"    />
         <result property="isDefault"    column="is_default"    />
         <result property="version"    column="version"    />
@@ -26,7 +26,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectTicketVo">
-        SELECT id, title, content, type, money, address, is_verification, is_show, start_time, end_time, remark, is_default, version, delete_flag, create_by, create_time, update_by, update_time FROM tb_ticket
+        SELECT id, title, content, type, money, address, is_verification, is_show, start_time, end_date, remark, is_default, version, delete_flag, create_by, create_time, update_by, update_time FROM tb_ticket
     </sql>
 
     <select id="selectTicketList" parameterType="Ticket" resultMap="TicketResult">
@@ -51,7 +51,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="isVerification != null ">is_verification,</if>
             <if test="isShow != null ">is_show,</if>
             <if test="startTime != null ">start_time,</if>
-            <if test="endTime != null ">end_time,</if>
+            <if test="endDate != null ">end_date,</if>
             <if test="remark != null  and remark != ''">remark,</if>
             <if test="isDefault != null ">is_default,</if>
             <if test="version != null ">version,</if>
@@ -70,7 +70,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="isVerification != null ">#{isVerification},</if>
             <if test="isShow != null ">#{isShow},</if>
             <if test="startTime != null ">#{startTime},</if>
-            <if test="endTime != null ">#{endTime},</if>
+            <if test="endDate != null ">#{endDate},</if>
             <if test="remark != null  and remark != ''">#{remark},</if>
             <if test="isDefault != null ">#{isDefault},</if>
             <if test="version != null ">#{version},</if>
@@ -93,7 +93,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="isVerification != null ">is_verification = #{isVerification},</if>
             <if test="isShow != null ">is_show = #{isShow},</if>
             <if test="startTime != null ">start_time = #{startTime},</if>
-            <if test="endTime != null ">end_time = #{endTime},</if>
+            <if test="endDate != null ">end_DATE = #{endDate},</if>
             <if test="remark != null  and remark != ''">remark = #{remark},</if>
             <if test="isDefault != null ">is_default = #{isDefault},</if>
             <if test="version != null ">version = #{version},</if>

ics-common/ics-common-core/src/main/java/com/ics/common/core/domain/BaseEntity.java

@@ -32,8 +32,9 @@ public class BaseEntity<T> implements Serializable {
     /**
      * 版本
      */
-    @Version
+    @TableField(exist = false)
-    @TableField(fill = FieldFill.INSERT_UPDATE)
+//    @Version
+//    @TableField(fill = FieldFill.INSERT_UPDATE)
     private Integer version;
 
     /**
@@ -59,13 +60,13 @@ public class BaseEntity<T> implements Serializable {
     /**
      * 更新者
      */
-    @TableField(fill = FieldFill.UPDATE)
+    @TableField(fill = FieldFill.UPDATE,exist = false)
     private String updateBy;
 
     /**
      * 更新时间
      */
-    @TableField(fill = FieldFill.UPDATE)
+    @TableField(fill = FieldFill.UPDATE,exist = false)
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date updateTime;
 
@@ -79,7 +80,7 @@ public class BaseEntity<T> implements Serializable {
     /**
      * 关联园区ID
      */
-//    @TableField(fill = FieldFill.INSERT,exist = false)
+//    @TableField(fill = FieldFill.INSERT)
     @TableField(exist = false)
     private Long parkId;
 

ics-system/src/main/java/com/ics/system/domain/User.java

@@ -165,6 +165,9 @@ public class User extends BaseEntity<User> {
      */
     private Set<String> buttons;
 
+
+    private Long staffId;
+
     /**
      * 在线用户记录
      */

ics-system/src/main/java/com/ics/system/handlers/MyParkLineHandler.java

@@ -22,7 +22,8 @@ public class MyParkLineHandler implements TenantLineHandler {
     private static final String[] tableList = {"tables", "columns", "sys_tenant", "ics_park", "sys_config", "sys_dict_type", "sys_dict_data", "sys_districts",
             "sys_job", "sys_job_log", "sys_login_info", "sys_menu", "sys_notice", "sys_oper_log", "sys_oss", "sys_role", "sys_role_dept", "sys_role_menu",
             "sys_sn", "sys_user_role", "sys_dept", "ics_customer_contract_room", "ics_park", "ics_apply_room", "ics_customer_contract_refund_room",  "ics_apply_park_file",
-            "ics_apply_settle_file", "ics_apply_move_in_file", "ics_activity","ics_customer_staff"};
+            "ics_apply_settle_file", "ics_apply_move_in_file", "ics_activity","ics_customer_staff",
+            "tb_room_content","tb_room_item","tb_room_item_by_room"};
 
     /**
      * 多租户标识

ics-system/src/main/java/com/ics/system/handlers/MyTenantLineHandler.java

@@ -22,7 +22,8 @@ public class MyTenantLineHandler implements TenantLineHandler {
     private static final String[] tableList = {"tables", "columns", "sys_tenant", "sys_config", "sys_role", "sys_dict_type", "sys_dict_data", "sys_districts",
             "sys_job", "sys_job_log", "sys_login_info", "sys_menu", "sys_notice", "sys_oper_log", "sys_oss", "sys_role_dept", "sys_role_menu",
             "sys_sn", "sys_user_role", "ics_customer_contract_room", "ics_apply_room", "ics_customer_contract_refund_room", "ics_apply_park_file",
-            "ics_apply_settle_file", "ics_apply_move_in_file", "ics_activity","ics_customer_staff"};
+            "ics_apply_settle_file", "ics_apply_move_in_file", "ics_activity","ics_customer_staff",
+            "tb_room_content","tb_room_item","tb_room_item_by_room"};
 
     /**
      * 多租户标识

ics-system/src/main/resources/mapper/system/UserMapper.xml

@@ -28,6 +28,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<result property="deptId"       column="dept_id"      	/>
 		<result property="parkId"       column="park_id"      	/>
 		<result property="tenantId"       column="tenant_id"    />
+		<result property="staffId"       column="staff_id"    />
 		<association property="dept" column="id" javaType="com.ics.system.domain.Dept" resultMap="deptResult" />
 		<collection  property="roles" javaType="java.util.List" resultMap="RoleResult" />
 		<collection  property="roleIds" javaType="java.util.List" resultMap="RoleIdsResult" />
@@ -72,6 +73,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			   u.create_time,
                u.tenant_id,
                u.park_id,
+               u.staff_id,
 			   d.id AS dept_id,
 			   d.parent_id,
 			   d.dept_name,
@@ -110,6 +112,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			   u.create_by,
 			   u.create_time,
 		       u.park_id,
+		       u.staff_id,
 			   d.dept_name,
 			   NULL AS role_id
 		FROM sys_user u
@@ -151,6 +154,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 u.email,
                 u.mobile,
                 u.status,
+                u.staff_id,
                 u.create_time
 		FROM sys_user u
 				 LEFT JOIN sys_dept d
@@ -180,6 +184,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 u.email,
                 u.mobile,
                 u.status,
+                u.staff_id,
                 u.create_time
 		FROM sys_user u
 				 LEFT JOIN sys_dept d ON u.dept_id = d.id
@@ -291,6 +296,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="salt != null and salt != ''">salt,</if>
  			<if test="status != null and status != ''">status,</if>
  			<if test="createBy != null and createBy != ''">create_by,</if>
+ 			<if test="staffId != null and staffId != ''">staff_id,</if>
  		    version,
             delete_flag,
  			create_time
@@ -311,6 +317,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="salt != null and salt != ''">#{salt},</if>
  			<if test="status != null and status != ''">#{status},</if>
  			<if test="createBy != null and createBy != ''">#{createBy},</if>
+ 			<if test="staffId != null and staffId != ''">#{staffId},</if>
  		    0,
  		    0,
  			sysdate()
@@ -335,6 +342,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<if test="salt != null and salt != ''">salt,</if>
 		<if test="status != null and status != ''">status,</if>
 		<if test="createBy != null and createBy != ''">create_by,</if>
+		<if test="staffId != null and staffId != ''">staff_id,</if>
 		version,
 		delete_flag,
 		create_time
@@ -355,6 +363,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<if test="salt != null and salt != ''">#{salt},</if>
 		<if test="status != null and status != ''">#{status},</if>
 		<if test="createBy != null and createBy != ''">#{createBy},</if>
+		<if test="staffId != null and staffId != ''">#{staffId},</if>
 		0,
 		0,
 		sysdate()
@@ -380,6 +389,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="loginDate != null">login_date = #{loginDate},</if>
 			<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
 			<if test="deleteFlag != null">delete_flag = #{deleteFlag},</if>
+			<if test="staffId != null">staff_id = #{staffId},</if>
 			update_time = sysdate()
 		</set>
 		WHERE id = #{id}

ics-web/src/main/java/com/ics/controller/mobile/meeting/ApiRoomContentController.java

@@ -1,32 +1,80 @@
 package com.ics.controller.mobile.meeting;
 
+import cn.hutool.core.collection.CollUtil;
+import com.ics.admin.domain.meeting.CustomerTicket;
 import com.ics.admin.domain.meeting.RoomContent;
+import com.ics.admin.domain.meeting.RoomItem;
+import com.ics.admin.domain.meeting.RoomItemByRoom;
+import com.ics.admin.service.IRoomService;
+import com.ics.admin.service.meeting.ICustomerTicketService;
 import com.ics.admin.service.meeting.IRoomContentService;
+import com.ics.admin.service.meeting.IRoomItemByRoomService;
+import com.ics.admin.service.meeting.IRoomItemService;
 import com.ics.common.core.controller.BaseController;
 import com.ics.common.core.domain.R;
+import org.checkerframework.checker.units.qual.A;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.ArrayList;
 import java.util.List;
 
 @RestController
-@RequestMapping("/roomContent")
+@RequestMapping("/api/roomContent")
 public class ApiRoomContentController extends BaseController {
 
     @Autowired
     private IRoomContentService roomContentService;
 
+    @Autowired
+    private IRoomItemByRoomService roomItemByRoomService;
+
+    @Autowired
+    private IRoomItemService roomItemService;
+
+    @Autowired
+    private ICustomerTicketService customerTicketService;
+
 
     /**
      * 获取房间内容
      */
     @GetMapping("list")
     public R list(RoomContent roomContent) {
-        List<RoomContent> roomContents = roomContentService.selectRoomContentList(roomContent);
+        List<RoomContent> roomContents = roomContentService.selectApiRoomList(roomContent);
+
 
         return result(roomContents);
     }
 
+
+    /**
+     * 获取房间详情信息
+     */
+    @GetMapping("info/{id}")
+    public R infoById(@PathVariable("id") Long id) {
+        RoomContent roomContents = roomContentService.selectInfoById(id);
+
+
+        return R.ok().put("roomContent", roomContents);
+    }
+
+    /**
+     * 优惠卷列表
+     */
+    @GetMapping("getCustomerTicket/{userId}")
+    public R getCustomerTicket(@PathVariable("userId") Long userId) {
+//        RoomContent roomContents = roomContentService.selectInfoById(id);
+
+        //根据用户获取对应的企业id，查询该企业下对应的优惠卷
+
+        List<CustomerTicket> list = customerTicketService.getCustomerTicket(userId);
+
+
+        return R.ok().put("data",list);
+    }
+
 }