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

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/order/controller/CesOrderLeaseGoodsController.java

@@ -0,0 +1,239 @@
+package org.jeecg.modules.order.controller;
+
+import java.util.Arrays;
+import java.util.Date;
+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 cn.hutool.core.date.DateUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import org.apache.commons.lang3.ObjectUtils;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.constant.CommonConstant;
+import org.jeecg.common.exception.JeecgBootException;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.system.vo.LoginUser;
+import org.jeecg.common.util.DateUtils;
+import org.jeecg.common.util.TokenUtils;
+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.dto.PostDataDto;
+import org.jeecg.modules.business.entity.BusHotel;
+import org.jeecg.modules.business.entity.BusMarketCouponsCashUsed;
+import org.jeecg.modules.business.entity.BusMemberBalanceLog;
+import org.jeecg.modules.business.enums.CouponsStatusEnum;
+import org.jeecg.modules.business.service.IBusHotelService;
+import org.jeecg.modules.order.entity.CesOrderLeaseGoods;
+import org.jeecg.modules.order.service.ICesOrderLeaseGoodsService;
+import org.jeecg.modules.rooms.entity.CesRooms;
+import org.jeecg.modules.rooms.service.CesRoomsServiceImpl;
+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_lease_goods
+ * @Author: jeecg-boot
+ * @Date:   2023-04-04
+ * @Version: V1.0
+ */
+@Api(tags="ces_order_lease_goods")
+@RestController
+@RequestMapping("/order/cesOrderLeaseGoods")
+@Slf4j
+public class CesOrderLeaseGoodsController extends JeecgController<CesOrderLeaseGoods, ICesOrderLeaseGoodsService> {
+	@Autowired
+	private ICesOrderLeaseGoodsService cesOrderLeaseGoodsService;
+	 @Autowired
+	 private CesRoomsServiceImpl cesRoomsService;
+	/**
+	 * 分页列表查询
+	 *
+	 * @param cesOrderLeaseGoods
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "ces_order_lease_goods-分页列表查询")
+	@ApiOperation(value="ces_order_lease_goods-分页列表查询", notes="ces_order_lease_goods-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<CesOrderLeaseGoods>> queryPageList(CesOrderLeaseGoods cesOrderLeaseGoods,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+														   @RequestParam(name="startTime",required = false) String startTime,
+														   @RequestParam(name="endTime",required = false) String endTime,
+								   HttpServletRequest req) {
+		LambdaQueryWrapper<CesOrderLeaseGoods> queryWrapper = QueryGenerator.initQueryWrapper(cesOrderLeaseGoods, req.getParameterMap()).lambda();;
+		if (ObjectUtils.isNotEmpty(startTime)) {
+			queryWrapper.ge(CesOrderLeaseGoods::getCreateDate, DateUtil.parseDate(startTime));
+		}
+		if (ObjectUtils.isNotEmpty(endTime)) {
+			queryWrapper.le(CesOrderLeaseGoods::getCreateDate, DateUtil.parseDate(endTime));
+		}
+		Page<CesOrderLeaseGoods> page = new Page<CesOrderLeaseGoods>(pageNo, pageSize);
+		IPage<CesOrderLeaseGoods> pageList = cesOrderLeaseGoodsService.page(page, queryWrapper);
+		pageList.getRecords().forEach(item -> {
+			CesRooms rooms = cesRoomsService.getById(item.getRoomId());
+			if (rooms != null) {
+				item.setRoomNo(rooms.getName());
+			}
+		});
+		return Result.OK(pageList);
+	}
+
+	 /**
+	  * 归还
+	  * @param dto
+	  * @return
+	  */
+	 @AutoLog(value = "归还")
+	 @ApiOperation(value="归还", notes="归还")
+	 @RequestMapping(value = "/revert", method = {RequestMethod.PUT,RequestMethod.POST})
+	 public Result<String> revert(@RequestBody PostDataDto dto) {
+		 LambdaUpdateWrapper<CesOrderLeaseGoods> updateWrapper = new UpdateWrapper().lambda();
+		 updateWrapper.set(CesOrderLeaseGoods::getRevertDate, new Date());
+		 updateWrapper.eq(CesOrderLeaseGoods::getId, dto.getId());
+		 cesOrderLeaseGoodsService.update(updateWrapper);
+		 return Result.OK("编辑成功!");
+	 }
+	
+	/**
+	 *   添加
+	 *
+	 * @param cesOrderLeaseGoods
+	 * @return
+	 */
+	@AutoLog(value = "ces_order_lease_goods-添加")
+	@ApiOperation(value="ces_order_lease_goods-添加", notes="ces_order_lease_goods-添加")
+	//@RequiresPermissions("order:ces_order_lease_goods:add")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody CesOrderLeaseGoods cesOrderLeaseGoods) {
+		if (cesOrderLeaseGoods.getTenantId() == null || cesOrderLeaseGoods.getTenantId().equals("")) {
+			LoginUser user = TokenUtils.getAuthUser();
+			if (user.getRelTenantIds() != null && !user.getRelTenantIds().equals("")) {
+				cesOrderLeaseGoods.setTenantId(user.getRelTenantIds());
+			} else {
+				throw new JeecgBootException("当前登录人租户信息错误");
+			}
+		}
+		cesOrderLeaseGoods.setOrderNo(DateUtils.getCurrentTimestamp() + "");
+		cesOrderLeaseGoods.setCreateDate(new Date());
+		cesOrderLeaseGoodsService.save(cesOrderLeaseGoods);
+		return Result.OK("添加成功！");
+	}
+	
+	/**
+	 *  编辑
+	 *
+	 * @param cesOrderLeaseGoods
+	 * @return
+	 */
+	@AutoLog(value = "ces_order_lease_goods-编辑")
+	@ApiOperation(value="ces_order_lease_goods-编辑", notes="ces_order_lease_goods-编辑")
+	//@RequiresPermissions("order:ces_order_lease_goods:edit")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody CesOrderLeaseGoods cesOrderLeaseGoods) {
+		cesOrderLeaseGoodsService.updateById(cesOrderLeaseGoods);
+		return Result.OK("编辑成功!");
+	}
+	
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "ces_order_lease_goods-通过id删除")
+	@ApiOperation(value="ces_order_lease_goods-通过id删除", notes="ces_order_lease_goods-通过id删除")
+	//@RequiresPermissions("order:ces_order_lease_goods:delete")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		cesOrderLeaseGoodsService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+	
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "ces_order_lease_goods-批量删除")
+	@ApiOperation(value="ces_order_lease_goods-批量删除", notes="ces_order_lease_goods-批量删除")
+	//@RequiresPermissions("order:ces_order_lease_goods:deleteBatch")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.cesOrderLeaseGoodsService.removeByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+	
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	//@AutoLog(value = "ces_order_lease_goods-通过id查询")
+	@ApiOperation(value="ces_order_lease_goods-通过id查询", notes="ces_order_lease_goods-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<CesOrderLeaseGoods> queryById(@RequestParam(name="id",required=true) String id) {
+		CesOrderLeaseGoods cesOrderLeaseGoods = cesOrderLeaseGoodsService.getById(id);
+		if(cesOrderLeaseGoods==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(cesOrderLeaseGoods);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param cesOrderLeaseGoods
+    */
+    //@RequiresPermissions("order:ces_order_lease_goods:exportXls")
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, CesOrderLeaseGoods cesOrderLeaseGoods) {
+        return super.exportXls(request, cesOrderLeaseGoods, CesOrderLeaseGoods.class, "ces_order_lease_goods");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    //@RequiresPermissions("order:ces_order_lease_goods:importExcel")
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, CesOrderLeaseGoods.class);
+    }
+
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/order/entity/CesOrderLeaseGoods.java

@@ -0,0 +1,88 @@
+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_lease_goods
+ * @Author: jeecg-boot
+ * @Date:   2023-04-04
+ * @Version: V1.0
+ */
+@Data
+@TableName("ces_order_lease_goods")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="ces_order_lease_goods对象", description="ces_order_lease_goods")
+public class CesOrderLeaseGoods 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 roomId;
+	/**姓名*/
+	@Excel(name = "姓名", width = 15)
+    @ApiModelProperty(value = "姓名")
+    private String userName;
+	/**物品平台字典项目ID*/
+	@Excel(name = "物品平台字典项目ID", width = 15)
+    @ApiModelProperty(value = "物品平台字典项目ID")
+    private String goodsId;
+	/**数量*/
+	@Excel(name = "数量", width = 15)
+    @ApiModelProperty(value = "数量")
+    private Integer num;
+	/**押金*/
+	@Excel(name = "押金", width = 15)
+    @ApiModelProperty(value = "押金")
+    private BigDecimal deposit;
+	/**备注*/
+	@Excel(name = "备注", width = 15)
+    @ApiModelProperty(value = "备注")
+    private String remark;
+	/**归还时间*/
+	@Excel(name = "归还时间", width = 15, format = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "归还时间")
+    private Date revertDate;
+	/**创建时间*/
+	@Excel(name = "创建时间", width = 15, format = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建时间")
+    private Date createDate;
+	/**单据号*/
+	@Excel(name = "单据号", width = 15)
+    @ApiModelProperty(value = "单据号")
+    private String orderNo;
+
+	@TableField(exist = false)
+	private String roomNo;
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/order/mapper/CesOrderLeaseGoodsMapper.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.CesOrderLeaseGoods;
+
+/**
+ * @Description: ces_order_lease_goods
+ * @Author: jeecg-boot
+ * @Date:   2023-04-04
+ * @Version: V1.0
+ */
+public interface CesOrderLeaseGoodsMapper extends BaseMapper<CesOrderLeaseGoods> {
+
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/order/mapper/xml/CesOrderLeaseGoodsMapper.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.CesOrderLeaseGoodsMapper">
+
+</mapper>

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/order/service/ICesOrderLeaseGoodsService.java

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

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/order/service/impl/CesOrderLeaseGoodsServiceImpl.java

@@ -0,0 +1,19 @@
+package org.jeecg.modules.order.service.impl;
+
+import org.jeecg.modules.order.entity.CesOrderLeaseGoods;
+import org.jeecg.modules.order.mapper.CesOrderLeaseGoodsMapper;
+import org.jeecg.modules.order.service.ICesOrderLeaseGoodsService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: ces_order_lease_goods
+ * @Author: jeecg-boot
+ * @Date:   2023-04-04
+ * @Version: V1.0
+ */
+@Service
+public class CesOrderLeaseGoodsServiceImpl extends ServiceImpl<CesOrderLeaseGoodsMapper, CesOrderLeaseGoods> implements ICesOrderLeaseGoodsService {
+
+}