Bladeren bron

Merge branch 'master' of http://49.4.53.36:3000/hotel/hotel-saas-backend

WIN-B904R0U0NNS\Administrator 2 jaren geleden
bovenliggende
commit
b36e00db9c
12 gewijzigde bestanden met toevoegingen van 660 en 0 verwijderingen
  1. 201 0
      jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/order/controller/CesOrderCommentController.java
  2. 183 0
      jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/order/controller/CesOrderMessageController.java
  3. 86 0
      jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/order/entity/CesOrderComment.java
  4. 82 0
      jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/order/entity/CesOrderMessage.java
  5. 17 0
      jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/order/mapper/CesOrderCommentMapper.java
  6. 17 0
      jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/order/mapper/CesOrderMessageMapper.java
  7. 5 0
      jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/order/mapper/xml/CesOrderCommentMapper.xml
  8. 5 0
      jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/order/mapper/xml/CesOrderMessageMapper.xml
  9. 13 0
      jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/order/service/ICesOrderCommentService.java
  10. 14 0
      jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/order/service/ICesOrderMessageService.java
  11. 18 0
      jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/order/service/impl/CesOrderCommentServiceImpl.java
  12. 19 0
      jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/order/service/impl/CesOrderMessageServiceImpl.java

+ 201 - 0
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/order/controller/CesOrderCommentController.java

@@ -0,0 +1,201 @@
+package org.jeecg.modules.order.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import org.apache.commons.lang3.ObjectUtils;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.util.oConvertUtils;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+
+import org.jeecg.modules.business.entity.BusHotel;
+import org.jeecg.modules.business.entity.BusMemberCard;
+import org.jeecg.modules.business.service.IBusHotelService;
+import org.jeecg.modules.order.entity.CesOrderComment;
+import org.jeecg.modules.order.service.ICesOrderCommentService;
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+import com.alibaba.fastjson.JSON;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+
+ /**
+ * @Description: ces_order_comment
+ * @Author: jeecg-boot
+ * @Date:   2023-03-24
+ * @Version: V1.0
+ */
+@Api(tags="ces_order_comment")
+@RestController
+@RequestMapping("/order/cesOrderComment")
+@Slf4j
+public class CesOrderCommentController extends JeecgController<CesOrderComment, ICesOrderCommentService> {
+	@Autowired
+	private ICesOrderCommentService cesOrderCommentService;
+
+	 @Autowired
+	 private IBusHotelService busHotelService;
+	/**
+	 * 分页列表查询
+	 *
+	 * @param cesOrderComment
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "ces_order_comment-分页列表查询")
+	@ApiOperation(value="ces_order_comment-分页列表查询", notes="ces_order_comment-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<CesOrderComment>> queryPageList(CesOrderComment cesOrderComment,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+														@RequestParam(name="hotelIds[]",required = false) List<String> hotelIds,
+								   HttpServletRequest req) {
+		LambdaQueryWrapper<CesOrderComment> queryWrapper = QueryGenerator.initQueryWrapper(cesOrderComment, req.getParameterMap()).lambda();
+		;
+		if (ObjectUtils.isNotEmpty(hotelIds)) {
+			queryWrapper.and(j -> {
+				for (int k = 0; k < hotelIds.size(); k++) {
+					j = j.or().eq(CesOrderComment::getHotelId, hotelIds.get(k));
+				}
+			});
+		}
+		Page<CesOrderComment> page = new Page<CesOrderComment>(pageNo, pageSize);
+		IPage<CesOrderComment> pageList = cesOrderCommentService.page(page, queryWrapper);
+		pageList.getRecords().forEach(item -> {
+			BusHotel hotle = busHotelService.getById(item.getHotelId());
+			if (hotle != null) {
+				item.setHotelName(hotle.getName());
+			}
+		});
+		return Result.OK(pageList);
+	}
+	
+	/**
+	 *   添加
+	 *
+	 * @param cesOrderComment
+	 * @return
+	 */
+	@AutoLog(value = "ces_order_comment-添加")
+	@ApiOperation(value="ces_order_comment-添加", notes="ces_order_comment-添加")
+	//@RequiresPermissions("order:ces_order_comment:add")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody CesOrderComment cesOrderComment) {
+		cesOrderCommentService.save(cesOrderComment);
+		return Result.OK("添加成功!");
+	}
+	
+	/**
+	 *  编辑
+	 *
+	 * @param cesOrderComment
+	 * @return
+	 */
+	@AutoLog(value = "ces_order_comment-编辑")
+	@ApiOperation(value="ces_order_comment-编辑", notes="ces_order_comment-编辑")
+	//@RequiresPermissions("order:ces_order_comment:edit")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody CesOrderComment cesOrderComment) {
+		cesOrderCommentService.updateById(cesOrderComment);
+		return Result.OK("编辑成功!");
+	}
+	
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "ces_order_comment-通过id删除")
+	@ApiOperation(value="ces_order_comment-通过id删除", notes="ces_order_comment-通过id删除")
+	//@RequiresPermissions("order:ces_order_comment:delete")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		cesOrderCommentService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+	
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "ces_order_comment-批量删除")
+	@ApiOperation(value="ces_order_comment-批量删除", notes="ces_order_comment-批量删除")
+	//@RequiresPermissions("order:ces_order_comment:deleteBatch")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.cesOrderCommentService.removeByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+	
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	//@AutoLog(value = "ces_order_comment-通过id查询")
+	@ApiOperation(value="ces_order_comment-通过id查询", notes="ces_order_comment-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<CesOrderComment> queryById(@RequestParam(name="id",required=true) String id) {
+		CesOrderComment cesOrderComment = cesOrderCommentService.getById(id);
+		if(cesOrderComment==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(cesOrderComment);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param cesOrderComment
+    */
+    //@RequiresPermissions("order:ces_order_comment:exportXls")
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, CesOrderComment cesOrderComment) {
+        return super.exportXls(request, cesOrderComment, CesOrderComment.class, "ces_order_comment");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    //@RequiresPermissions("order:ces_order_comment:importExcel")
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, CesOrderComment.class);
+    }
+
+}

+ 183 - 0
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/order/controller/CesOrderMessageController.java

@@ -0,0 +1,183 @@
+package org.jeecg.modules.order.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import org.apache.commons.lang3.ObjectUtils;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.query.QueryGenerator;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+
+import org.jeecg.modules.business.entity.BusHotel;
+import org.jeecg.modules.business.service.IBusHotelService;
+import org.jeecg.modules.order.entity.CesOrderComment;
+import org.jeecg.modules.order.entity.CesOrderMessage;
+import org.jeecg.modules.order.service.ICesOrderMessageService;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.jeecg.common.aspect.annotation.AutoLog;
+
+/**
+ * @Description: ces_order_message
+ * @Author: jeecg-boot
+ * @Date:   2023-03-24
+ * @Version: V1.0
+ */
+@Api(tags="ces_order_message")
+@RestController
+@RequestMapping("/order/cesOrderMessage")
+@Slf4j
+public class CesOrderMessageController extends JeecgController<CesOrderMessage, ICesOrderMessageService> {
+	@Autowired
+	private ICesOrderMessageService cesOrderMessageService;
+	 @Autowired
+	 private IBusHotelService busHotelService;
+	/**
+	 * 分页列表查询
+	 *
+	 * @param cesOrderMessage
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "ces_order_message-分页列表查询")
+	@ApiOperation(value="ces_order_message-分页列表查询", notes="ces_order_message-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<CesOrderMessage>> queryPageList(CesOrderMessage cesOrderMessage,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+														@RequestParam(name="hotelIds[]",required = false) List<String> hotelIds,
+								   HttpServletRequest req) {
+		LambdaQueryWrapper<CesOrderMessage> queryWrapper = QueryGenerator.initQueryWrapper(cesOrderMessage, req.getParameterMap()).lambda();
+		if (ObjectUtils.isNotEmpty(hotelIds)) {
+			queryWrapper.and(j -> {
+				for (int k = 0; k < hotelIds.size(); k++) {
+					j = j.or().eq(CesOrderMessage::getHotelId, hotelIds.get(k));
+				}
+			});
+		}
+		Page<CesOrderMessage> page = new Page<CesOrderMessage>(pageNo, pageSize);
+		IPage<CesOrderMessage> pageList = cesOrderMessageService.page(page, queryWrapper);
+		pageList.getRecords().forEach(item -> {
+			BusHotel hotle = busHotelService.getById(item.getHotelId());
+			if (hotle != null) {
+				item.setHotelName(hotle.getName());
+			}
+		});
+		return Result.OK(pageList);
+	}
+	
+	/**
+	 *   添加
+	 *
+	 * @param cesOrderMessage
+	 * @return
+	 */
+	@AutoLog(value = "ces_order_message-添加")
+	@ApiOperation(value="ces_order_message-添加", notes="ces_order_message-添加")
+	//@RequiresPermissions("order:ces_order_message:add")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody CesOrderMessage cesOrderMessage) {
+		cesOrderMessageService.save(cesOrderMessage);
+		return Result.OK("添加成功!");
+	}
+	
+	/**
+	 *  编辑
+	 *
+	 * @param cesOrderMessage
+	 * @return
+	 */
+	@AutoLog(value = "ces_order_message-编辑")
+	@ApiOperation(value="ces_order_message-编辑", notes="ces_order_message-编辑")
+	//@RequiresPermissions("order:ces_order_message:edit")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody CesOrderMessage cesOrderMessage) {
+		cesOrderMessageService.updateById(cesOrderMessage);
+		return Result.OK("编辑成功!");
+	}
+	
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "ces_order_message-通过id删除")
+	@ApiOperation(value="ces_order_message-通过id删除", notes="ces_order_message-通过id删除")
+	//@RequiresPermissions("order:ces_order_message:delete")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		cesOrderMessageService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+	
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "ces_order_message-批量删除")
+	@ApiOperation(value="ces_order_message-批量删除", notes="ces_order_message-批量删除")
+	//@RequiresPermissions("order:ces_order_message:deleteBatch")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.cesOrderMessageService.removeByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+	
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	//@AutoLog(value = "ces_order_message-通过id查询")
+	@ApiOperation(value="ces_order_message-通过id查询", notes="ces_order_message-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<CesOrderMessage> queryById(@RequestParam(name="id",required=true) String id) {
+		CesOrderMessage cesOrderMessage = cesOrderMessageService.getById(id);
+		if(cesOrderMessage==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(cesOrderMessage);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param cesOrderMessage
+    */
+    //@RequiresPermissions("order:ces_order_message:exportXls")
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, CesOrderMessage cesOrderMessage) {
+        return super.exportXls(request, cesOrderMessage, CesOrderMessage.class, "ces_order_message");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    //@RequiresPermissions("order:ces_order_message:importExcel")
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, CesOrderMessage.class);
+    }
+
+}

+ 86 - 0
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/order/entity/CesOrderComment.java

@@ -0,0 +1,86 @@
+package org.jeecg.modules.order.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.util.Date;
+import java.math.BigDecimal;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.jeecg.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @Description: ces_order_comment
+ * @Author: jeecg-boot
+ * @Date:   2023-03-24
+ * @Version: V1.0
+ */
+@Data
+@TableName("ces_order_comment")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="ces_order_comment对象", description="ces_order_comment")
+public class CesOrderComment implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**id*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "id")
+    private String id;
+	/**关联租户*/
+	@Excel(name = "关联租户", width = 15)
+    @ApiModelProperty(value = "关联租户")
+    private String tenantId;
+	/**关联酒店*/
+	@Excel(name = "关联酒店", width = 15)
+    @ApiModelProperty(value = "关联酒店")
+    private String hotelId;
+	/**父级评价ID*/
+	@Excel(name = "父级评价ID", width = 15)
+    @ApiModelProperty(value = "父级评价ID")
+    private String commentId;
+	/**评价1-5星*/
+	@Excel(name = "评价1-5星", width = 15)
+    @ApiModelProperty(value = "评价1-5星")
+    private Integer score;
+	/**评价用户ID*/
+	@Excel(name = "评价用户ID", width = 15)
+    @ApiModelProperty(value = "评价用户ID")
+    private String userId;
+	/**评价类型 1 酒店 2商品*/
+	@Excel(name = "评价类型 1 酒店 2商品", width = 15)
+    @ApiModelProperty(value = "评价类型 1 酒店 2商品")
+    private Integer commentType;
+	/**评价商品/订单ID*/
+	@Excel(name = "评价商品/订单ID", width = 15)
+    @ApiModelProperty(value = "评价商品/订单ID")
+    private String orderId;
+	/**评价图片逗号分隔*/
+	@Excel(name = "评价图片逗号分隔", width = 15)
+    @ApiModelProperty(value = "评价图片逗号分隔")
+    private String images;
+	/**评价内容*/
+	@Excel(name = "评价内容", width = 15)
+    @ApiModelProperty(value = "评价内容")
+    private String contentBody;
+	/**商家回复*/
+	@Excel(name = "商家回复", width = 15)
+    @ApiModelProperty(value = "商家回复")
+    private String sellerContent;
+	/**创建时间*/
+	@Excel(name = "创建时间", width = 15, format = "yyyy-MM-dd")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "创建时间")
+    private Date createDate;
+
+	@TableField(exist = false)
+	private String hotelName;
+}

+ 82 - 0
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/order/entity/CesOrderMessage.java

@@ -0,0 +1,82 @@
+package org.jeecg.modules.order.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.util.Date;
+import java.math.BigDecimal;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.jeecg.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @Description: ces_order_message
+ * @Author: jeecg-boot
+ * @Date:   2023-03-24
+ * @Version: V1.0
+ */
+@Data
+@TableName("ces_order_message")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="ces_order_message对象", description="ces_order_message")
+public class CesOrderMessage implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**id*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "id")
+    private String id;
+	/**关联租户*/
+	@Excel(name = "关联租户", width = 15)
+    @ApiModelProperty(value = "关联租户")
+    private String tenantId;
+	/**关联酒店*/
+	@Excel(name = "关联酒店", width = 15)
+    @ApiModelProperty(value = "关联酒店")
+    private String hotelId;
+	/**用户ID*/
+	@Excel(name = "用户ID", width = 15)
+    @ApiModelProperty(value = "用户ID")
+    private String userId;
+	/**留言类型 1 投诉 2建议*/
+	@Excel(name = "留言类型 1 投诉 2建议", width = 15)
+    @ApiModelProperty(value = "留言类型 1 投诉 2建议")
+    private Integer messageType;
+	/**图片逗号分隔*/
+	@Excel(name = "图片逗号分隔", width = 15)
+    @ApiModelProperty(value = "图片逗号分隔")
+    private String images;
+	/**内容*/
+	@Excel(name = "内容", width = 15)
+    @ApiModelProperty(value = "内容")
+    private String contentBody;
+	/**姓名*/
+	@Excel(name = "姓名", width = 15)
+    @ApiModelProperty(value = "姓名")
+    private String userName;
+	/**手机号*/
+	@Excel(name = "手机号", width = 15)
+    @ApiModelProperty(value = "手机号")
+    private String userMobile;
+	/**房号*/
+	@Excel(name = "房号", width = 15)
+    @ApiModelProperty(value = "房号")
+    private String roomNo;
+	/**创建时间*/
+	@Excel(name = "创建时间", width = 15, format = "yyyy-MM-dd")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "创建时间")
+    private Date createDate;
+
+    @TableField(exist = false)
+    private String hotelName;
+}

+ 17 - 0
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/order/mapper/CesOrderCommentMapper.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.order.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.order.entity.CesOrderComment;
+
+/**
+ * @Description: ces_order_comment
+ * @Author: jeecg-boot
+ * @Date:   2023-03-24
+ * @Version: V1.0
+ */
+public interface CesOrderCommentMapper extends BaseMapper<CesOrderComment> {
+
+}

+ 17 - 0
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/order/mapper/CesOrderMessageMapper.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.order.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.order.entity.CesOrderMessage;
+
+/**
+ * @Description: ces_order_message
+ * @Author: jeecg-boot
+ * @Date:   2023-03-24
+ * @Version: V1.0
+ */
+public interface CesOrderMessageMapper extends BaseMapper<CesOrderMessage> {
+
+}

+ 5 - 0
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/order/mapper/xml/CesOrderCommentMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.jeecg.modules.demo.order.mapper.CesOrderCommentMapper">
+
+</mapper>

+ 5 - 0
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/order/mapper/xml/CesOrderMessageMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.jeecg.modules.demo.order.mapper.CesOrderMessageMapper">
+
+</mapper>

+ 13 - 0
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/order/service/ICesOrderCommentService.java

@@ -0,0 +1,13 @@
+package org.jeecg.modules.order.service;
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.order.entity.CesOrderComment;
+
+/**
+ * @Description: ces_order_comment
+ * @Author: jeecg-boot
+ * @Date:   2023-03-24
+ * @Version: V1.0
+ */
+public interface ICesOrderCommentService extends IService<CesOrderComment> {
+
+}

+ 14 - 0
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/order/service/ICesOrderMessageService.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.order.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.order.entity.CesOrderMessage;
+
+/**
+ * @Description: ces_order_message
+ * @Author: jeecg-boot
+ * @Date:   2023-03-24
+ * @Version: V1.0
+ */
+public interface ICesOrderMessageService extends IService<CesOrderMessage> {
+
+}

+ 18 - 0
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/order/service/impl/CesOrderCommentServiceImpl.java

@@ -0,0 +1,18 @@
+package org.jeecg.modules.order.service.impl;
+import org.jeecg.modules.order.entity.CesOrderComment;
+import org.jeecg.modules.order.mapper.CesOrderCommentMapper;
+import org.jeecg.modules.order.service.ICesOrderCommentService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: ces_order_comment
+ * @Author: jeecg-boot
+ * @Date:   2023-03-24
+ * @Version: V1.0
+ */
+@Service
+public class CesOrderCommentServiceImpl extends ServiceImpl<CesOrderCommentMapper, CesOrderComment> implements ICesOrderCommentService {
+
+}

+ 19 - 0
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/order/service/impl/CesOrderMessageServiceImpl.java

@@ -0,0 +1,19 @@
+package org.jeecg.modules.order.service.impl;
+
+import org.jeecg.modules.order.entity.CesOrderMessage;
+import org.jeecg.modules.order.mapper.CesOrderMessageMapper;
+import org.jeecg.modules.order.service.ICesOrderMessageService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: ces_order_message
+ * @Author: jeecg-boot
+ * @Date:   2023-03-24
+ * @Version: V1.0
+ */
+@Service
+public class CesOrderMessageServiceImpl extends ServiceImpl<CesOrderMessageMapper, CesOrderMessage> implements ICesOrderMessageService {
+
+}