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/business/controller/BusClearController.java

@@ -138,7 +138,7 @@ public class BusClearController extends JeecgController<BusClear, IBusClearServi
 	 @ApiOperation(value="清扫房间选择服务员-编辑", notes="清扫房间选择服务员-编辑")
 	 //@RequiresPermissions("business:bus_night_trial_info:edit")
 	 @RequestMapping(value = "/editStatus", method = {RequestMethod.PUT,RequestMethod.POST})
-	 public Result<BusClear> editAutoCheck(@RequestBody BusClear busClear) {
+	 public Result<BusClear> editStatus(@RequestBody BusClear busClear) {
 		 if(busClear.getTenantId() == null || busClear.getTenantId().equals("")){
 			 LoginUser user = TokenUtils.getAuthUser();
 			 if(user.getRelTenantIds() != null && !user.getRelTenantIds().equals("")){

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/BusHouseSettingController.java

@@ -209,7 +209,7 @@ public class BusHouseSettingController extends JeecgController<BusHouseSetting,
 	 @ApiOperation(value="房务管理设置-编辑", notes="房务管理设置-编辑")
 	 //@RequiresPermissions("business:bus_night_trial_info:edit")
 	 @RequestMapping(value = "/editStatus", method = {RequestMethod.PUT,RequestMethod.POST})
-	 public Result<BusHouseSetting> editAutoCheck(@RequestBody BusHouseSetting busHouseSetting) {
+	 public Result<BusHouseSetting> editStatus(@RequestBody BusHouseSetting busHouseSetting) {
 		 if(busHouseSetting.getTenantId() == null || busHouseSetting.getTenantId().equals("")){
 			 LoginUser user = TokenUtils.getAuthUser();
 			 if(user.getRelTenantIds() != null && !user.getRelTenantIds().equals("")){

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/BusOtherCheckoutController.java

@@ -208,7 +208,7 @@ public class BusOtherCheckoutController extends JeecgController<BusOtherCheckout
 	 @AutoLog(value = "其他-退房-编辑")
 	 @ApiOperation(value="其他-退房-编辑", notes="其他-退房-编辑")
 	 @RequestMapping(value = "/editStatus", method = {RequestMethod.PUT,RequestMethod.POST})
-	 public Result<BusOtherCheckout> editAutoCheck(@RequestBody BusOtherCheckout busOtherCheckout) {
+	 public Result<BusOtherCheckout> editStatus(@RequestBody BusOtherCheckout busOtherCheckout) {
 		 if(busOtherCheckout.getTenantId() == null || busOtherCheckout.getTenantId().equals("")){
 			 LoginUser user = TokenUtils.getAuthUser();
 			 if(user.getRelTenantIds() != null && !user.getRelTenantIds().equals("")){

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/BusOtherEmptyDirtyRoomController.java

@@ -208,7 +208,7 @@ public class BusOtherEmptyDirtyRoomController extends JeecgController<BusOtherEm
 	 @AutoLog(value = "其他-空脏房-编辑")
 	 @ApiOperation(value="其他-空脏房-编辑", notes="其他-空脏房-编辑")
 	 @RequestMapping(value = "/editStatus", method = {RequestMethod.PUT,RequestMethod.POST})
-	 public Result<BusOtherEmptyDirtyRoom> editAutoCheck(@RequestBody BusOtherEmptyDirtyRoom busOtherEmptyDirtyRoom) {
+	 public Result<BusOtherEmptyDirtyRoom> editStatus(@RequestBody BusOtherEmptyDirtyRoom busOtherEmptyDirtyRoom) {
 		 if(busOtherEmptyDirtyRoom.getTenantId() == null || busOtherEmptyDirtyRoom.getTenantId().equals("")){
 			 LoginUser user = TokenUtils.getAuthUser();
 			 if(user.getRelTenantIds() != null && !user.getRelTenantIds().equals("")){

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/BusOtherMemberVerifyController.java

@@ -208,7 +208,7 @@ public class BusOtherMemberVerifyController extends JeecgController<BusOtherMemb
 	 @AutoLog(value = "其他-会员验证-编辑")
 	 @ApiOperation(value="其他-会员验证-编辑", notes="其他-会员验证-编辑")
 	 @RequestMapping(value = "/editStatus", method = {RequestMethod.PUT,RequestMethod.POST})
-	 public Result<BusOtherMemberVerify> editAutoCheck(@RequestBody BusOtherMemberVerify busOtherMemberVerify) {
+	 public Result<BusOtherMemberVerify> editStatus(@RequestBody BusOtherMemberVerify busOtherMemberVerify) {
 		 if(busOtherMemberVerify.getTenantId() == null || busOtherMemberVerify.getTenantId().equals("")){
 			 LoginUser user = TokenUtils.getAuthUser();
 			 if(user.getRelTenantIds() != null && !user.getRelTenantIds().equals("")){

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/BusOtherRoomCardController.java

@@ -208,7 +208,7 @@ public class BusOtherRoomCardController extends JeecgController<BusOtherRoomCard
 	 @AutoLog(value = "其他-制卡-编辑")
 	 @ApiOperation(value="其他-制卡-编辑", notes="其他-制卡-编辑")
 	 @RequestMapping(value = "/editStatus", method = {RequestMethod.PUT,RequestMethod.POST})
-	 public Result<BusOtherRoomCard> editAutoCheck(@RequestBody BusOtherRoomCard busOtherRoomCard) {
+	 public Result<BusOtherRoomCard> editStatus(@RequestBody BusOtherRoomCard busOtherRoomCard) {
 		 if(busOtherRoomCard.getTenantId() == null || busOtherRoomCard.getTenantId().equals("")){
 			 LoginUser user = TokenUtils.getAuthUser();
 			 if(user.getRelTenantIds() != null && !user.getRelTenantIds().equals("")){

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/BusParamComputeFormulaController.java

@@ -0,0 +1,234 @@
+package org.jeecg.modules.business.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 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.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.entity.BusParamComputeFormula;
+import org.jeecg.modules.business.entity.BusParamPreset;
+import org.jeecg.modules.business.service.IBusParamComputeFormulaService;
+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: 计算公式
+ * @Author: jeecg-boot
+ * @Date:   2023-03-11
+ * @Version: V1.0
+ */
+@Api(tags="计算公式")
+@RestController
+@RequestMapping("/business/busParamComputeFormula")
+@Slf4j
+public class BusParamComputeFormulaController extends JeecgController<BusParamComputeFormula, IBusParamComputeFormulaService> {
+	@Autowired
+	private IBusParamComputeFormulaService busParamComputeFormulaService;
+
+	/**
+	 * 分页列表查询
+	 *
+	 * @param busParamComputeFormula
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "计算公式-分页列表查询")
+	@ApiOperation(value="计算公式-分页列表查询", notes="计算公式-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<BusParamComputeFormula>> queryPageList(BusParamComputeFormula busParamComputeFormula,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<BusParamComputeFormula> queryWrapper = QueryGenerator.initQueryWrapper(busParamComputeFormula, req.getParameterMap());
+		Page<BusParamComputeFormula> page = new Page<BusParamComputeFormula>(pageNo, pageSize);
+		IPage<BusParamComputeFormula> pageList = busParamComputeFormulaService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+
+	/**
+	 *   添加
+	 *
+	 * @param busParamComputeFormula
+	 * @return
+	 */
+	@AutoLog(value = "计算公式-添加")
+	@ApiOperation(value="计算公式-添加", notes="计算公式-添加")
+	//@RequiresPermissions("business:bus_param_compute_formula_info:add")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody BusParamComputeFormula busParamComputeFormula) {
+		busParamComputeFormulaService.save(busParamComputeFormula);
+		return Result.OK("添加成功！");
+	}
+
+	/**
+	 *  编辑
+	 *
+	 * @param busParamComputeFormula
+	 * @return
+	 */
+	@AutoLog(value = "计算公式-编辑")
+	@ApiOperation(value="计算公式-编辑", notes="计算公式-编辑")
+	//@RequiresPermissions("business:bus_param_compute_formula_info:edit")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody BusParamComputeFormula busParamComputeFormula) {
+		busParamComputeFormulaService.updateById(busParamComputeFormula);
+		return Result.OK("编辑成功!");
+	}
+
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "计算公式-通过id删除")
+	@ApiOperation(value="计算公式-通过id删除", notes="计算公式-通过id删除")
+	//@RequiresPermissions("business:bus_param_compute_formula_info:delete")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		busParamComputeFormulaService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "计算公式-批量删除")
+	@ApiOperation(value="计算公式-批量删除", notes="计算公式-批量删除")
+	//@RequiresPermissions("business:bus_param_compute_formula_info:deleteBatch")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.busParamComputeFormulaService.removeByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	//@AutoLog(value = "计算公式-通过id查询")
+	@ApiOperation(value="计算公式-通过id查询", notes="计算公式-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<BusParamComputeFormula> queryById(@RequestParam(name="id",required=true) String id) {
+		BusParamComputeFormula busParamComputeFormula = busParamComputeFormulaService.getById(id);
+		if(busParamComputeFormula==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(busParamComputeFormula);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param busParamComputeFormula
+    */
+    //@RequiresPermissions("business:bus_param_compute_formula_info:exportXls")
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, BusParamComputeFormula busParamComputeFormula) {
+        return super.exportXls(request, busParamComputeFormula, BusParamComputeFormula.class, "计算公式");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    //@RequiresPermissions("business:bus_param_compute_formula_info:importExcel")
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, BusParamComputeFormula.class);
+    }
+
+	 /**
+	  * 通过hotelId查询
+	  *
+	  * @param hotelId
+	  * @return
+	  */
+	 //@AutoLog(value = "计算公式-通过hotelId查询")
+	 @ApiOperation(value="计算公式-通过hotelId查询", notes="计算公式-通过hotelId查询")
+	 @GetMapping(value = "/queryByHotelId")
+	 public Result<BusParamComputeFormula> queryByHotelId(@RequestParam(name="hotelId",required=true) String hotelId) {
+		 QueryWrapper<BusParamComputeFormula> queryWrapper = new QueryWrapper<BusParamComputeFormula>();
+		 queryWrapper.eq("hotel_id", hotelId);
+		 BusParamComputeFormula resultModel = busParamComputeFormulaService.getOne(queryWrapper);
+		 if(resultModel==null) {
+			 return Result.error("");
+		 }
+		 return Result.OK(resultModel);
+	 }
+
+	 /**
+	  *  编辑
+	  *
+	  * @param busParamComputeFormula
+	  * @return
+	  */
+	 @AutoLog(value = "计算公式-编辑")
+	 @ApiOperation(value="计算公式-编辑", notes="计算公式-编辑")
+	 @RequestMapping(value = "/editInfo", method = {RequestMethod.PUT,RequestMethod.POST})
+	 public Result<BusParamComputeFormula> editInfo(@RequestBody BusParamComputeFormula busParamComputeFormula) {
+		 if(busParamComputeFormula.getTenantId() == null || busParamComputeFormula.getTenantId().equals("")){
+			 LoginUser user = TokenUtils.getAuthUser();
+			 if(user.getRelTenantIds() != null && !user.getRelTenantIds().equals("")){
+				 busParamComputeFormula.setTenantId(user.getRelTenantIds());
+			 } else {
+				 throw new JeecgBootException("当前登录人租户信息错误");
+			 }
+		 }
+		 if (busParamComputeFormula.getId() != null && !busParamComputeFormula.getId().equals("")){
+			 BusParamComputeFormula editModel = busParamComputeFormulaService.getById(busParamComputeFormula.getId());
+			 editModel.setStatus(busParamComputeFormula.getStatus());
+			 editModel.setCardinal(busParamComputeFormula.getCardinal());
+			 editModel.setNights(busParamComputeFormula.getNights());
+			 busParamComputeFormulaService.updateById(editModel);
+			 return Result.OK(editModel);
+		 }else{
+			 busParamComputeFormula.setDelFlag(CommonConstant.DEL_FLAG_0);
+			 busParamComputeFormulaService.save(busParamComputeFormula);
+			 return Result.OK(busParamComputeFormula);
+		 }
+	 }
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/BusParamPresetController.java

@@ -0,0 +1,231 @@
+package org.jeecg.modules.business.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 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.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.entity.BusParamPreset;
+import org.jeecg.modules.business.entity.BusParamWeep;
+import org.jeecg.modules.business.service.IBusParamPresetService;
+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: 预定参数
+ * @Author: jeecg-boot
+ * @Date:   2023-03-11
+ * @Version: V1.0
+ */
+@Api(tags="预定参数")
+@RestController
+@RequestMapping("/business/busParamPreset")
+@Slf4j
+public class BusParamPresetController extends JeecgController<BusParamPreset, IBusParamPresetService> {
+	@Autowired
+	private IBusParamPresetService busParamPresetService;
+
+	/**
+	 * 分页列表查询
+	 *
+	 * @param busParamPreset
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "预定参数-分页列表查询")
+	@ApiOperation(value="预定参数-分页列表查询", notes="预定参数-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<BusParamPreset>> queryPageList(BusParamPreset busParamPreset,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<BusParamPreset> queryWrapper = QueryGenerator.initQueryWrapper(busParamPreset, req.getParameterMap());
+		Page<BusParamPreset> page = new Page<BusParamPreset>(pageNo, pageSize);
+		IPage<BusParamPreset> pageList = busParamPresetService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+
+	/**
+	 *   添加
+	 *
+	 * @param busParamPreset
+	 * @return
+	 */
+	@AutoLog(value = "预定参数-添加")
+	@ApiOperation(value="预定参数-添加", notes="预定参数-添加")
+	//@RequiresPermissions("business:bus_param_preset_info:add")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody BusParamPreset busParamPreset) {
+		busParamPresetService.save(busParamPreset);
+		return Result.OK("添加成功！");
+	}
+
+	/**
+	 *  编辑
+	 *
+	 * @param busParamPreset
+	 * @return
+	 */
+	@AutoLog(value = "预定参数-编辑")
+	@ApiOperation(value="预定参数-编辑", notes="预定参数-编辑")
+	//@RequiresPermissions("business:bus_param_preset_info:edit")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody BusParamPreset busParamPreset) {
+		busParamPresetService.updateById(busParamPreset);
+		return Result.OK("编辑成功!");
+	}
+
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "预定参数-通过id删除")
+	@ApiOperation(value="预定参数-通过id删除", notes="预定参数-通过id删除")
+	//@RequiresPermissions("business:bus_param_preset_info:delete")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		busParamPresetService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "预定参数-批量删除")
+	@ApiOperation(value="预定参数-批量删除", notes="预定参数-批量删除")
+	//@RequiresPermissions("business:bus_param_preset_info:deleteBatch")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.busParamPresetService.removeByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	//@AutoLog(value = "预定参数-通过id查询")
+	@ApiOperation(value="预定参数-通过id查询", notes="预定参数-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<BusParamPreset> queryById(@RequestParam(name="id",required=true) String id) {
+		BusParamPreset busParamPreset = busParamPresetService.getById(id);
+		if(busParamPreset==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(busParamPreset);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param busParamPreset
+    */
+    //@RequiresPermissions("business:bus_param_preset_info:exportXls")
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, BusParamPreset busParamPreset) {
+        return super.exportXls(request, busParamPreset, BusParamPreset.class, "预定参数");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    //@RequiresPermissions("business:bus_param_preset_info:importExcel")
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, BusParamPreset.class);
+    }
+	 /**
+	  * 通过hotelId查询
+	  *
+	  * @param hotelId
+	  * @return
+	  */
+	 //@AutoLog(value = "预定参数-通过hotelId查询")
+	 @ApiOperation(value="预定参数-通过hotelId查询", notes="预定参数-通过hotelId查询")
+	 @GetMapping(value = "/queryByHotelId")
+	 public Result<BusParamPreset> queryByHotelId(@RequestParam(name="hotelId",required=true) String hotelId) {
+		 QueryWrapper<BusParamPreset> queryWrapper = new QueryWrapper<BusParamPreset>();
+		 queryWrapper.eq("hotel_id", hotelId);
+		 BusParamPreset resultModel = busParamPresetService.getOne(queryWrapper);
+		 if(resultModel==null) {
+			 return Result.error("");
+		 }
+		 return Result.OK(resultModel);
+	 }
+
+	 /**
+	  *  编辑
+	  *
+	  * @param busParamPreset
+	  * @return
+	  */
+	 @AutoLog(value = "预定参数-编辑")
+	 @ApiOperation(value="预定参数-编辑", notes="预定参数-编辑")
+	 @RequestMapping(value = "/editInfo", method = {RequestMethod.PUT,RequestMethod.POST})
+	 public Result<BusParamPreset> editInfo(@RequestBody BusParamPreset busParamPreset) {
+		 if(busParamPreset.getTenantId() == null || busParamPreset.getTenantId().equals("")){
+			 LoginUser user = TokenUtils.getAuthUser();
+			 if(user.getRelTenantIds() != null && !user.getRelTenantIds().equals("")){
+				 busParamPreset.setTenantId(user.getRelTenantIds());
+			 } else {
+				 throw new JeecgBootException("当前登录人租户信息错误");
+			 }
+		 }
+		 if (busParamPreset.getId() != null && !busParamPreset.getId().equals("")){
+			 BusParamPreset editModel = busParamPresetService.getById(busParamPreset.getId());
+			 editModel.setStatus(busParamPreset.getStatus());
+			 editModel.setMinute(busParamPreset.getMinute());
+			 busParamPresetService.updateById(editModel);
+			 return Result.OK(editModel);
+		 }else{
+			 busParamPreset.setDelFlag(CommonConstant.DEL_FLAG_0);
+			 busParamPresetService.save(busParamPreset);
+			 return Result.OK(busParamPreset);
+		 }
+	 }
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/BusParamPresetSyncController.java

@@ -0,0 +1,231 @@
+package org.jeecg.modules.business.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 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.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.entity.BusParamPreset;
+import org.jeecg.modules.business.entity.BusParamPresetSync;
+import org.jeecg.modules.business.service.IBusParamPresetSyncService;
+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: 线上预定房量同步
+ * @Author: jeecg-boot
+ * @Date:   2023-03-11
+ * @Version: V1.0
+ */
+@Api(tags="线上预定房量同步")
+@RestController
+@RequestMapping("/business/busParamPresetSync")
+@Slf4j
+public class BusParamPresetSyncController extends JeecgController<BusParamPresetSync, IBusParamPresetSyncService> {
+	@Autowired
+	private IBusParamPresetSyncService busParamPresetSyncService;
+
+	/**
+	 * 分页列表查询
+	 *
+	 * @param busParamPresetSync
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "线上预定房量同步-分页列表查询")
+	@ApiOperation(value="线上预定房量同步-分页列表查询", notes="线上预定房量同步-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<BusParamPresetSync>> queryPageList(BusParamPresetSync busParamPresetSync,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<BusParamPresetSync> queryWrapper = QueryGenerator.initQueryWrapper(busParamPresetSync, req.getParameterMap());
+		Page<BusParamPresetSync> page = new Page<BusParamPresetSync>(pageNo, pageSize);
+		IPage<BusParamPresetSync> pageList = busParamPresetSyncService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+
+	/**
+	 *   添加
+	 *
+	 * @param busParamPresetSync
+	 * @return
+	 */
+	@AutoLog(value = "线上预定房量同步-添加")
+	@ApiOperation(value="线上预定房量同步-添加", notes="线上预定房量同步-添加")
+	//@RequiresPermissions("business:bus_param_preset_sync_info:add")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody BusParamPresetSync busParamPresetSync) {
+		busParamPresetSyncService.save(busParamPresetSync);
+		return Result.OK("添加成功！");
+	}
+
+	/**
+	 *  编辑
+	 *
+	 * @param busParamPresetSync
+	 * @return
+	 */
+	@AutoLog(value = "线上预定房量同步-编辑")
+	@ApiOperation(value="线上预定房量同步-编辑", notes="线上预定房量同步-编辑")
+	//@RequiresPermissions("business:bus_param_preset_sync_info:edit")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody BusParamPresetSync busParamPresetSync) {
+		busParamPresetSyncService.updateById(busParamPresetSync);
+		return Result.OK("编辑成功!");
+	}
+
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "线上预定房量同步-通过id删除")
+	@ApiOperation(value="线上预定房量同步-通过id删除", notes="线上预定房量同步-通过id删除")
+	//@RequiresPermissions("business:bus_param_preset_sync_info:delete")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		busParamPresetSyncService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "线上预定房量同步-批量删除")
+	@ApiOperation(value="线上预定房量同步-批量删除", notes="线上预定房量同步-批量删除")
+	//@RequiresPermissions("business:bus_param_preset_sync_info:deleteBatch")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.busParamPresetSyncService.removeByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	//@AutoLog(value = "线上预定房量同步-通过id查询")
+	@ApiOperation(value="线上预定房量同步-通过id查询", notes="线上预定房量同步-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<BusParamPresetSync> queryById(@RequestParam(name="id",required=true) String id) {
+		BusParamPresetSync busParamPresetSync = busParamPresetSyncService.getById(id);
+		if(busParamPresetSync==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(busParamPresetSync);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param busParamPresetSync
+    */
+    //@RequiresPermissions("business:bus_param_preset_sync_info:exportXls")
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, BusParamPresetSync busParamPresetSync) {
+        return super.exportXls(request, busParamPresetSync, BusParamPresetSync.class, "线上预定房量同步");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    //@RequiresPermissions("business:bus_param_preset_sync_info:importExcel")
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, BusParamPresetSync.class);
+    }
+
+	 /**
+	  * 通过hotelId查询
+	  *
+	  * @param hotelId
+	  * @return
+	  */
+	 //@AutoLog(value = "线上预定房量同步-通过hotelId查询")
+	 @ApiOperation(value="线上预定房量同步-通过hotelId查询", notes="线上预定房量同步-通过hotelId查询")
+	 @GetMapping(value = "/queryByHotelId")
+	 public Result<BusParamPresetSync> queryByHotelId(@RequestParam(name="hotelId",required=true) String hotelId) {
+		 QueryWrapper<BusParamPresetSync> queryWrapper = new QueryWrapper<BusParamPresetSync>();
+		 queryWrapper.eq("hotel_id", hotelId);
+		 BusParamPresetSync resultModel = busParamPresetSyncService.getOne(queryWrapper);
+		 if(resultModel==null) {
+			 return Result.error("");
+		 }
+		 return Result.OK(resultModel);
+	 }
+
+	 /**
+	  *  编辑
+	  *
+	  * @param busParamPresetSync
+	  * @return
+	  */
+	 @AutoLog(value = "线上预定房量同步-编辑")
+	 @ApiOperation(value="线上预定房量同步-编辑", notes="线上预定房量同步-编辑")
+	 @RequestMapping(value = "/editInfo", method = {RequestMethod.PUT,RequestMethod.POST})
+	 public Result<BusParamPresetSync> editInfo(@RequestBody BusParamPresetSync busParamPresetSync) {
+		 if(busParamPresetSync.getTenantId() == null || busParamPresetSync.getTenantId().equals("")){
+			 LoginUser user = TokenUtils.getAuthUser();
+			 if(user.getRelTenantIds() != null && !user.getRelTenantIds().equals("")){
+				 busParamPresetSync.setTenantId(user.getRelTenantIds());
+			 } else {
+				 throw new JeecgBootException("当前登录人租户信息错误");
+			 }
+		 }
+		 if (busParamPresetSync.getId() != null && !busParamPresetSync.getId().equals("")){
+			 BusParamPresetSync editModel = busParamPresetSyncService.getById(busParamPresetSync.getId());
+			 editModel.setStatus(busParamPresetSync.getStatus());
+			 busParamPresetSyncService.updateById(editModel);
+			 return Result.OK(editModel);
+		 }else{
+			 busParamPresetSync.setDelFlag(CommonConstant.DEL_FLAG_0);
+			 busParamPresetSyncService.save(busParamPresetSync);
+			 return Result.OK(busParamPresetSync);
+		 }
+	 }
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/BusParamPrintHideController.java

@@ -0,0 +1,260 @@
+package org.jeecg.modules.business.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 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.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.entity.BusParamPreset;
+import org.jeecg.modules.business.entity.BusParamPrintHide;
+import org.jeecg.modules.business.service.IBusParamPrintHideService;
+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: 打印单据隐藏信息设置
+ * @Author: jeecg-boot
+ * @Date:   2023-03-11
+ * @Version: V1.0
+ */
+@Api(tags="打印单据隐藏信息设置")
+@RestController
+@RequestMapping("/business/busParamPrintHide")
+@Slf4j
+public class BusParamPrintHideController extends JeecgController<BusParamPrintHide, IBusParamPrintHideService> {
+	@Autowired
+	private IBusParamPrintHideService busParamPrintHideService;
+
+	/**
+	 * 分页列表查询
+	 *
+	 * @param busParamPrintHide
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "打印单据隐藏信息设置-分页列表查询")
+	@ApiOperation(value="打印单据隐藏信息设置-分页列表查询", notes="打印单据隐藏信息设置-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<BusParamPrintHide>> queryPageList(BusParamPrintHide busParamPrintHide,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<BusParamPrintHide> queryWrapper = QueryGenerator.initQueryWrapper(busParamPrintHide, req.getParameterMap());
+		Page<BusParamPrintHide> page = new Page<BusParamPrintHide>(pageNo, pageSize);
+		IPage<BusParamPrintHide> pageList = busParamPrintHideService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+
+	/**
+	 *   添加
+	 *
+	 * @param busParamPrintHide
+	 * @return
+	 */
+	@AutoLog(value = "打印单据隐藏信息设置-添加")
+	@ApiOperation(value="打印单据隐藏信息设置-添加", notes="打印单据隐藏信息设置-添加")
+	//@RequiresPermissions("business:bus_param_print_hide_info:add")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody BusParamPrintHide busParamPrintHide) {
+		busParamPrintHideService.save(busParamPrintHide);
+		return Result.OK("添加成功！");
+	}
+
+	/**
+	 *  编辑
+	 *
+	 * @param busParamPrintHide
+	 * @return
+	 */
+	@AutoLog(value = "打印单据隐藏信息设置-编辑")
+	@ApiOperation(value="打印单据隐藏信息设置-编辑", notes="打印单据隐藏信息设置-编辑")
+	//@RequiresPermissions("business:bus_param_print_hide_info:edit")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody BusParamPrintHide busParamPrintHide) {
+		busParamPrintHideService.updateById(busParamPrintHide);
+		return Result.OK("编辑成功!");
+	}
+
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "打印单据隐藏信息设置-通过id删除")
+	@ApiOperation(value="打印单据隐藏信息设置-通过id删除", notes="打印单据隐藏信息设置-通过id删除")
+	//@RequiresPermissions("business:bus_param_print_hide_info:delete")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		busParamPrintHideService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "打印单据隐藏信息设置-批量删除")
+	@ApiOperation(value="打印单据隐藏信息设置-批量删除", notes="打印单据隐藏信息设置-批量删除")
+	//@RequiresPermissions("business:bus_param_print_hide_info:deleteBatch")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.busParamPrintHideService.removeByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	//@AutoLog(value = "打印单据隐藏信息设置-通过id查询")
+	@ApiOperation(value="打印单据隐藏信息设置-通过id查询", notes="打印单据隐藏信息设置-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<BusParamPrintHide> queryById(@RequestParam(name="id",required=true) String id) {
+		BusParamPrintHide busParamPrintHide = busParamPrintHideService.getById(id);
+		if(busParamPrintHide==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(busParamPrintHide);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param busParamPrintHide
+    */
+    //@RequiresPermissions("business:bus_param_print_hide_info:exportXls")
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, BusParamPrintHide busParamPrintHide) {
+        return super.exportXls(request, busParamPrintHide, BusParamPrintHide.class, "打印单据隐藏信息设置");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    //@RequiresPermissions("business:bus_param_print_hide_info:importExcel")
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, BusParamPrintHide.class);
+    }
+
+	 /**
+	  * 通过hotelId查询
+	  *
+	  * @param hotelId
+	  * @return
+	  */
+	 //@AutoLog(value = "打印单据隐藏信息设置-通过hotelId查询")
+	 @ApiOperation(value="打印单据隐藏信息设置-通过hotelId查询", notes="打印单据隐藏信息设置-通过hotelId查询")
+	 @GetMapping(value = "/queryByHotelId")
+	 public Result<BusParamPrintHide> queryByHotelId(@RequestParam(name="hotelId",required=true) String hotelId) {
+		 QueryWrapper<BusParamPrintHide> queryWrapper = new QueryWrapper<BusParamPrintHide>();
+		 queryWrapper.eq("hotel_id", hotelId);
+		 BusParamPrintHide resultModel = busParamPrintHideService.getOne(queryWrapper);
+		 if(resultModel==null) {
+			 return Result.error("");
+		 }
+		 return Result.OK(resultModel);
+	 }
+
+	 /**
+	  *  编辑
+	  *
+	  * @param busParamPrintHide
+	  * @return
+	  */
+	 @AutoLog(value = "打印单据隐藏信息设置-编辑")
+	 @ApiOperation(value="打印单据隐藏信息设置-编辑", notes="打印单据隐藏信息设置-编辑")
+	 @RequestMapping(value = "/editGuest", method = {RequestMethod.PUT,RequestMethod.POST})
+	 public Result<BusParamPrintHide> editGuest(@RequestBody BusParamPrintHide busParamPrintHide) {
+		 if(busParamPrintHide.getTenantId() == null || busParamPrintHide.getTenantId().equals("")){
+			 LoginUser user = TokenUtils.getAuthUser();
+			 if(user.getRelTenantIds() != null && !user.getRelTenantIds().equals("")){
+				 busParamPrintHide.setTenantId(user.getRelTenantIds());
+			 } else {
+				 throw new JeecgBootException("当前登录人租户信息错误");
+			 }
+		 }
+		 if (busParamPrintHide.getId() != null && !busParamPrintHide.getId().equals("")){
+			 BusParamPrintHide editModel = busParamPrintHideService.getById(busParamPrintHide.getId());
+			 editModel.setGuest(busParamPrintHide.getGuest());
+			 busParamPrintHideService.updateById(editModel);
+			 return Result.OK(editModel);
+		 }else{
+			 busParamPrintHide.setDelFlag(CommonConstant.DEL_FLAG_0);
+			 busParamPrintHideService.save(busParamPrintHide);
+			 return Result.OK(busParamPrintHide);
+		 }
+	 }
+	 /**
+	  *  编辑
+	  *
+	  * @param busParamPrintHide
+	  * @return
+	  */
+	 @AutoLog(value = "打印单据隐藏信息设置-编辑")
+	 @ApiOperation(value="打印单据隐藏信息设置-编辑", notes="打印单据隐藏信息设置-编辑")
+	 @RequestMapping(value = "/editPrice", method = {RequestMethod.PUT,RequestMethod.POST})
+	 public Result<BusParamPrintHide> editPrice(@RequestBody BusParamPrintHide busParamPrintHide) {
+		 if(busParamPrintHide.getTenantId() == null || busParamPrintHide.getTenantId().equals("")){
+			 LoginUser user = TokenUtils.getAuthUser();
+			 if(user.getRelTenantIds() != null && !user.getRelTenantIds().equals("")){
+				 busParamPrintHide.setTenantId(user.getRelTenantIds());
+			 } else {
+				 throw new JeecgBootException("当前登录人租户信息错误");
+			 }
+		 }
+		 if (busParamPrintHide.getId() != null && !busParamPrintHide.getId().equals("")){
+			 BusParamPrintHide editModel = busParamPrintHideService.getById(busParamPrintHide.getId());
+			 editModel.setPrice(busParamPrintHide.getPrice());
+			 busParamPrintHideService.updateById(editModel);
+			 return Result.OK(editModel);
+		 }else{
+			 busParamPrintHide.setDelFlag(CommonConstant.DEL_FLAG_0);
+			 busParamPrintHideService.save(busParamPrintHide);
+			 return Result.OK(busParamPrintHide);
+		 }
+	 }
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/BusParamShareController.java

@@ -0,0 +1,232 @@
+package org.jeecg.modules.business.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 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.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.entity.BusParamPreset;
+import org.jeecg.modules.business.entity.BusParamShare;
+import org.jeecg.modules.business.service.IBusParamShareService;
+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: 数据共享
+ * @Author: jeecg-boot
+ * @Date:   2023-03-11
+ * @Version: V1.0
+ */
+@Api(tags="数据共享")
+@RestController
+@RequestMapping("/business/busParamShare")
+@Slf4j
+public class BusParamShareController extends JeecgController<BusParamShare, IBusParamShareService> {
+	@Autowired
+	private IBusParamShareService busParamShareService;
+
+	/**
+	 * 分页列表查询
+	 *
+	 * @param busParamShare
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "数据共享-分页列表查询")
+	@ApiOperation(value="数据共享-分页列表查询", notes="数据共享-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<BusParamShare>> queryPageList(BusParamShare busParamShare,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<BusParamShare> queryWrapper = QueryGenerator.initQueryWrapper(busParamShare, req.getParameterMap());
+		Page<BusParamShare> page = new Page<BusParamShare>(pageNo, pageSize);
+		IPage<BusParamShare> pageList = busParamShareService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+
+	/**
+	 *   添加
+	 *
+	 * @param busParamShare
+	 * @return
+	 */
+	@AutoLog(value = "数据共享-添加")
+	@ApiOperation(value="数据共享-添加", notes="数据共享-添加")
+	//@RequiresPermissions("business:bus_param_share_info:add")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody BusParamShare busParamShare) {
+		busParamShareService.save(busParamShare);
+		return Result.OK("添加成功！");
+	}
+
+	/**
+	 *  编辑
+	 *
+	 * @param busParamShare
+	 * @return
+	 */
+	@AutoLog(value = "数据共享-编辑")
+	@ApiOperation(value="数据共享-编辑", notes="数据共享-编辑")
+	//@RequiresPermissions("business:bus_param_share_info:edit")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody BusParamShare busParamShare) {
+		busParamShareService.updateById(busParamShare);
+		return Result.OK("编辑成功!");
+	}
+
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "数据共享-通过id删除")
+	@ApiOperation(value="数据共享-通过id删除", notes="数据共享-通过id删除")
+	//@RequiresPermissions("business:bus_param_share_info:delete")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		busParamShareService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "数据共享-批量删除")
+	@ApiOperation(value="数据共享-批量删除", notes="数据共享-批量删除")
+	//@RequiresPermissions("business:bus_param_share_info:deleteBatch")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.busParamShareService.removeByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	//@AutoLog(value = "数据共享-通过id查询")
+	@ApiOperation(value="数据共享-通过id查询", notes="数据共享-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<BusParamShare> queryById(@RequestParam(name="id",required=true) String id) {
+		BusParamShare busParamShare = busParamShareService.getById(id);
+		if(busParamShare==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(busParamShare);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param busParamShare
+    */
+    //@RequiresPermissions("business:bus_param_share_info:exportXls")
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, BusParamShare busParamShare) {
+        return super.exportXls(request, busParamShare, BusParamShare.class, "数据共享");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    //@RequiresPermissions("business:bus_param_share_info:importExcel")
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, BusParamShare.class);
+    }
+	 /**
+	  * 通过hotelId查询
+	  *
+	  * @param hotelId
+	  * @return
+	  */
+	 //@AutoLog(value = "数据共享-通过hotelId查询")
+	 @ApiOperation(value="数据共享-通过hotelId查询", notes="数据共享-通过hotelId查询")
+	 @GetMapping(value = "/queryByHotelId")
+	 public Result<BusParamShare> queryByHotelId(@RequestParam(name="hotelId",required=true) String hotelId) {
+		 QueryWrapper<BusParamShare> queryWrapper = new QueryWrapper<BusParamShare>();
+		 queryWrapper.eq("hotel_id", hotelId);
+		 BusParamShare resultModel = busParamShareService.getOne(queryWrapper);
+		 if(resultModel==null) {
+			 return Result.error("");
+		 }
+		 return Result.OK(resultModel);
+	 }
+
+	 /**
+	  *  编辑
+	  *
+	  * @param busParamShare
+	  * @return
+	  */
+	 @AutoLog(value = "数据共享-编辑")
+	 @ApiOperation(value="数据共享-编辑", notes="数据共享-编辑")
+	 @RequestMapping(value = "/editInfo", method = {RequestMethod.PUT,RequestMethod.POST})
+	 public Result<BusParamShare> editInfo(@RequestBody BusParamShare busParamShare) {
+		 if(busParamShare.getTenantId() == null || busParamShare.getTenantId().equals("")){
+			 LoginUser user = TokenUtils.getAuthUser();
+			 if(user.getRelTenantIds() != null && !user.getRelTenantIds().equals("")){
+				 busParamShare.setTenantId(user.getRelTenantIds());
+			 } else {
+				 throw new JeecgBootException("当前登录人租户信息错误");
+			 }
+		 }
+		 if (busParamShare.getId() != null && !busParamShare.getId().equals("")){
+			 BusParamShare editModel = busParamShareService.getById(busParamShare.getId());
+			 editModel.setAgreementAccountShare(busParamShare.getAgreementAccountShare());
+			 editModel.setAgreementShare(busParamShare.getAgreementShare());
+			 editModel.setMemberAccountShare(busParamShare.getMemberAccountShare());
+			 editModel.setMemberShare(busParamShare.getMemberShare());
+			 busParamShareService.updateById(editModel);
+			 return Result.OK(editModel);
+		 }else{
+			 busParamShare.setDelFlag(CommonConstant.DEL_FLAG_0);
+			 busParamShareService.save(busParamShare);
+			 return Result.OK(busParamShare);
+		 }
+	 }
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/BusParamWeepController.java

@@ -0,0 +1,230 @@
+package org.jeecg.modules.business.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 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.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.entity.BusClear;
+import org.jeecg.modules.business.entity.BusParamWeep;
+import org.jeecg.modules.business.service.IBusParamWeepService;
+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: 扫码支付
+ * @Author: jeecg-boot
+ * @Date:   2023-03-11
+ * @Version: V1.0
+ */
+@Api(tags="扫码支付")
+@RestController
+@RequestMapping("/business/busParamWeep")
+@Slf4j
+public class BusParamWeepController extends JeecgController<BusParamWeep, IBusParamWeepService> {
+	@Autowired
+	private IBusParamWeepService busParamWeepService;
+
+	/**
+	 * 分页列表查询
+	 *
+	 * @param busParamWeep
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "扫码支付-分页列表查询")
+	@ApiOperation(value="扫码支付-分页列表查询", notes="扫码支付-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<BusParamWeep>> queryPageList(BusParamWeep busParamWeep,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<BusParamWeep> queryWrapper = QueryGenerator.initQueryWrapper(busParamWeep, req.getParameterMap());
+		Page<BusParamWeep> page = new Page<BusParamWeep>(pageNo, pageSize);
+		IPage<BusParamWeep> pageList = busParamWeepService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+
+	/**
+	 *   添加
+	 *
+	 * @param busParamWeep
+	 * @return
+	 */
+	@AutoLog(value = "扫码支付-添加")
+	@ApiOperation(value="扫码支付-添加", notes="扫码支付-添加")
+	//@RequiresPermissions("business:bus_param_weep_info:add")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody BusParamWeep busParamWeep) {
+		busParamWeepService.save(busParamWeep);
+		return Result.OK("添加成功！");
+	}
+
+	/**
+	 *  编辑
+	 *
+	 * @param busParamWeep
+	 * @return
+	 */
+	@AutoLog(value = "扫码支付-编辑")
+	@ApiOperation(value="扫码支付-编辑", notes="扫码支付-编辑")
+	//@RequiresPermissions("business:bus_param_weep_info:edit")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody BusParamWeep busParamWeep) {
+		busParamWeepService.updateById(busParamWeep);
+		return Result.OK("编辑成功!");
+	}
+
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "扫码支付-通过id删除")
+	@ApiOperation(value="扫码支付-通过id删除", notes="扫码支付-通过id删除")
+	//@RequiresPermissions("business:bus_param_weep_info:delete")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		busParamWeepService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "扫码支付-批量删除")
+	@ApiOperation(value="扫码支付-批量删除", notes="扫码支付-批量删除")
+	//@RequiresPermissions("business:bus_param_weep_info:deleteBatch")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.busParamWeepService.removeByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	//@AutoLog(value = "扫码支付-通过id查询")
+	@ApiOperation(value="扫码支付-通过id查询", notes="扫码支付-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<BusParamWeep> queryById(@RequestParam(name="id",required=true) String id) {
+		BusParamWeep busParamWeep = busParamWeepService.getById(id);
+		if(busParamWeep==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(busParamWeep);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param busParamWeep
+    */
+    //@RequiresPermissions("business:bus_param_weep_info:exportXls")
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, BusParamWeep busParamWeep) {
+        return super.exportXls(request, busParamWeep, BusParamWeep.class, "扫码支付");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    //@RequiresPermissions("business:bus_param_weep_info:importExcel")
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, BusParamWeep.class);
+    }
+	 /**
+	  * 通过hotelId查询
+	  *
+	  * @param hotelId
+	  * @return
+	  */
+	 //@AutoLog(value = "扫码支付-通过hotelId查询")
+	 @ApiOperation(value="扫码支付-通过hotelId查询", notes="扫码支付-通过hotelId查询")
+	 @GetMapping(value = "/queryByHotelId")
+	 public Result<BusParamWeep> queryByHotelId(@RequestParam(name="hotelId",required=true) String hotelId) {
+		 QueryWrapper<BusParamWeep> queryWrapper = new QueryWrapper<BusParamWeep>();
+		 queryWrapper.eq("hotel_id", hotelId);
+		 BusParamWeep resultModel = busParamWeepService.getOne(queryWrapper);
+		 if(resultModel==null) {
+			 return Result.error("");
+		 }
+		 return Result.OK(resultModel);
+	 }
+
+	 /**
+	  *  编辑
+	  *
+	  * @param busParamWeep
+	  * @return
+	  */
+	 @AutoLog(value = "扫码支付-编辑")
+	 @ApiOperation(value="扫码支付-编辑", notes="扫码支付-编辑")
+	 @RequestMapping(value = "/editInfo", method = {RequestMethod.PUT,RequestMethod.POST})
+	 public Result<BusParamWeep> editInfo(@RequestBody BusParamWeep busParamWeep) {
+		 if(busParamWeep.getTenantId() == null || busParamWeep.getTenantId().equals("")){
+			 LoginUser user = TokenUtils.getAuthUser();
+			 if(user.getRelTenantIds() != null && !user.getRelTenantIds().equals("")){
+				 busParamWeep.setTenantId(user.getRelTenantIds());
+			 } else {
+				 throw new JeecgBootException("当前登录人租户信息错误");
+			 }
+		 }
+		 if (busParamWeep.getId() != null && !busParamWeep.getId().equals("")){
+			 BusParamWeep editModel = busParamWeepService.getById(busParamWeep.getId());
+			 editModel.setDayNum(busParamWeep.getDayNum());
+			 busParamWeepService.updateById(editModel);
+			 return Result.OK(editModel);
+		 }else{
+			 busParamWeep.setDelFlag(CommonConstant.DEL_FLAG_0);
+			 busParamWeepService.save(busParamWeep);
+			 return Result.OK(busParamWeep);
+		 }
+	 }
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/BusParamXcxRoomController.java

@@ -0,0 +1,236 @@
+package org.jeecg.modules.business.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 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.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.entity.BusParamPreset;
+import org.jeecg.modules.business.entity.BusParamXcxRoom;
+import org.jeecg.modules.business.service.IBusParamXcxRoomService;
+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: 小程序客房服务设置
+ * @Author: jeecg-boot
+ * @Date:   2023-03-11
+ * @Version: V1.0
+ */
+@Api(tags="小程序客房服务设置")
+@RestController
+@RequestMapping("/business/busParamXcxRoom")
+@Slf4j
+public class BusParamXcxRoomController extends JeecgController<BusParamXcxRoom, IBusParamXcxRoomService> {
+	@Autowired
+	private IBusParamXcxRoomService busParamXcxRoomService;
+
+	/**
+	 * 分页列表查询
+	 *
+	 * @param busParamXcxRoom
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "小程序客房服务设置-分页列表查询")
+	@ApiOperation(value="小程序客房服务设置-分页列表查询", notes="小程序客房服务设置-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<BusParamXcxRoom>> queryPageList(BusParamXcxRoom busParamXcxRoom,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<BusParamXcxRoom> queryWrapper = QueryGenerator.initQueryWrapper(busParamXcxRoom, req.getParameterMap());
+		Page<BusParamXcxRoom> page = new Page<BusParamXcxRoom>(pageNo, pageSize);
+		IPage<BusParamXcxRoom> pageList = busParamXcxRoomService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+
+	/**
+	 *   添加
+	 *
+	 * @param busParamXcxRoom
+	 * @return
+	 */
+	@AutoLog(value = "小程序客房服务设置-添加")
+	@ApiOperation(value="小程序客房服务设置-添加", notes="小程序客房服务设置-添加")
+	//@RequiresPermissions("business:bus_param_xcx_room_info:add")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody BusParamXcxRoom busParamXcxRoom) {
+		busParamXcxRoomService.save(busParamXcxRoom);
+		return Result.OK("添加成功！");
+	}
+
+	/**
+	 *  编辑
+	 *
+	 * @param busParamXcxRoom
+	 * @return
+	 */
+	@AutoLog(value = "小程序客房服务设置-编辑")
+	@ApiOperation(value="小程序客房服务设置-编辑", notes="小程序客房服务设置-编辑")
+	//@RequiresPermissions("business:bus_param_xcx_room_info:edit")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody BusParamXcxRoom busParamXcxRoom) {
+		busParamXcxRoomService.updateById(busParamXcxRoom);
+		return Result.OK("编辑成功!");
+	}
+
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "小程序客房服务设置-通过id删除")
+	@ApiOperation(value="小程序客房服务设置-通过id删除", notes="小程序客房服务设置-通过id删除")
+	//@RequiresPermissions("business:bus_param_xcx_room_info:delete")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		busParamXcxRoomService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "小程序客房服务设置-批量删除")
+	@ApiOperation(value="小程序客房服务设置-批量删除", notes="小程序客房服务设置-批量删除")
+	//@RequiresPermissions("business:bus_param_xcx_room_info:deleteBatch")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.busParamXcxRoomService.removeByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	//@AutoLog(value = "小程序客房服务设置-通过id查询")
+	@ApiOperation(value="小程序客房服务设置-通过id查询", notes="小程序客房服务设置-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<BusParamXcxRoom> queryById(@RequestParam(name="id",required=true) String id) {
+		BusParamXcxRoom busParamXcxRoom = busParamXcxRoomService.getById(id);
+		if(busParamXcxRoom==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(busParamXcxRoom);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param busParamXcxRoom
+    */
+    //@RequiresPermissions("business:bus_param_xcx_room_info:exportXls")
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, BusParamXcxRoom busParamXcxRoom) {
+        return super.exportXls(request, busParamXcxRoom, BusParamXcxRoom.class, "小程序客房服务设置");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    //@RequiresPermissions("business:bus_param_xcx_room_info:importExcel")
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, BusParamXcxRoom.class);
+    }
+
+	 /**
+	  * 通过hotelId查询
+	  *
+	  * @param hotelId
+	  * @return
+	  */
+	 //@AutoLog(value = "小程序客房服务设置-通过hotelId查询")
+	 @ApiOperation(value="小程序客房服务设置-通过hotelId查询", notes="小程序客房服务设置-通过hotelId查询")
+	 @GetMapping(value = "/queryByHotelId")
+	 public Result<BusParamXcxRoom> queryByHotelId(@RequestParam(name="hotelId",required=true) String hotelId) {
+		 QueryWrapper<BusParamXcxRoom> queryWrapper = new QueryWrapper<BusParamXcxRoom>();
+		 queryWrapper.eq("hotel_id", hotelId);
+		 BusParamXcxRoom resultModel = busParamXcxRoomService.getOne(queryWrapper);
+		 if(resultModel==null) {
+			 return Result.error("");
+		 }
+		 return Result.OK(resultModel);
+	 }
+
+	 /**
+	  *  编辑
+	  *
+	  * @param busParamXcxRoom
+	  * @return
+	  */
+	 @AutoLog(value = "小程序客房服务设置-编辑")
+	 @ApiOperation(value="小程序客房服务设置-编辑", notes="小程序客房服务设置-编辑")
+	 @RequestMapping(value = "/editInfo", method = {RequestMethod.PUT,RequestMethod.POST})
+	 public Result<BusParamXcxRoom> editInfo(@RequestBody BusParamXcxRoom busParamXcxRoom) {
+		 if(busParamXcxRoom.getTenantId() == null || busParamXcxRoom.getTenantId().equals("")){
+			 LoginUser user = TokenUtils.getAuthUser();
+			 if(user.getRelTenantIds() != null && !user.getRelTenantIds().equals("")){
+				 busParamXcxRoom.setTenantId(user.getRelTenantIds());
+			 } else {
+				 throw new JeecgBootException("当前登录人租户信息错误");
+			 }
+		 }
+		 if (busParamXcxRoom.getId() != null && !busParamXcxRoom.getId().equals("")){
+			 BusParamXcxRoom editModel = busParamXcxRoomService.getById(busParamXcxRoom.getId());
+			 editModel.setCheckOut(busParamXcxRoom.getCheckOut());
+			 editModel.setCheckOutType(busParamXcxRoom.getCheckOutType());
+			 editModel.setMessageLive(busParamXcxRoom.getMessageLive());
+			 editModel.setKeepLive(busParamXcxRoom.getKeepLive());
+			 editModel.setServiceLive(busParamXcxRoom.getServiceLive());
+			 editModel.setRepairLive(busParamXcxRoom.getRepairLive());
+			 busParamXcxRoomService.updateById(editModel);
+			 return Result.OK(editModel);
+		 }else{
+			 busParamXcxRoom.setDelFlag(CommonConstant.DEL_FLAG_0);
+			 busParamXcxRoomService.save(busParamXcxRoom);
+			 return Result.OK(busParamXcxRoom);
+		 }
+	 }
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/entity/BusParamComputeFormula.java

@@ -0,0 +1,80 @@
+package org.jeecg.modules.business.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+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: 计算公式
+ * @Author: jeecg-boot
+ * @Date:   2023-03-11
+ * @Version: V1.0
+ */
+@Data
+@TableName("bus_param_compute_formula_info")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="bus_param_compute_formula_info对象", description="计算公式")
+public class BusParamComputeFormula implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**主键*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private String id;
+	/**关联租户*/
+	@Excel(name = "关联租户", width = 15)
+    @ApiModelProperty(value = "关联租户")
+    private String tenantId;
+	/**关联酒店*/
+	@Excel(name = "关联酒店", width = 15)
+    @ApiModelProperty(value = "关联酒店")
+    private String hotelId;
+	/**出租率基数*/
+	@Excel(name = "出租率基数", width = 15)
+    @ApiModelProperty(value = "出租率基数")
+    private Integer cardinal;
+	/**时租计算间夜数*/
+	@Excel(name = "时租计算间夜数", width = 15)
+    @ApiModelProperty(value = "时租计算间夜数")
+    private BigDecimal nights;
+	/**免费房计算平均房价状态(0-关闭；1-开启)*/
+	@Excel(name = "免费房计算平均房价状态(0-关闭；1-开启)", width = 15)
+    @ApiModelProperty(value = "免费房计算平均房价状态(0-关闭；1-开启)")
+    private Integer status;
+	/**删除状态(0-正常,1-已删除)*/
+	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
+    @ApiModelProperty(value = "删除状态(0-正常,1-已删除)")
+    @TableLogic
+    private Integer delFlag;
+	/**创建人*/
+    @ApiModelProperty(value = "创建人")
+    private String createBy;
+	/**创建时间*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+	/**更新人*/
+    @ApiModelProperty(value = "更新人")
+    private String updateBy;
+	/**更新时间*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "更新时间")
+    private Date updateTime;
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/entity/BusParamPreset.java

@@ -0,0 +1,76 @@
+package org.jeecg.modules.business.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+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: 预定参数
+ * @Author: jeecg-boot
+ * @Date:   2023-03-11
+ * @Version: V1.0
+ */
+@Data
+@TableName("bus_param_preset_info")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="bus_param_preset_info对象", description="预定参数")
+public class BusParamPreset implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**主键*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private String id;
+	/**关联租户*/
+	@Excel(name = "关联租户", width = 15)
+    @ApiModelProperty(value = "关联租户")
+    private String tenantId;
+	/**关联酒店*/
+	@Excel(name = "关联酒店", width = 15)
+    @ApiModelProperty(value = "关联酒店")
+    private String hotelId;
+	/**状态(0-关闭；1-开启)*/
+	@Excel(name = "状态(0-关闭；1-开启)", width = 15)
+    @ApiModelProperty(value = "状态(0-关闭；1-开启)")
+    private Integer status;
+	/**预定超时时间*/
+	@Excel(name = "预定超时时间", width = 15)
+    @ApiModelProperty(value = "预定超时时间")
+    private Integer minute;
+	/**删除状态(0-正常,1-已删除)*/
+	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
+    @ApiModelProperty(value = "删除状态(0-正常,1-已删除)")
+    @TableLogic
+    private Integer delFlag;
+	/**创建人*/
+    @ApiModelProperty(value = "创建人")
+    private String createBy;
+	/**创建时间*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+	/**更新人*/
+    @ApiModelProperty(value = "更新人")
+    private String updateBy;
+	/**更新时间*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "更新时间")
+    private Date updateTime;
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/entity/BusParamPresetSync.java

@@ -0,0 +1,72 @@
+package org.jeecg.modules.business.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+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: 线上预定房量同步
+ * @Author: jeecg-boot
+ * @Date:   2023-03-11
+ * @Version: V1.0
+ */
+@Data
+@TableName("bus_param_preset_sync_info")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="bus_param_preset_sync_info对象", description="线上预定房量同步")
+public class BusParamPresetSync implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**主键*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private String id;
+	/**关联租户*/
+	@Excel(name = "关联租户", width = 15)
+    @ApiModelProperty(value = "关联租户")
+    private String tenantId;
+	/**关联酒店*/
+	@Excel(name = "关联酒店", width = 15)
+    @ApiModelProperty(value = "关联酒店")
+    private String hotelId;
+	/**线上预定房量是否同步(0-关闭；1-开启)*/
+	@Excel(name = "线上预定房量是否同步(0-关闭；1-开启)", width = 15)
+    @ApiModelProperty(value = "线上预定房量是否同步(0-关闭；1-开启)")
+    private Integer status;
+	/**删除状态(0-正常,1-已删除)*/
+	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
+    @ApiModelProperty(value = "删除状态(0-正常,1-已删除)")
+    @TableLogic
+    private Integer delFlag;
+	/**创建人*/
+    @ApiModelProperty(value = "创建人")
+    private String createBy;
+	/**创建时间*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+	/**更新人*/
+    @ApiModelProperty(value = "更新人")
+    private String updateBy;
+	/**更新时间*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "更新时间")
+    private Date updateTime;
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/entity/BusParamPrintHide.java

@@ -0,0 +1,76 @@
+package org.jeecg.modules.business.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+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: 打印单据隐藏信息设置
+ * @Author: jeecg-boot
+ * @Date:   2023-03-11
+ * @Version: V1.0
+ */
+@Data
+@TableName("bus_param_print_hide_info")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="bus_param_print_hide_info对象", description="打印单据隐藏信息设置")
+public class BusParamPrintHide implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**主键*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private String id;
+	/**关联租户*/
+	@Excel(name = "关联租户", width = 15)
+    @ApiModelProperty(value = "关联租户")
+    private String tenantId;
+	/**关联酒店*/
+	@Excel(name = "关联酒店", width = 15)
+    @ApiModelProperty(value = "关联酒店")
+    private String hotelId;
+	/**隐藏客人信息(0-关闭；1-开启)*/
+	@Excel(name = "隐藏客人信息(0-关闭；1-开启)", width = 15)
+    @ApiModelProperty(value = "隐藏客人信息(0-关闭；1-开启)")
+    private Integer guest;
+	/**隐藏收款房价信息(0-关闭；1-开启)*/
+	@Excel(name = "隐藏收款房价信息(0-关闭；1-开启)", width = 15)
+    @ApiModelProperty(value = "隐藏收款房价信息(0-关闭；1-开启)")
+    private Integer price;
+	/**删除状态(0-正常,1-已删除)*/
+	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
+    @ApiModelProperty(value = "删除状态(0-正常,1-已删除)")
+    @TableLogic
+    private Integer delFlag;
+	/**创建人*/
+    @ApiModelProperty(value = "创建人")
+    private String createBy;
+	/**创建时间*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+	/**更新人*/
+    @ApiModelProperty(value = "更新人")
+    private String updateBy;
+	/**更新时间*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "更新时间")
+    private Date updateTime;
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/entity/BusParamShare.java

@@ -0,0 +1,84 @@
+package org.jeecg.modules.business.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+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: 数据共享
+ * @Author: jeecg-boot
+ * @Date:   2023-03-11
+ * @Version: V1.0
+ */
+@Data
+@TableName("bus_param_share_info")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="bus_param_share_info对象", description="数据共享")
+public class BusParamShare implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**主键*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private String id;
+	/**关联租户*/
+	@Excel(name = "关联租户", width = 15)
+    @ApiModelProperty(value = "关联租户")
+    private String tenantId;
+	/**关联酒店*/
+	@Excel(name = "关联酒店", width = 15)
+    @ApiModelProperty(value = "关联酒店")
+    private String hotelId;
+	/**协议记账共享(0-关闭；1-开启)*/
+	@Excel(name = "协议记账共享(0-关闭；1-开启)", width = 15)
+    @ApiModelProperty(value = "协议记账共享(0-关闭；1-开启)")
+    private Integer agreementAccountShare;
+	/**协议共享(0-关闭；1-开启)*/
+	@Excel(name = "协议共享(0-关闭；1-开启)", width = 15)
+    @ApiModelProperty(value = "协议共享(0-关闭；1-开启)")
+    private Integer agreementShare;
+	/**会员储值共享(0-关闭；1-开启)*/
+	@Excel(name = "会员储值共享(0-关闭；1-开启)", width = 15)
+    @ApiModelProperty(value = "会员储值共享(0-关闭；1-开启)")
+    private Integer memberAccountShare;
+	/**会员共享(0-关闭；1-开启)*/
+	@Excel(name = "会员共享(0-关闭；1-开启)", width = 15)
+    @ApiModelProperty(value = "会员共享(0-关闭；1-开启)")
+    private Integer memberShare;
+	/**删除状态(0-正常,1-已删除)*/
+	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
+    @ApiModelProperty(value = "删除状态(0-正常,1-已删除)")
+    @TableLogic
+    private Integer delFlag;
+	/**创建人*/
+    @ApiModelProperty(value = "创建人")
+    private String createBy;
+	/**创建时间*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+	/**更新人*/
+    @ApiModelProperty(value = "更新人")
+    private String updateBy;
+	/**更新时间*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "更新时间")
+    private Date updateTime;
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/entity/BusParamWeep.java

@@ -0,0 +1,72 @@
+package org.jeecg.modules.business.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+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: 扫码支付
+ * @Author: jeecg-boot
+ * @Date:   2023-03-11
+ * @Version: V1.0
+ */
+@Data
+@TableName("bus_param_weep_info")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="bus_param_weep_info对象", description="扫码支付")
+public class BusParamWeep implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**主键*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private String id;
+	/**关联租户*/
+	@Excel(name = "关联租户", width = 15)
+    @ApiModelProperty(value = "关联租户")
+    private String tenantId;
+	/**关联酒店*/
+	@Excel(name = "关联酒店", width = 15)
+    @ApiModelProperty(value = "关联酒店")
+    private String hotelId;
+	/**自动完成天数*/
+	@Excel(name = "自动完成天数", width = 15)
+    @ApiModelProperty(value = "自动完成天数")
+    private Integer dayNum;
+	/**删除状态(0-正常,1-已删除)*/
+	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
+    @ApiModelProperty(value = "删除状态(0-正常,1-已删除)")
+    @TableLogic
+    private Integer delFlag;
+	/**创建人*/
+    @ApiModelProperty(value = "创建人")
+    private String createBy;
+	/**创建时间*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+	/**更新人*/
+    @ApiModelProperty(value = "更新人")
+    private String updateBy;
+	/**更新时间*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "更新时间")
+    private Date updateTime;
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/entity/BusParamXcxRoom.java

@@ -0,0 +1,92 @@
+package org.jeecg.modules.business.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+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: 小程序客房服务设置
+ * @Author: jeecg-boot
+ * @Date:   2023-03-11
+ * @Version: V1.0
+ */
+@Data
+@TableName("bus_param_xcx_room_info")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="bus_param_xcx_room_info对象", description="小程序客房服务设置")
+public class BusParamXcxRoom implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**主键*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private String id;
+	/**关联租户*/
+	@Excel(name = "关联租户", width = 15)
+    @ApiModelProperty(value = "关联租户")
+    private String tenantId;
+	/**关联酒店*/
+	@Excel(name = "关联酒店", width = 15)
+    @ApiModelProperty(value = "关联酒店")
+    private String hotelId;
+	/**退房功能(0-关闭；1-开启)*/
+	@Excel(name = "退房功能(0-关闭；1-开启)", width = 15)
+    @ApiModelProperty(value = "退房功能(0-关闭；1-开启)")
+    private Integer checkOut;
+	/**退房方式(0-未结；1-结账)*/
+	@Excel(name = "退房方式(0-未结；1-结账)", width = 15)
+    @ApiModelProperty(value = "退房方式(0-未结；1-结账)")
+    private Integer checkOutType;
+	/**续住功能(0-关闭；1-开启)*/
+	@Excel(name = "续住功能(0-关闭；1-开启)", width = 15)
+    @ApiModelProperty(value = "续住功能(0-关闭；1-开启)")
+    private Integer keepLive;
+	/**留言功能(0-关闭；1-开启)*/
+	@Excel(name = "留言功能(0-关闭；1-开启)", width = 15)
+    @ApiModelProperty(value = "留言功能(0-关闭；1-开启)")
+    private Integer messageLive;
+	/**服务功能(0-关闭；1-开启)*/
+	@Excel(name = "服务功能(0-关闭；1-开启)", width = 15)
+    @ApiModelProperty(value = "服务功能(0-关闭；1-开启)")
+    private Integer serviceLive;
+	/**维修功能(0-关闭；1-开启)*/
+	@Excel(name = "维修功能(0-关闭；1-开启)", width = 15)
+    @ApiModelProperty(value = "维修功能(0-关闭；1-开启)")
+    private Integer repairLive;
+	/**删除状态(0-正常,1-已删除)*/
+	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
+    @ApiModelProperty(value = "删除状态(0-正常,1-已删除)")
+    @TableLogic
+    private Integer delFlag;
+	/**创建人*/
+    @ApiModelProperty(value = "创建人")
+    private String createBy;
+	/**创建时间*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+	/**更新人*/
+    @ApiModelProperty(value = "更新人")
+    private String updateBy;
+	/**更新时间*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "更新时间")
+    private Date updateTime;
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/BusParamComputeFormulaMapper.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.business.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.business.entity.BusParamComputeFormula;
+
+/**
+ * @Description: 计算公式
+ * @Author: jeecg-boot
+ * @Date:   2023-03-11
+ * @Version: V1.0
+ */
+public interface BusParamComputeFormulaMapper extends BaseMapper<BusParamComputeFormula> {
+
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/BusParamPresetMapper.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.business.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.business.entity.BusParamPreset;
+
+/**
+ * @Description: 预定参数
+ * @Author: jeecg-boot
+ * @Date:   2023-03-11
+ * @Version: V1.0
+ */
+public interface BusParamPresetMapper extends BaseMapper<BusParamPreset> {
+
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/BusParamPresetSyncMapper.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.business.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.business.entity.BusParamPresetSync;
+
+/**
+ * @Description: 线上预定房量同步
+ * @Author: jeecg-boot
+ * @Date:   2023-03-11
+ * @Version: V1.0
+ */
+public interface BusParamPresetSyncMapper extends BaseMapper<BusParamPresetSync> {
+
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/BusParamPrintHideMapper.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.business.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.business.entity.BusParamPrintHide;
+
+/**
+ * @Description: 打印单据隐藏信息设置
+ * @Author: jeecg-boot
+ * @Date:   2023-03-11
+ * @Version: V1.0
+ */
+public interface BusParamPrintHideMapper extends BaseMapper<BusParamPrintHide> {
+
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/BusParamShareMapper.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.business.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.business.entity.BusParamShare;
+
+/**
+ * @Description: 数据共享
+ * @Author: jeecg-boot
+ * @Date:   2023-03-11
+ * @Version: V1.0
+ */
+public interface BusParamShareMapper extends BaseMapper<BusParamShare> {
+
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/BusParamWeepMapper.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.business.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.business.entity.BusParamWeep;
+
+/**
+ * @Description: 扫码支付
+ * @Author: jeecg-boot
+ * @Date:   2023-03-11
+ * @Version: V1.0
+ */
+public interface BusParamWeepMapper extends BaseMapper<BusParamWeep> {
+
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/BusParamXcxRoomMapper.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.business.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.business.entity.BusParamXcxRoom;
+
+/**
+ * @Description: 小程序客房服务设置
+ * @Author: jeecg-boot
+ * @Date:   2023-03-11
+ * @Version: V1.0
+ */
+public interface BusParamXcxRoomMapper extends BaseMapper<BusParamXcxRoom> {
+
+}

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

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

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

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

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

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

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

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/IBusParamComputeFormulaService.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.business.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.business.entity.BusParamComputeFormula;
+
+/**
+ * @Description: 计算公式
+ * @Author: jeecg-boot
+ * @Date:   2023-03-11
+ * @Version: V1.0
+ */
+public interface IBusParamComputeFormulaService extends IService<BusParamComputeFormula> {
+
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/IBusParamPresetService.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.business.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.business.entity.BusParamPreset;
+
+/**
+ * @Description: 预定参数
+ * @Author: jeecg-boot
+ * @Date:   2023-03-11
+ * @Version: V1.0
+ */
+public interface IBusParamPresetService extends IService<BusParamPreset> {
+
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/IBusParamPresetSyncService.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.business.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.business.entity.BusParamPresetSync;
+
+/**
+ * @Description: 线上预定房量同步
+ * @Author: jeecg-boot
+ * @Date:   2023-03-11
+ * @Version: V1.0
+ */
+public interface IBusParamPresetSyncService extends IService<BusParamPresetSync> {
+
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/IBusParamPrintHideService.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.business.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.business.entity.BusParamPrintHide;
+
+/**
+ * @Description: 打印单据隐藏信息设置
+ * @Author: jeecg-boot
+ * @Date:   2023-03-11
+ * @Version: V1.0
+ */
+public interface IBusParamPrintHideService extends IService<BusParamPrintHide> {
+
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/IBusParamShareService.java

@@ -0,0 +1,13 @@
+package org.jeecg.modules.business.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.business.entity.BusParamShare;
+/**
+ * @Description: 数据共享
+ * @Author: jeecg-boot
+ * @Date:   2023-03-11
+ * @Version: V1.0
+ */
+public interface IBusParamShareService extends IService<BusParamShare> {
+
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/IBusParamWeepService.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.business.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.business.entity.BusParamWeep;
+
+/**
+ * @Description: 扫码支付
+ * @Author: jeecg-boot
+ * @Date:   2023-03-11
+ * @Version: V1.0
+ */
+public interface IBusParamWeepService extends IService<BusParamWeep> {
+
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/IBusParamXcxRoomService.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.business.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.business.entity.BusParamXcxRoom;
+
+/**
+ * @Description: 小程序客房服务设置
+ * @Author: jeecg-boot
+ * @Date:   2023-03-11
+ * @Version: V1.0
+ */
+public interface IBusParamXcxRoomService extends IService<BusParamXcxRoom> {
+
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/BusParamComputeFormulaServiceImpl.java

@@ -0,0 +1,19 @@
+package org.jeecg.modules.business.service.impl;
+
+import org.jeecg.modules.business.entity.BusParamComputeFormula;
+import org.jeecg.modules.business.mapper.BusParamComputeFormulaMapper;
+import org.jeecg.modules.business.service.IBusParamComputeFormulaService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 计算公式
+ * @Author: jeecg-boot
+ * @Date:   2023-03-11
+ * @Version: V1.0
+ */
+@Service
+public class BusParamComputeFormulaServiceImpl extends ServiceImpl<BusParamComputeFormulaMapper, BusParamComputeFormula> implements IBusParamComputeFormulaService {
+
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/BusParamPresetServiceImpl.java

@@ -0,0 +1,19 @@
+package org.jeecg.modules.business.service.impl;
+
+import org.jeecg.modules.business.entity.BusParamPreset;
+import org.jeecg.modules.business.mapper.BusParamPresetMapper;
+import org.jeecg.modules.business.service.IBusParamPresetService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 预定参数
+ * @Author: jeecg-boot
+ * @Date:   2023-03-11
+ * @Version: V1.0
+ */
+@Service
+public class BusParamPresetServiceImpl extends ServiceImpl<BusParamPresetMapper, BusParamPreset> implements IBusParamPresetService {
+
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/BusParamPresetSyncServiceImpl.java

@@ -0,0 +1,19 @@
+package org.jeecg.modules.business.service.impl;
+
+import org.jeecg.modules.business.entity.BusParamPresetSync;
+import org.jeecg.modules.business.mapper.BusParamPresetSyncMapper;
+import org.jeecg.modules.business.service.IBusParamPresetSyncService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 线上预定房量同步
+ * @Author: jeecg-boot
+ * @Date:   2023-03-11
+ * @Version: V1.0
+ */
+@Service
+public class BusParamPresetSyncServiceImpl extends ServiceImpl<BusParamPresetSyncMapper, BusParamPresetSync> implements IBusParamPresetSyncService {
+
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/BusParamPrintHideServiceImpl.java

@@ -0,0 +1,19 @@
+package org.jeecg.modules.business.service.impl;
+
+import org.jeecg.modules.business.entity.BusParamPrintHide;
+import org.jeecg.modules.business.mapper.BusParamPrintHideMapper;
+import org.jeecg.modules.business.service.IBusParamPrintHideService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 打印单据隐藏信息设置
+ * @Author: jeecg-boot
+ * @Date:   2023-03-11
+ * @Version: V1.0
+ */
+@Service
+public class BusParamPrintHideServiceImpl extends ServiceImpl<BusParamPrintHideMapper, BusParamPrintHide> implements IBusParamPrintHideService {
+
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/BusParamShareServiceImpl.java

@@ -0,0 +1,19 @@
+package org.jeecg.modules.business.service.impl;
+
+import org.jeecg.modules.business.entity.BusParamShare;
+import org.jeecg.modules.business.mapper.BusParamShareMapper;
+import org.jeecg.modules.business.service.IBusParamShareService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 数据共享
+ * @Author: jeecg-boot
+ * @Date:   2023-03-11
+ * @Version: V1.0
+ */
+@Service
+public class BusParamShareServiceImpl extends ServiceImpl<BusParamShareMapper, BusParamShare> implements IBusParamShareService {
+
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/BusParamWeepServiceImpl.java

@@ -0,0 +1,19 @@
+package org.jeecg.modules.business.service.impl;
+
+import org.jeecg.modules.business.entity.BusParamWeep;
+import org.jeecg.modules.business.mapper.BusParamWeepMapper;
+import org.jeecg.modules.business.service.IBusParamWeepService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 扫码支付
+ * @Author: jeecg-boot
+ * @Date:   2023-03-11
+ * @Version: V1.0
+ */
+@Service
+public class BusParamWeepServiceImpl extends ServiceImpl<BusParamWeepMapper, BusParamWeep> implements IBusParamWeepService {
+
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/BusParamXcxRoomServiceImpl.java

@@ -0,0 +1,19 @@
+package org.jeecg.modules.business.service.impl;
+
+import org.jeecg.modules.business.entity.BusParamXcxRoom;
+import org.jeecg.modules.business.mapper.BusParamXcxRoomMapper;
+import org.jeecg.modules.business.service.IBusParamXcxRoomService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 小程序客房服务设置
+ * @Author: jeecg-boot
+ * @Date:   2023-03-11
+ * @Version: V1.0
+ */
+@Service
+public class BusParamXcxRoomServiceImpl extends ServiceImpl<BusParamXcxRoomMapper, BusParamXcxRoom> implements IBusParamXcxRoomService {
+
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/rooms/entity/CesRoomLayout.java

@@ -15,8 +15,8 @@ import lombok.experimental.Accessors;
  * 租户房型记录表
  * </p>
  *
- * @author fendo
- * @since 2023-03-02
+ * @author Claude
+ * @since 2023-03-11
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -132,12 +132,12 @@ public class CesRoomLayout extends Model<CesRoomLayout> {
     private Integer cancelDayNum;
 
     /**
-      1 入住当天
-      2 入住前 天数 可以取消
-      3 入住前 多少天 可以取消 要收取罚金
-      4不可以取消
-      5 可取消
-    */
+     * 1 入住当天
+2 入住前 天数 可以取消
+3 入住前 多少天 可以取消 要收取罚金
+4不可以取消
+5 可取消
+     */
     private Integer cancelRule;
 
     /**
@@ -157,6 +157,16 @@ public class CesRoomLayout extends Model<CesRoomLayout> {
      */
     private Boolean invalid;
 
+    /**
+     * 取消罚金
+     */
+    private BigDecimal cancelMoney;
+
+    /**
+     * 取消前时间节点
+     */
+    private String cancelBeforeTime;
+
 
     public static final String ID = "id";
 
@@ -208,6 +218,10 @@ public class CesRoomLayout extends Model<CesRoomLayout> {
 
     public static final String INVALID = "invalid";
 
+    public static final String CANCEL_MONEY = "cancel_money";
+
+    public static final String CANCEL_BEFORE_TIME = "cancel_before_time";
+
     @Override
     public Serializable pkVal() {
         return this.id;

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/rooms/service/CesRoomLayoutMemberPriceServiceImpl.java

@@ -39,7 +39,7 @@ public class CesRoomLayoutMemberPriceServiceImpl extends ServiceImpl<CesRoomLayo
 
     /**
      * 获取会员等级数据
-     * @param parentId
+     * @param parentId`
      * @return
      */
     public List<CesRoomLayoutMemberPrice> getListByParentId(String parentId){