房间设置-房价方案-每日房价

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

@@ -0,0 +1,294 @@
+package org.jeecg.modules.business.controller;
+
+import java.sql.Time;
+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.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import org.apache.commons.lang.StringUtils;
+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.BusHousePriceSchemeLayout;
+import org.jeecg.modules.business.entity.BusNightTrial;
+import org.jeecg.modules.business.entity.BusSalesPerson;
+import org.jeecg.modules.business.entity.BusSalesPersonPost;
+import org.jeecg.modules.business.service.IBusHousePriceSchemeLayoutService;
+import org.jeecg.modules.rooms.entity.CesRoomLayout;
+import org.jeecg.modules.rooms.service.CesRoomLayoutServiceImpl;
+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-04-07
+ * @Version: V1.0
+ */
+@Api(tags="房价方案-房型关联表")
+@RestController
+@RequestMapping("/business/busHousePriceSchemeLayout")
+@Slf4j
+public class BusHousePriceSchemeLayoutController extends JeecgController<BusHousePriceSchemeLayout, IBusHousePriceSchemeLayoutService> {
+	@Autowired
+	private IBusHousePriceSchemeLayoutService busHousePriceSchemeLayoutService;
+
+	 @Resource
+	 private CesRoomLayoutServiceImpl cesRoomLayoutService;
+	/**
+	 * 分页列表查询
+	 *
+	 * @param busHousePriceSchemeLayout
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "房价方案-房型关联表-分页列表查询")
+	@ApiOperation(value="房价方案-房型关联表-分页列表查询", notes="房价方案-房型关联表-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<BusHousePriceSchemeLayout>> queryPageList(BusHousePriceSchemeLayout busHousePriceSchemeLayout,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<BusHousePriceSchemeLayout> queryWrapper = QueryGenerator.initQueryWrapper(busHousePriceSchemeLayout, req.getParameterMap());
+		Page<BusHousePriceSchemeLayout> page = new Page<BusHousePriceSchemeLayout>(pageNo, pageSize);
+		IPage<BusHousePriceSchemeLayout> pageList = busHousePriceSchemeLayoutService.page(page, queryWrapper);
+		pageList.getRecords().forEach(item->{
+			CesRoomLayout layout = cesRoomLayoutService.getById(item.getLayoutId());
+			if (layout != null) {
+				item.setLayoutName(layout.getName());
+				item.setLayoutPrice(layout.getMarketPrice());
+			}
+		});
+		return Result.OK(pageList);
+	}
+
+	 /**
+	  * 列表查询
+	  *
+	  * @param busHousePriceSchemeLayout
+	  * @param req
+	  * @return
+	  */
+	 //@AutoLog(value = "房价方案-房型关联表-列表查询")
+	 @ApiOperation(value="房价方案-房型关联表-列表查询", notes="房价方案-房型关联表-列表查询")
+	 @GetMapping(value = "/queryList")
+	 public Result<List<BusHousePriceSchemeLayout>> queryList(BusHousePriceSchemeLayout busHousePriceSchemeLayout, HttpServletRequest req) {
+		 QueryWrapper<BusHousePriceSchemeLayout> queryWrapper = QueryGenerator.initQueryWrapper(busHousePriceSchemeLayout, req.getParameterMap());
+		 LoginUser user = TokenUtils.getAuthUser();
+		 if(user.getRelTenantIds() != null && !user.getRelTenantIds().equals("")){
+			 queryWrapper.eq("tenant_id",user.getRelTenantIds());
+		 }
+		 queryWrapper.eq("del_flag",0);
+		 List<BusHousePriceSchemeLayout> list = busHousePriceSchemeLayoutService.list(queryWrapper);
+		 return Result.OK(list);
+	 }
+
+	/**
+	 *   添加
+	 *
+	 * @param busHousePriceSchemeLayout
+	 * @return
+	 */
+	@AutoLog(value = "房价方案-房型关联表-添加")
+	@ApiOperation(value="房价方案-房型关联表-添加", notes="房价方案-房型关联表-添加")
+	//@RequiresPermissions("business:bus_house_price_scheme_layout_info:add")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody BusHousePriceSchemeLayout busHousePriceSchemeLayout) {
+		busHousePriceSchemeLayoutService.save(busHousePriceSchemeLayout);
+		return Result.OK("添加成功！");
+	}
+
+	/**
+	 *  编辑
+	 *
+	 * @param busHousePriceSchemeLayout
+	 * @return
+	 */
+	@AutoLog(value = "房价方案-房型关联表-编辑")
+	@ApiOperation(value="房价方案-房型关联表-编辑", notes="房价方案-房型关联表-编辑")
+	//@RequiresPermissions("business:bus_house_price_scheme_layout_info:edit")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody BusHousePriceSchemeLayout busHousePriceSchemeLayout) {
+		busHousePriceSchemeLayoutService.updateById(busHousePriceSchemeLayout);
+		return Result.OK("编辑成功!");
+	}
+
+	 /**
+	  *  编辑
+	  *
+	  * @param busHousePriceSchemeLayout
+	  * @return
+	  */
+	 @AutoLog(value = "房价方案-房型关联表-编辑")
+	 @ApiOperation(value="房价方案-房型关联表-编辑", notes="房价方案-房型关联表-编辑")
+	 //@RequiresPermissions("business:bus_night_trial_info:edit")
+	 @RequestMapping(value = "/editMoney", method = {RequestMethod.PUT,RequestMethod.POST})
+	 public Result<BusHousePriceSchemeLayout> editMoney(@RequestBody BusHousePriceSchemeLayout busHousePriceSchemeLayout) {
+		 if(busHousePriceSchemeLayout.getTenantId() == null || busHousePriceSchemeLayout.getTenantId().equals("")){
+			 LoginUser user = TokenUtils.getAuthUser();
+			 if(user.getRelTenantIds() != null && !user.getRelTenantIds().equals("")){
+				 busHousePriceSchemeLayout.setTenantId(user.getRelTenantIds());
+			 } else {
+				 throw new JeecgBootException("当前登录人租户信息错误");
+			 }
+		 }
+		 BusHousePriceSchemeLayout editModel = busHousePriceSchemeLayoutService.getById(busHousePriceSchemeLayout.getId());
+		 editModel.setMoney(busHousePriceSchemeLayout.getMoney());
+		 busHousePriceSchemeLayoutService.updateById(editModel);
+		 return Result.OK(editModel);
+	 }
+
+	 /**
+	  *  编辑
+	  *
+	  * @param busHousePriceSchemeLayout
+	  * @return
+	  */
+	 @AutoLog(value = "房价方案-房型关联表-编辑")
+	 @ApiOperation(value="房价方案-房型关联表-编辑", notes="房价方案-房型关联表-编辑")
+	 @RequestMapping(value = "/editNumber", method = {RequestMethod.PUT,RequestMethod.POST})
+	 public Result<BusHousePriceSchemeLayout> editNumber(@RequestBody BusHousePriceSchemeLayout busHousePriceSchemeLayout) {
+		 if(busHousePriceSchemeLayout.getTenantId() == null || busHousePriceSchemeLayout.getTenantId().equals("")){
+			 LoginUser user = TokenUtils.getAuthUser();
+			 if(user.getRelTenantIds() != null && !user.getRelTenantIds().equals("")){
+				 busHousePriceSchemeLayout.setTenantId(user.getRelTenantIds());
+			 } else {
+				 throw new JeecgBootException("当前登录人租户信息错误");
+			 }
+		 }
+		 BusHousePriceSchemeLayout editModel = busHousePriceSchemeLayoutService.getById(busHousePriceSchemeLayout.getId());
+		 editModel.setBreakfastNumber(busHousePriceSchemeLayout.getBreakfastNumber());
+		 busHousePriceSchemeLayoutService.updateById(editModel);
+		 return Result.OK(editModel);
+	 }
+
+	 /**
+	  *  编辑
+	  *
+	  * @param busHousePriceSchemeLayout
+	  * @return
+	  */
+	 @AutoLog(value = "房价方案-房型关联表-编辑")
+	 @ApiOperation(value="房价方案-房型关联表-编辑", notes="房价方案-房型关联表-编辑")
+	 @RequestMapping(value = "/editTime", method = {RequestMethod.PUT,RequestMethod.POST})
+	 public Result<BusHousePriceSchemeLayout> editTime(@RequestBody BusHousePriceSchemeLayout busHousePriceSchemeLayout) {
+		 if(busHousePriceSchemeLayout.getTenantId() == null || busHousePriceSchemeLayout.getTenantId().equals("")){
+			 LoginUser user = TokenUtils.getAuthUser();
+			 if(user.getRelTenantIds() != null && !user.getRelTenantIds().equals("")){
+				 busHousePriceSchemeLayout.setTenantId(user.getRelTenantIds());
+			 } else {
+				 throw new JeecgBootException("当前登录人租户信息错误");
+			 }
+		 }
+		 BusHousePriceSchemeLayout editModel = busHousePriceSchemeLayoutService.getById(busHousePriceSchemeLayout.getId());
+		 editModel.setDepartureTime(busHousePriceSchemeLayout.getDepartureTime());
+		 busHousePriceSchemeLayoutService.updateById(editModel);
+		 return Result.OK(editModel);
+	 }
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "房价方案-房型关联表-通过id删除")
+	@ApiOperation(value="房价方案-房型关联表-通过id删除", notes="房价方案-房型关联表-通过id删除")
+	//@RequiresPermissions("business:bus_house_price_scheme_layout_info:delete")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		busHousePriceSchemeLayoutService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "房价方案-房型关联表-批量删除")
+	@ApiOperation(value="房价方案-房型关联表-批量删除", notes="房价方案-房型关联表-批量删除")
+	//@RequiresPermissions("business:bus_house_price_scheme_layout_info:deleteBatch")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.busHousePriceSchemeLayoutService.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<BusHousePriceSchemeLayout> queryById(@RequestParam(name="id",required=true) String id) {
+		BusHousePriceSchemeLayout busHousePriceSchemeLayout = busHousePriceSchemeLayoutService.getById(id);
+		if(busHousePriceSchemeLayout==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(busHousePriceSchemeLayout);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param busHousePriceSchemeLayout
+    */
+    //@RequiresPermissions("business:bus_house_price_scheme_layout_info:exportXls")
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, BusHousePriceSchemeLayout busHousePriceSchemeLayout) {
+        return super.exportXls(request, busHousePriceSchemeLayout, BusHousePriceSchemeLayout.class, "房价方案-房型关联表");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    //@RequiresPermissions("business:bus_house_price_scheme_layout_info:importExcel")
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, BusHousePriceSchemeLayout.class);
+    }
+
+}

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

@@ -0,0 +1,500 @@
+package org.jeecg.modules.business.controller;
+
+import java.math.BigDecimal;
+import java.sql.Time;
+import java.text.SimpleDateFormat;
+import java.util.*;
+import java.util.stream.Collectors;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import cn.hutool.core.date.DateUnit;
+import cn.hutool.core.date.DateUtil;
+import lombok.Data;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.constant.CommonConstant;
+import org.jeecg.common.exception.JeecgBootException;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.system.vo.LoginUser;
+import org.jeecg.common.util.DateUtils;
+import org.jeecg.common.util.TokenUtils;
+import org.jeecg.common.util.oConvertUtils;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+
+import org.jeecg.modules.business.dto.BusSchemeLayoutDailyPriceDetailDto;
+import org.jeecg.modules.business.dto.BusSchemeLayoutDailyPriceDto;
+import org.jeecg.modules.business.dto.BusSchemeLayoutDailyPriceListDto;
+import org.jeecg.modules.business.entity.BusHousePriceSchemeLayout;
+import org.jeecg.modules.business.entity.BusNightTrial;
+import org.jeecg.modules.business.entity.BusSalesPerson;
+import org.jeecg.modules.business.entity.BusSchemeLayoutDailyPrice;
+import org.jeecg.modules.business.service.IBusHousePriceSchemeLayoutService;
+import org.jeecg.modules.business.service.IBusSchemeLayoutDailyPriceService;
+import org.jeecg.modules.rooms.entity.CesRoomLayout;
+import org.jeecg.modules.rooms.service.CesRoomLayoutServiceImpl;
+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-04-08
+ * @Version: V1.0
+ */
+@Api(tags="房价方案-每日房价表")
+@RestController
+@RequestMapping("/business/busSchemeLayoutDailyPrice")
+@Slf4j
+public class BusSchemeLayoutDailyPriceController extends JeecgController<BusSchemeLayoutDailyPrice, IBusSchemeLayoutDailyPriceService> {
+	@Autowired
+	private IBusSchemeLayoutDailyPriceService busSchemeLayoutDailyPriceService;
+
+	 @Autowired
+	 private IBusHousePriceSchemeLayoutService busHousePriceSchemeLayoutService;
+
+	 @Resource
+	 private CesRoomLayoutServiceImpl cesRoomLayoutService;
+
+	/**
+	 * 分页列表查询
+	 *
+	 * @param busSchemeLayoutDailyPrice
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "房价方案-每日房价表-分页列表查询")
+	@ApiOperation(value="房价方案-每日房价表-分页列表查询", notes="房价方案-每日房价表-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<BusSchemeLayoutDailyPrice>> queryPageList(BusSchemeLayoutDailyPrice busSchemeLayoutDailyPrice,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<BusSchemeLayoutDailyPrice> queryWrapper = QueryGenerator.initQueryWrapper(busSchemeLayoutDailyPrice, req.getParameterMap());
+		Page<BusSchemeLayoutDailyPrice> page = new Page<BusSchemeLayoutDailyPrice>(pageNo, pageSize);
+		IPage<BusSchemeLayoutDailyPrice> pageList = busSchemeLayoutDailyPriceService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+	 public static List<Date> findDates(Date dBegin, Date dEnd)
+	 {
+		 List lDate = new ArrayList();
+		 lDate.add(dBegin);
+		 Calendar calBegin = Calendar.getInstance();
+		 // 使用给定的 Date 设置此 Calendar 的时间
+		 calBegin.setTime(dBegin);
+		 Calendar calEnd = Calendar.getInstance();
+		 // 使用给定的 Date 设置此 Calendar 的时间
+		 calEnd.setTime(dEnd);
+		 // 测试此日期是否在指定日期之后
+		 while (dEnd.after(calBegin.getTime()))
+		 {
+			 // 根据日历的规则，为给定的日历字段添加或减去指定的时间量
+			 calBegin.add(Calendar.DAY_OF_MONTH, 1);
+			 lDate.add(calBegin.getTime());
+		 }
+		 return lDate;
+	 }
+	 /**
+	  * 列表查询
+	  *
+	  * @param busSchemeLayoutDailyPrice
+	  * @param req
+	  * @return
+	  */
+	 //@AutoLog(value = "每日房价-列表查询")
+	 @ApiOperation(value="每日房价-列表查询", notes="每日房价-列表查询")
+	 @GetMapping(value = "/queryList")
+	 public Result<List<BusSchemeLayoutDailyPrice>> queryList(BusSchemeLayoutDailyPrice busSchemeLayoutDailyPrice, HttpServletRequest req) {
+		 QueryWrapper<BusSchemeLayoutDailyPrice> queryWrapper = QueryGenerator.initQueryWrapper(busSchemeLayoutDailyPrice, req.getParameterMap());
+		 LoginUser user = TokenUtils.getAuthUser();
+		 if(user.getRelTenantIds() != null && !user.getRelTenantIds().equals("")){
+			 queryWrapper.eq("tenant_id",user.getRelTenantIds());
+		 }
+		 queryWrapper.eq("del_flag",0);
+		 List<BusSchemeLayoutDailyPrice> list = busSchemeLayoutDailyPriceService.list(queryWrapper);
+		 //获取从今天开始，两个月时间的数据
+		 SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd 00:00:00");
+		 Calendar calendar = Calendar.getInstance();
+		 calendar.setTime(new Date());
+		 calendar.set(Calendar.HOUR_OF_DAY, 0);
+		 calendar.set(Calendar.MINUTE, 0);
+		 calendar.set(Calendar.SECOND, 0);
+		 Date startDate = calendar.getTime();
+		 calendar.add(Calendar.MONTH, 2);
+		 calendar.add(Calendar.DATE, -1);
+		 Date endDate = calendar.getTime();
+
+		 List<Date> lDate = findDates(startDate, endDate);
+		 String _realDate = req.getParameter("realDate");
+		 if (_realDate != null && !_realDate.equals("")){
+			 Date realDate = DateUtils.parseDatetime(_realDate);
+			 lDate = findDates(realDate, endDate);
+		 }
+		 List<BusSchemeLayoutDailyPrice> newList = new ArrayList<>();
+		 String schemeLayoutId = req.getParameter("schemeLayoutId");
+		 BusHousePriceSchemeLayout busHousePriceSchemeLayout = busHousePriceSchemeLayoutService.getById(schemeLayoutId);
+		 if (list !=null && list.size() >= 0){
+			 lDate.forEach(day->{
+				 BusSchemeLayoutDailyPrice dayMoney = new BusSchemeLayoutDailyPrice();
+				 dayMoney.setSchemeLayoutId(schemeLayoutId);
+				 int flag = 0;
+				 for(BusSchemeLayoutDailyPrice s: list){
+					 if(format.format(day).equals(format.format(s.getDate()))){
+						 flag= 1;
+						 dayMoney.setMoney(s.getMoney());
+						 dayMoney.setId(s.getId());
+						 dayMoney.setDate(s.getDate());
+					 }
+				 }
+				 if (flag == 0){
+					 dayMoney.setMoney(busHousePriceSchemeLayout.getMoney());
+					 dayMoney.setId("");
+					 dayMoney.setDate(day);
+				 }
+				 newList.add(dayMoney);
+			 });
+		 }else{
+			 lDate.forEach(day->{
+				 BusSchemeLayoutDailyPrice dayMoney = new BusSchemeLayoutDailyPrice();
+				 dayMoney.setSchemeLayoutId(schemeLayoutId);
+				 dayMoney.setMoney(busHousePriceSchemeLayout.getMoney());
+				 dayMoney.setId("");
+				 dayMoney.setDate(day);
+				 newList.add(dayMoney);
+			 });
+		 }
+		 return Result.OK(newList);
+	 }
+
+	 /**
+	  * 列表查询
+	  *
+	  * @param busSchemeLayoutDailyPriceDto
+	  * @param req
+	  * @return
+	  */
+	 //@AutoLog(value = "每日房价-列表查询")
+	 @ApiOperation(value="每日房价-列表查询", notes="每日房价-列表查询")
+	 @GetMapping(value = "/queryListByCond")
+	 public Result<BusSchemeLayoutDailyPriceListDto> queryListByCond(BusSchemeLayoutDailyPriceDto busSchemeLayoutDailyPriceDto, HttpServletRequest req) {
+		 LoginUser user = TokenUtils.getAuthUser();
+		 QueryWrapper<BusHousePriceSchemeLayout> queryWrapper1 = new QueryWrapper<>();
+		 if(user.getRelTenantIds() != null && !user.getRelTenantIds().equals("")){
+			 queryWrapper1.eq("tenant_id",user.getRelTenantIds());
+		 }
+		 queryWrapper1.eq("del_flag",0);
+		 queryWrapper1.eq("hotel_id",busSchemeLayoutDailyPriceDto.getHotelId());
+		 queryWrapper1.eq("scheme_id",busSchemeLayoutDailyPriceDto.getSchemeId());
+		 queryWrapper1.eq("layout_id",busSchemeLayoutDailyPriceDto.getLayoutId());
+		 BusHousePriceSchemeLayout busHousePriceSchemeLayout = busHousePriceSchemeLayoutService.getOne(queryWrapper1);
+
+		 if (busHousePriceSchemeLayout == null){
+			 return Result.error("未查询到相关数据");
+		 }
+
+		 String _startDate = busSchemeLayoutDailyPriceDto.getStartDate()+" 00:00:00";
+		 String _endDate = busSchemeLayoutDailyPriceDto.getEndDate()+" 00:00:00";
+		 SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd 00:00:00");
+		 Date startDate = DateUtils.parseDatetime(_startDate);
+		 Date endDate = DateUtils.parseDatetime(_endDate);
+		 List<Date> dateList = findDates(startDate, endDate);
+		 String schemeLayoutId = busHousePriceSchemeLayout.getId();
+
+		 //获取当前所有满足条件的房价
+		 QueryWrapper<BusSchemeLayoutDailyPrice> queryWrapper = new QueryWrapper<>();
+		 if(user.getRelTenantIds() != null && !user.getRelTenantIds().equals("")){
+			 queryWrapper.eq("tenant_id",user.getRelTenantIds());
+		 }
+		 queryWrapper.eq("del_flag",0);
+		 queryWrapper.eq("hotel_id",busSchemeLayoutDailyPriceDto.getHotelId());
+		 queryWrapper.eq("scheme_layout_id",schemeLayoutId);
+		 List<BusSchemeLayoutDailyPrice> list = busSchemeLayoutDailyPriceService.list(queryWrapper);
+
+		 BusSchemeLayoutDailyPriceListDto result = new BusSchemeLayoutDailyPriceListDto();
+		 result.setLayoutId(busSchemeLayoutDailyPriceDto.getLayoutId());
+		 result.setSchemeId(busSchemeLayoutDailyPriceDto.getSchemeId());
+		 result.setDepartureTime(busHousePriceSchemeLayout.getDepartureTime());
+		 CesRoomLayout layout = cesRoomLayoutService.getById(busHousePriceSchemeLayout.getLayoutId());
+		 if (layout != null) {
+			 result.setLayoutPrice(layout.getMarketPrice());
+		 }
+		 result.setLayoutPrice(busHousePriceSchemeLayout.getLayoutPrice());
+		 List<BusSchemeLayoutDailyPriceDetailDto> detailDtos = new ArrayList<>();
+
+		 Calendar calendar = Calendar.getInstance();
+		 calendar.setTime(new Date());
+		 calendar.set(Calendar.HOUR_OF_DAY, 0);
+		 calendar.set(Calendar.MINUTE, 0);
+		 calendar.set(Calendar.SECOND, 0);
+		 Date curDate = calendar.getTime();
+		 if (dateList != null && dateList.size() > 0){
+			 dateList.forEach( day -> {
+				 BusSchemeLayoutDailyPriceDetailDto detailDto = new BusSchemeLayoutDailyPriceDetailDto();
+				 int flag = 0;
+				 BigDecimal curMoney = new BigDecimal(0);
+				 for(BusSchemeLayoutDailyPrice s: list){
+					 if(format.format(day).equals(format.format(s.getDate()))){
+						 flag= 1;
+						 detailDto.setDate(s.getDate());
+						 detailDto.setMoney(s.getMoney());
+						 detailDto.setId(s.getId());
+						 curMoney=s.getMoney();
+					 }
+				 }
+				 if (flag == 0){
+					 detailDto.setDate(day);
+					 detailDto.setMoney(busHousePriceSchemeLayout.getMoney());
+					 detailDto.setId("");
+					 curMoney=busHousePriceSchemeLayout.getMoney();
+				 }
+				 if (format.format(day).equals(format.format(curDate))){
+					 result.setDate(day);
+					 result.setMoney(curMoney);
+				 }
+				 detailDtos.add(detailDto);
+			 });
+		 }
+		 result.setList(detailDtos);
+		 return Result.OK(result);
+	 }
+
+	 /**
+	  *  编辑
+	  *
+	  * @param busSchemeLayoutDailyPrice
+	  * @return
+	  */
+	 @AutoLog(value = "每日房价-编辑")
+	 @ApiOperation(value="每日房价-编辑", notes="每日房价-编辑")
+	 @RequestMapping(value = "/editDailyPrice", method = {RequestMethod.PUT,RequestMethod.POST})
+	 public Result<BusSchemeLayoutDailyPrice> editDailyPrice(@RequestBody BusSchemeLayoutDailyPrice busSchemeLayoutDailyPrice) {
+		 if(busSchemeLayoutDailyPrice.getTenantId() == null || busSchemeLayoutDailyPrice.getTenantId().equals("")){
+			 LoginUser user = TokenUtils.getAuthUser();
+			 if(user.getRelTenantIds() != null && !user.getRelTenantIds().equals("")){
+				 busSchemeLayoutDailyPrice.setTenantId(user.getRelTenantIds());
+			 } else {
+				 throw new JeecgBootException("当前登录人租户信息错误");
+			 }
+		 }
+		 if (busSchemeLayoutDailyPrice.getId() != null && !busSchemeLayoutDailyPrice.getId().equals("")){
+			 BusSchemeLayoutDailyPrice editModel = busSchemeLayoutDailyPriceService.getById(busSchemeLayoutDailyPrice.getId());
+			 editModel.setMoney(busSchemeLayoutDailyPrice.getMoney());
+			 busSchemeLayoutDailyPriceService.updateById(editModel);
+			 return Result.OK(editModel);
+		 }else{
+			 if(busSchemeLayoutDailyPrice.getTenantId() == null || busSchemeLayoutDailyPrice.getTenantId().equals("")){
+				 LoginUser user = TokenUtils.getAuthUser();
+				 if(user.getRelTenantIds() != null && !user.getRelTenantIds().equals("")){
+					 busSchemeLayoutDailyPrice.setTenantId(user.getRelTenantIds());
+				 } else {
+					 throw new JeecgBootException("当前登录人租户信息错误");
+				 }
+			 }
+			 busSchemeLayoutDailyPrice.setHotelId(busSchemeLayoutDailyPrice.getHotelId());
+			 busSchemeLayoutDailyPrice.setSchemeLayoutId(busSchemeLayoutDailyPrice.getSchemeLayoutId());
+			 busSchemeLayoutDailyPrice.setDelFlag(CommonConstant.DEL_FLAG_0);
+			 busSchemeLayoutDailyPrice.setMoney(busSchemeLayoutDailyPrice.getMoney());
+			 busSchemeLayoutDailyPrice.setDate(busSchemeLayoutDailyPrice.getDate());
+			 busSchemeLayoutDailyPriceService.save(busSchemeLayoutDailyPrice);
+			 return Result.OK(busSchemeLayoutDailyPrice);
+		 }
+	 }
+
+	 /**
+	  *  编辑
+	  *
+	  * @param busSchemeLayoutDailyPriceDto
+	  * @return
+	  */
+	 @AutoLog(value = "每日房价-批量更新")
+	 @ApiOperation(value="每日房价-批量更新", notes="每日房价-批量更新")
+	 @RequestMapping(value = "/batchUpdatePrice", method = {RequestMethod.PUT,RequestMethod.POST})
+	 public Result<BusSchemeLayoutDailyPrice> batchUpdatePrice(@RequestBody BusSchemeLayoutDailyPriceDto busSchemeLayoutDailyPriceDto) {
+		 if(busSchemeLayoutDailyPriceDto.getTenantId() == null || busSchemeLayoutDailyPriceDto.getTenantId().equals("")){
+			 LoginUser user = TokenUtils.getAuthUser();
+			 if(user.getRelTenantIds() != null && !user.getRelTenantIds().equals("")){
+//				 busSchemeLayoutDailyPriceDto.setTenantId(user.getRelTenantIds());
+			 } else {
+				 throw new JeecgBootException("当前登录人租户信息错误");
+			 }
+		 }
+		 String _startDate = busSchemeLayoutDailyPriceDto.getStartDate()+" 00:00:00";
+		 String _endDate = busSchemeLayoutDailyPriceDto.getEndDate()+" 00:00:00";
+
+		 SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd 00:00:00");
+		 Date startDate = DateUtils.parseDatetime(_startDate);
+		 Date endDate = DateUtils.parseDatetime(_endDate);
+		 List<Date> dateList = findDates(startDate, endDate);
+		 String schemeLayoutId = busSchemeLayoutDailyPriceDto.getSchemeLayoutId();
+		 BusHousePriceSchemeLayout busHousePriceSchemeLayout = busHousePriceSchemeLayoutService.getById(schemeLayoutId);
+
+		 //获取当前所有满足条件的房价
+		 QueryWrapper<BusSchemeLayoutDailyPrice> queryWrapper = new QueryWrapper<>();
+		 LoginUser user = TokenUtils.getAuthUser();
+		 if(user.getRelTenantIds() != null && !user.getRelTenantIds().equals("")){
+			 queryWrapper.eq("tenant_id",user.getRelTenantIds());
+		 }
+		 queryWrapper.eq("del_flag",0);
+		 queryWrapper.eq("hotel_id",busSchemeLayoutDailyPriceDto.getHotelId());
+		 queryWrapper.eq("scheme_layout_id",schemeLayoutId);
+		 List<BusSchemeLayoutDailyPrice> list = busSchemeLayoutDailyPriceService.list(queryWrapper);
+
+
+		 List<BusSchemeLayoutDailyPrice> newList = new ArrayList<>();
+		 if (dateList != null && dateList.size() > 0){
+			 dateList.forEach( day -> {
+				 BusSchemeLayoutDailyPrice dayMoney = new BusSchemeLayoutDailyPrice();
+				 int flag = 0;
+				 for(BusSchemeLayoutDailyPrice s: list){
+					 if(format.format(day).equals(format.format(s.getDate()))){
+						 flag= 1;
+						 //修改
+						 dayMoney = s;
+						 dayMoney.setMoney(busSchemeLayoutDailyPriceDto.getMoney());
+						 newList.add(dayMoney);
+					 }
+				 }
+				 if (flag == 0){
+					 //新增
+					 dayMoney.setTenantId(user.getRelTenantIds());
+					 dayMoney.setSchemeLayoutId(schemeLayoutId);
+					 dayMoney.setHotelId(busSchemeLayoutDailyPriceDto.getHotelId());
+					 dayMoney.setSchemeLayoutId(schemeLayoutId);
+					 dayMoney.setDelFlag(CommonConstant.DEL_FLAG_0);
+					 dayMoney.setDate(day);
+					 dayMoney.setMoney(busSchemeLayoutDailyPriceDto.getMoney());
+					 newList.add(dayMoney);
+				 }
+			 });
+		 }
+
+		 busSchemeLayoutDailyPriceService.saveOrUpdateBatch(newList);
+		 return Result.OK("操作成功！");
+	 }
+
+	/**
+	 *   添加
+	 *
+	 * @param busSchemeLayoutDailyPrice
+	 * @return
+	 */
+	@AutoLog(value = "房价方案-每日房价表-添加")
+	@ApiOperation(value="房价方案-每日房价表-添加", notes="房价方案-每日房价表-添加")
+	//@RequiresPermissions("business:bus_scheme_layout_daily_price_info:add")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody BusSchemeLayoutDailyPrice busSchemeLayoutDailyPrice) {
+		busSchemeLayoutDailyPriceService.save(busSchemeLayoutDailyPrice);
+		return Result.OK("添加成功！");
+	}
+
+	/**
+	 *  编辑
+	 *
+	 * @param busSchemeLayoutDailyPrice
+	 * @return
+	 */
+	@AutoLog(value = "房价方案-每日房价表-编辑")
+	@ApiOperation(value="房价方案-每日房价表-编辑", notes="房价方案-每日房价表-编辑")
+	//@RequiresPermissions("business:bus_scheme_layout_daily_price_info:edit")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody BusSchemeLayoutDailyPrice busSchemeLayoutDailyPrice) {
+		busSchemeLayoutDailyPriceService.updateById(busSchemeLayoutDailyPrice);
+		return Result.OK("编辑成功!");
+	}
+
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "房价方案-每日房价表-通过id删除")
+	@ApiOperation(value="房价方案-每日房价表-通过id删除", notes="房价方案-每日房价表-通过id删除")
+	//@RequiresPermissions("business:bus_scheme_layout_daily_price_info:delete")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		busSchemeLayoutDailyPriceService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "房价方案-每日房价表-批量删除")
+	@ApiOperation(value="房价方案-每日房价表-批量删除", notes="房价方案-每日房价表-批量删除")
+	//@RequiresPermissions("business:bus_scheme_layout_daily_price_info:deleteBatch")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.busSchemeLayoutDailyPriceService.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<BusSchemeLayoutDailyPrice> queryById(@RequestParam(name="id",required=true) String id) {
+		BusSchemeLayoutDailyPrice busSchemeLayoutDailyPrice = busSchemeLayoutDailyPriceService.getById(id);
+		if(busSchemeLayoutDailyPrice==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(busSchemeLayoutDailyPrice);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param busSchemeLayoutDailyPrice
+    */
+    //@RequiresPermissions("business:bus_scheme_layout_daily_price_info:exportXls")
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, BusSchemeLayoutDailyPrice busSchemeLayoutDailyPrice) {
+        return super.exportXls(request, busSchemeLayoutDailyPrice, BusSchemeLayoutDailyPrice.class, "房价方案-每日房价表");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    //@RequiresPermissions("business:bus_scheme_layout_daily_price_info:importExcel")
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, BusSchemeLayoutDailyPrice.class);
+    }
+
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/dto/BusSchemeLayoutDailyPriceDetailDto.java

@@ -0,0 +1,26 @@
+package org.jeecg.modules.business.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+public class BusSchemeLayoutDailyPriceDetailDto {
+    private String id;
+    /**
+     * 日期
+     */
+    @ApiModelProperty(value = "日期")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    private Date date;
+    /**
+     * 房价
+     */
+    @ApiModelProperty(value = "房价")
+    private BigDecimal money;
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/dto/BusSchemeLayoutDailyPriceDto.java

@@ -0,0 +1,33 @@
+package org.jeecg.modules.business.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.jeecg.modules.business.entity.BusBookingBatch;
+import org.jeecgframework.poi.excel.annotation.Excel;
+
+import java.math.BigDecimal;
+@Data
+public class BusSchemeLayoutDailyPriceDto {
+    private String tenantId;
+
+    @ApiModelProperty(value = "房价方案关联房型表Id")
+    private String schemeLayoutId;
+
+    @ApiModelProperty(value = "酒店Id")
+    private String hotelId;
+
+    @ApiModelProperty(value = "开始时间")
+    private String startDate;
+
+    @ApiModelProperty(value = "结束时间")
+    private String endDate;
+
+    @ApiModelProperty(value = "房价")
+    private BigDecimal money;
+
+    @ApiModelProperty(value = "房价方案表Id")
+    private String schemeId;
+
+    @ApiModelProperty(value = "房型表Id")
+    private String layoutId;
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/dto/BusSchemeLayoutDailyPriceListDto.java

@@ -0,0 +1,50 @@
+package org.jeecg.modules.business.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.math.BigDecimal;
+import java.sql.Time;
+import java.util.Date;
+import java.util.List;
+
+@Data
+public class BusSchemeLayoutDailyPriceListDto {
+
+    @ApiModelProperty(value = "每日房价信息")
+    private List<BusSchemeLayoutDailyPriceDetailDto> list;
+
+    @ApiModelProperty(value = "当日Id")
+    private String id;
+
+    @ApiModelProperty(value = "关联租户")
+    private String tenantId;
+
+    @ApiModelProperty(value = "关联酒店")
+    private String hotelId;
+
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "日期")
+    private Date date;
+
+    @ApiModelProperty(value = "当日房价")
+    private BigDecimal money;
+
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "默认离店时间")
+    private Time departureTime;
+
+    @ApiModelProperty(value = "关联房价方案")
+    private String schemeId;
+
+    @ApiModelProperty(value = "关联房型")
+    private String layoutId;
+
+    @ApiModelProperty(value = "门市价")
+    private BigDecimal layoutPrice;
+}

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

@@ -0,0 +1,103 @@
+package org.jeecg.modules.business.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.sql.Time;
+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.apache.poi.hpsf.Decimal;
+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-04-07
+ * @Version: V1.0
+ */
+@Data
+@TableName("bus_house_price_scheme_layout_info")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="bus_house_price_scheme_layout_info对象", description="房价方案-房型关联表")
+public class BusHousePriceSchemeLayout 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 String schemeId;
+	/**关联房型*/
+	@Excel(name = "关联房型", width = 15)
+    @ApiModelProperty(value = "关联房型")
+    private String layoutId;
+	/**执行房价*/
+	@Excel(name = "执行房价", width = 15)
+    @ApiModelProperty(value = "执行房价")
+    private BigDecimal money;
+	/**默认离店时间*/
+	@Excel(name = "默认离店时间", width = 15, format = "yyyy-MM-dd")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "默认离店时间")
+    private Time departureTime;
+	/**早餐数量*/
+	@Excel(name = "早餐数量", width = 15)
+    @ApiModelProperty(value = "早餐数量")
+    private Integer breakfastNumber;
+	/**中餐数量*/
+	@Excel(name = "中餐数量", width = 15)
+    @ApiModelProperty(value = "中餐数量")
+    private Integer lunchNumber;
+	/**晚餐数量*/
+	@Excel(name = "晚餐数量", width = 15)
+    @ApiModelProperty(value = "晚餐数量")
+    private Integer dinnerNumber;
+	/**删除状态*/
+	@Excel(name = "删除状态", width = 15)
+    @ApiModelProperty(value = "删除状态")
+    @TableLogic
+    private Integer delFlag;
+	/**createBy*/
+    @ApiModelProperty(value = "createBy")
+    private String createBy;
+	/**createTime*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "createTime")
+    private Date createTime;
+	/**updateBy*/
+    @ApiModelProperty(value = "updateBy")
+    private String updateBy;
+	/**updateTime*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "updateTime")
+    private Date updateTime;
+
+    private transient String layoutName;
+    private transient BigDecimal layoutPrice;
+}

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

@@ -0,0 +1,82 @@
+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-04-08
+ * @Version: V1.0
+ */
+@Data
+@TableName("bus_scheme_layout_daily_price_info")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="bus_scheme_layout_daily_price_info对象", description="房价方案-每日房价表")
+public class BusSchemeLayoutDailyPrice 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;
+	/**房价方案关联房型表Id*/
+	@Excel(name = "房价方案关联房型表Id", width = 15)
+    @ApiModelProperty(value = "房价方案关联房型表Id")
+    private String schemeLayoutId;
+	/**房价*/
+	@Excel(name = "房价", width = 15)
+    @ApiModelProperty(value = "房价")
+    private BigDecimal money;
+	/**日期*/
+	@Excel(name = "日期", width = 15, format = "yyyy-MM-dd")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "日期")
+    private Date date;
+	/**删除状态*/
+	@Excel(name = "删除状态", width = 15)
+    @ApiModelProperty(value = "删除状态")
+    @TableLogic
+    private Integer delFlag;
+	/**createBy*/
+    @ApiModelProperty(value = "createBy")
+    private String createBy;
+	/**createTime*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "createTime")
+    private Date createTime;
+	/**updateBy*/
+    @ApiModelProperty(value = "updateBy")
+    private String updateBy;
+	/**updateTime*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "updateTime")
+    private Date updateTime;
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/BusHousePriceSchemeLayoutMapper.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.BusHousePriceSchemeLayout;
+
+/**
+ * @Description: 房价方案-房型关联表
+ * @Author: jeecg-boot
+ * @Date:   2023-04-07
+ * @Version: V1.0
+ */
+public interface BusHousePriceSchemeLayoutMapper extends BaseMapper<BusHousePriceSchemeLayout> {
+
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/BusSchemeLayoutDailyPriceMapper.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.BusSchemeLayoutDailyPrice;
+
+/**
+ * @Description: 房价方案-每日房价表
+ * @Author: jeecg-boot
+ * @Date:   2023-04-08
+ * @Version: V1.0
+ */
+public interface BusSchemeLayoutDailyPriceMapper extends BaseMapper<BusSchemeLayoutDailyPrice> {
+
+}

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

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

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

@@ -0,0 +1,14 @@
+package org.jeecg.modules.business.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.business.entity.BusHousePriceSchemeLayout;
+
+/**
+ * @Description: 房价方案-房型关联表
+ * @Author: jeecg-boot
+ * @Date:   2023-04-07
+ * @Version: V1.0
+ */
+public interface IBusHousePriceSchemeLayoutService extends IService<BusHousePriceSchemeLayout> {
+
+}

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

@@ -0,0 +1,14 @@
+package org.jeecg.modules.business.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.business.entity.BusSchemeLayoutDailyPrice;
+
+/**
+ * @Description: 房价方案-每日房价表
+ * @Author: jeecg-boot
+ * @Date:   2023-04-08
+ * @Version: V1.0
+ */
+public interface IBusSchemeLayoutDailyPriceService extends IService<BusSchemeLayoutDailyPrice> {
+
+}

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

@@ -0,0 +1,19 @@
+package org.jeecg.modules.business.service.impl;
+
+import org.jeecg.modules.business.entity.BusHousePriceSchemeLayout;
+import org.jeecg.modules.business.mapper.BusHousePriceSchemeLayoutMapper;
+import org.jeecg.modules.business.service.IBusHousePriceSchemeLayoutService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 房价方案-房型关联表
+ * @Author: jeecg-boot
+ * @Date:   2023-04-07
+ * @Version: V1.0
+ */
+@Service
+public class BusHousePriceSchemeLayoutServiceImpl extends ServiceImpl<BusHousePriceSchemeLayoutMapper, BusHousePriceSchemeLayout> implements IBusHousePriceSchemeLayoutService {
+
+}

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

@@ -0,0 +1,19 @@
+package org.jeecg.modules.business.service.impl;
+
+import org.jeecg.modules.business.entity.BusSchemeLayoutDailyPrice;
+import org.jeecg.modules.business.mapper.BusSchemeLayoutDailyPriceMapper;
+import org.jeecg.modules.business.service.IBusSchemeLayoutDailyPriceService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 房价方案-每日房价表
+ * @Author: jeecg-boot
+ * @Date:   2023-04-08
+ * @Version: V1.0
+ */
+@Service
+public class BusSchemeLayoutDailyPriceServiceImpl extends ServiceImpl<BusSchemeLayoutDailyPriceMapper, BusSchemeLayoutDailyPrice> implements IBusSchemeLayoutDailyPriceService {
+
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/rooms/DTO/CesHousePriceSchemeSearchDto.java

@@ -24,4 +24,8 @@ public class CesHousePriceSchemeSearchDto extends BasePage {
      */
     private String paramName;
 
+    /**
+     * 房型ID
+     */
+    private String layoutId;
 }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/rooms/Vo/CesHousePriceSchemesVo.java

@@ -0,0 +1,9 @@
+package org.jeecg.modules.rooms.Vo;
+
+import lombok.Data;
+
+@Data
+public class CesHousePriceSchemesVo {
+    private String id;
+    private String name;
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/rooms/controller/CesHousePriceSchemeController.java

@@ -67,6 +67,25 @@ public class CesHousePriceSchemeController extends JeecgController<CesHousePrice
         }
     }
 
+    @ApiOperation(value="房价方案查询", notes="房价方案查询")
+    @GetMapping(value = "/listByLayout")
+    public Result listByLayout(CesHousePriceSchemeSearchDto dto){
+        if (ObjectUtils.isEmpty(dto)){
+            return Result.error(ResultCode.PARAM_MISS);
+        }
+        if (StringUtils.isBlank(dto.getHotelId())){
+            return Result.error(ResultCode.PARAM_MISS);
+        }
+        if (StringUtils.isBlank(dto.getLayoutId())){
+            return Result.error(ResultCode.PARAM_MISS);
+        }
+        try{
+            return cesHousePriceSchemeService.listByLayout(dto);
+        }catch (Exception e){
+            return Result.error(e.getMessage());
+        }
+    }
+
     @AutoLog(value = "新增房价方案")
     @ApiOperation(value="新增房价方案", notes="新增房价方案")
     @PostMapping(value = "/save")

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/rooms/mapper/CesHousePriceSchemeMapper.java

@@ -1,8 +1,13 @@
 package org.jeecg.modules.rooms.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.rooms.Vo.AlreadyUseLayoutNumberVo;
+import org.jeecg.modules.rooms.Vo.CesHousePriceSchemesVo;
 import org.jeecg.modules.rooms.entity.CesHousePriceScheme;
 
+import java.util.Date;
+import java.util.List;
+
 /**
  * <p>
  * 房价方案 Mapper 接口
@@ -12,5 +17,5 @@ import org.jeecg.modules.rooms.entity.CesHousePriceScheme;
  * @since 2023-03-09
  */
 public interface CesHousePriceSchemeMapper extends BaseMapper<CesHousePriceScheme> {
-
+    List<CesHousePriceSchemesVo> getEffectiveSchemes(String hotelId, String layoutId);
 }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/rooms/mapper/xml/CesHousePriceSchemeMapper.xml

@@ -0,0 +1,19 @@
+<?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.rooms.mapper.CesHousePriceSchemeMapper">
+    <select id="getEffectiveSchemes" resultType="org.jeecg.modules.rooms.Vo.CesHousePriceSchemesVo">
+        SELECT
+            scheme.id AS id,
+            scheme.price_scheme AS name
+        FROM ces_house_price_scheme scheme
+            LEFT JOIN bus_house_price_scheme_layout_info scheme_layout
+                 ON scheme.id = scheme_layout.scheme_id
+        WHERE 1=1
+            AND scheme.invalid = 0
+            AND scheme_layout.del_flag = 0
+            AND scheme.hotel_id=#{hotelId}
+            AND scheme_layout.layout_id=#{layoutId}
+            AND (scheme.valid_time = 0 OR now() BETWEEN scheme.valid_start_time AND scheme.valid_end_time )
+        ORDER BY scheme.sort
+    </select>
+</mapper>

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

@@ -12,21 +12,27 @@ import org.apache.commons.collections.map.HashedMap;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.constant.CommonConstant;
+import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.util.CommonUtils;
 import org.jeecg.common.util.TokenUtils;
+import org.jeecg.modules.business.entity.BusHousePriceSchemeLayout;
 import org.jeecg.modules.business.enums.CustomerTypeEnum;
+import org.jeecg.modules.business.service.IBusHousePriceSchemeLayoutService;
 import org.jeecg.modules.rooms.DTO.CesHousePriceSchemeDto;
 import org.jeecg.modules.rooms.DTO.CesHousePriceSchemeSearchDto;
 import org.jeecg.modules.rooms.DTO.CesRoomLayoutDto;
 import org.jeecg.modules.rooms.Vo.CesHousePriceSchemeVo;
-import org.jeecg.modules.rooms.entity.CesHourRoomRule;
-import org.jeecg.modules.rooms.entity.CesHousePriceScheme;
-import org.jeecg.modules.rooms.entity.CesRoomLayout;
-import org.jeecg.modules.rooms.entity.CesStockType;
+import org.jeecg.modules.rooms.Vo.CesHousePriceSchemesVo;
+import org.jeecg.modules.rooms.entity.*;
 import org.jeecg.modules.rooms.mapper.CesHousePriceSchemeMapper;
+import org.jeecg.modules.rooms.mapper.CesRoomLayoutMapper;
+import org.jeecg.modules.system.entity.SysTenant;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.sql.Time;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
@@ -50,6 +56,12 @@ public class CesHousePriceSchemeServiceImpl extends ServiceImpl<CesHousePriceSch
     @Resource
     CesHousePriceSchemeMapper cesHousePriceSchemeMapper;
 
+    @Resource
+    private CesRoomLayoutMapper cesRoomLayoutMapper;
+
+    @Autowired
+    private IBusHousePriceSchemeLayoutService busHousePriceSchemeLayoutService;
+
     public Result list(CesHousePriceSchemeSearchDto dto) {
         QueryWrapper<CesHousePriceScheme> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq(CesHousePriceScheme.HOTEL_ID,dto.getHotelId());
@@ -95,13 +107,57 @@ public class CesHousePriceSchemeServiceImpl extends ServiceImpl<CesHousePriceSch
         return Result.OK(map);
     }
 
+    public Result listByLayout(CesHousePriceSchemeSearchDto dto) {
+        List<CesHousePriceSchemesVo> records = cesHousePriceSchemeMapper.getEffectiveSchemes(dto.getHotelId(),dto.getLayoutId());
+        Map<String,Object> map = new HashedMap();
+        map.put("records",records);
+        return Result.OK(map);
+    }
+
+    String _tenantId = "";
     public Result create(CesHousePriceSchemeDto dto) {
         dto.setCreateAt(LocalDateTime.now());
         dto.setUpdateAt(LocalDateTime.now());
         dto.setInvalid(false);
+        //查询 - 不能有相同条码的数据
+        QueryWrapper<CesHousePriceScheme> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq(CesHousePriceScheme.NUMBER,dto.getNumber());
+        queryWrapper.eq(CesHousePriceScheme.INVALID,false);
+        queryWrapper.eq(CesHousePriceScheme.HOTEL_ID,dto.getHotelId());
+        CesHousePriceScheme exitModel = cesHousePriceSchemeMapper.selectOne(queryWrapper);
+        if(!ObjectUtils.isEmpty(exitModel)) return Result.error("该编号已存在!");
+
         CesHousePriceScheme cesHousePriceScheme = new CesHousePriceScheme();
         BeanUtil.copyProperties(dto,cesHousePriceScheme);
         cesHousePriceSchemeMapper.insert(cesHousePriceScheme);
+        //获取到所有房型
+        List<CesRoomLayout> layoutList = cesRoomLayoutMapper.selectList(new QueryWrapper<CesRoomLayout>()
+                .eq(CesRoomLayout.HOTEL_ID, dto.getHotelId())
+                .eq(CesRoomLayout.INVALID,false));
+        List<BusHousePriceSchemeLayout> housePriceSchemeLayouts = new ArrayList<>();
+        if (layoutList != null && layoutList.size() >0) {
+            LoginUser user = TokenUtils.getAuthUser();
+            if(user.getRelTenantIds() != null && !user.getRelTenantIds().equals("")){
+                _tenantId = user.getRelTenantIds();
+            }
+            layoutList.forEach(item -> {
+                BusHousePriceSchemeLayout housePriceSchemeLayout = new BusHousePriceSchemeLayout();
+                housePriceSchemeLayout.setTenantId(_tenantId);
+                housePriceSchemeLayout.setHotelId(cesHousePriceScheme.getHotelId());
+                housePriceSchemeLayout.setSchemeId(cesHousePriceScheme.getId());
+                housePriceSchemeLayout.setLayoutId(item.getId());
+                housePriceSchemeLayout.setMoney(item.getMarketPrice());
+                housePriceSchemeLayout.setBreakfastNumber(0);
+                housePriceSchemeLayout.setLunchNumber(0);
+                housePriceSchemeLayout.setDinnerNumber(0);
+                housePriceSchemeLayout.setDelFlag(CommonConstant.DEL_FLAG_0);
+                Time time = Time.valueOf("15:00:00");
+                housePriceSchemeLayout.setDepartureTime(time);
+                housePriceSchemeLayouts.add(housePriceSchemeLayout);
+            });
+            busHousePriceSchemeLayoutService.saveBatch(housePriceSchemeLayouts);
+        }
+
         return Result.ok("创建成功!");
     }
     /**