充值配置、会员配置

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

@@ -1,5 +1,6 @@
 package org.jeecg.modules.business.controller;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
@@ -11,6 +12,9 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 
+import cn.hutool.core.collection.CollectionUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.constant.CommonConstant;
 import org.jeecg.common.exception.JeecgBootException;
@@ -29,7 +33,10 @@ import org.jeecg.modules.business.entity.BusHotel;
 import org.jeecg.modules.business.entity.BusMarketMember;
 import org.jeecg.modules.business.service.IBusHotelService;
 import org.jeecg.modules.business.service.IBusMarketMemberService;
+import org.jeecg.modules.rooms.Vo.SelectVo;
+import org.jeecg.modules.rooms.entity.CesRoomPricePlan;
 import org.jeecg.modules.system.entity.SysDataSource;
+import org.jeecg.modules.system.entity.SysUser;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
@@ -92,7 +99,12 @@ private IBusHotelService busHotelService;
 		}
 		return Result.OK(pageList);
 	}
-	
+
+	 @ApiOperation(value="排除指定id列表查询", notes="排除指定id列表查询")
+	 @GetMapping(value = "/getSelectList")
+	 public Result<List<BusMarketMember>> queryList(String id) {
+		 return  busMarketMemberService.getList(id);
+	 }
 	/**
 	 *   添加
 	 *
@@ -111,6 +123,13 @@ private IBusHotelService busHotelService;
 		} else {
 			throw new JeecgBootException("当前登录人租户信息错误");
 		}
+
+		LambdaQueryWrapper<BusMarketMember> queryWrapper = new LambdaQueryWrapper<>();
+		queryWrapper.eq(BusMarketMember::getLevel,busMarketMember.getLevel());
+		BusMarketMember one = busMarketMemberService.getOne(queryWrapper);
+		if (one != null) {
+			return Result.error("已存在相同等级！");
+		}
 		busMarketMemberService.save(busMarketMember);
 		return Result.OK("添加成功！");
 	}
@@ -126,6 +145,13 @@ private IBusHotelService busHotelService;
 	//@RequiresPermissions("org.jeecg.modules.business:bus_market_member_info:edit")
 	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
 	public Result<String> edit(@RequestBody BusMarketMember busMarketMember) {
+		LambdaQueryWrapper<BusMarketMember> queryWrapper = new LambdaQueryWrapper<>();
+		queryWrapper.eq(BusMarketMember::getLevel,busMarketMember.getLevel());
+		queryWrapper.ne(BusMarketMember::getId,busMarketMember.getId());
+		BusMarketMember one = busMarketMemberService.getOne(queryWrapper);
+		if (one != null) {
+			return Result.error("已存在相同等级！");
+		}
 		busMarketMemberService.updateById(busMarketMember);
 		return Result.OK("编辑成功!");
 	}

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

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

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

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

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

@@ -0,0 +1,199 @@
+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.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 org.jeecg.modules.business.entity.BusHotel;
+import org.jeecg.modules.business.entity.BusMarketRecharge;
+import org.jeecg.modules.business.service.IBusHotelService;
+import org.jeecg.modules.business.service.IBusMarketRechargeService;
+
+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.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: bus_market_recharge_info
+ * @Author: jeecg-boot
+ * @Date:   2023-03-03
+ * @Version: V1.0
+ */
+@Api(tags="bus_market_recharge_info")
+@RestController
+@RequestMapping("/business/busMarketRecharge")
+@Slf4j
+public class BusMarketRechargeController extends JeecgController<BusMarketRecharge, IBusMarketRechargeService> {
+	@Autowired
+	private IBusMarketRechargeService busMarketRechargeService;
+	 @Autowired
+	 private IBusHotelService busHotelService;
+	/**
+	 * 分页列表查询
+	 *
+	 * @param busMarketRecharge
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "bus_market_recharge_info-分页列表查询")
+	@ApiOperation(value="bus_market_recharge_info-分页列表查询", notes="bus_market_recharge_info-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<BusMarketRecharge>> queryPageList(BusMarketRecharge busMarketRecharge,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<BusMarketRecharge> queryWrapper = QueryGenerator.initQueryWrapper(busMarketRecharge, req.getParameterMap());
+		Page<BusMarketRecharge> page = new Page<BusMarketRecharge>(pageNo, pageSize);
+		IPage<BusMarketRecharge> pageList = busMarketRechargeService.page(page, queryWrapper);
+		if(pageList.getSize()>0) {
+			pageList.getRecords().forEach(item -> {
+				BusHotel hotle = busHotelService.getById(item.getHotelId());
+				if (hotle != null) {
+					item.setHotelName(hotle.getName());
+				}
+			});
+		}
+		return Result.OK(pageList);
+	}
+	
+	/**
+	 *   添加
+	 *
+	 * @param busMarketRecharge
+	 * @return
+	 */
+	@AutoLog(value = "bus_market_recharge_info-添加")
+	@ApiOperation(value="bus_market_recharge_info-添加", notes="bus_market_recharge_info-添加")
+	//@RequiresPermissions("business:bus_market_recharge_info:add")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody BusMarketRecharge busMarketRecharge) {
+		LoginUser user = TokenUtils.getAuthUser();
+		if (user.getRelTenantIds() != null && !user.getRelTenantIds().equals("")) {
+			busMarketRecharge.setTenantId(user.getRelTenantIds());
+		} else {
+			throw new JeecgBootException("当前登录人租户信息错误");
+		}
+
+		busMarketRechargeService.save(busMarketRecharge);
+		return Result.OK("添加成功！");
+	}
+	
+	/**
+	 *  编辑
+	 *
+	 * @param busMarketRecharge
+	 * @return
+	 */
+	@AutoLog(value = "bus_market_recharge_info-编辑")
+	@ApiOperation(value="bus_market_recharge_info-编辑", notes="bus_market_recharge_info-编辑")
+	//@RequiresPermissions("business:bus_market_recharge_info:edit")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody BusMarketRecharge busMarketRecharge) {
+		busMarketRechargeService.updateById(busMarketRecharge);
+		return Result.OK("编辑成功!");
+	}
+	
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "bus_market_recharge_info-通过id删除")
+	@ApiOperation(value="bus_market_recharge_info-通过id删除", notes="bus_market_recharge_info-通过id删除")
+	//@RequiresPermissions("business:bus_market_recharge_info:delete")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		busMarketRechargeService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+	
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "bus_market_recharge_info-批量删除")
+	@ApiOperation(value="bus_market_recharge_info-批量删除", notes="bus_market_recharge_info-批量删除")
+	//@RequiresPermissions("business:bus_market_recharge_info:deleteBatch")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.busMarketRechargeService.removeByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+	
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	//@AutoLog(value = "bus_market_recharge_info-通过id查询")
+	@ApiOperation(value="bus_market_recharge_info-通过id查询", notes="bus_market_recharge_info-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<BusMarketRecharge> queryById(@RequestParam(name="id",required=true) String id) {
+		BusMarketRecharge busMarketRecharge = busMarketRechargeService.getById(id);
+		if(busMarketRecharge==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(busMarketRecharge);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param busMarketRecharge
+    */
+    //@RequiresPermissions("business:bus_market_recharge_info:exportXls")
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, BusMarketRecharge busMarketRecharge) {
+        return super.exportXls(request, busMarketRecharge, BusMarketRecharge.class, "bus_market_recharge_info");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    //@RequiresPermissions("business:bus_market_recharge_info:importExcel")
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, BusMarketRecharge.class);
+    }
+
+}

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

@@ -153,7 +153,7 @@ public class BusMarketMember implements Serializable {
 	/**自动升级等级*/
 	@Excel(name = "自动升级等级", width = 15)
     @ApiModelProperty(value = "自动升级等级")
-    private Integer upLevel;
+    private String upLevel;
 	/**升级扣除积分*/
 	@Excel(name = "升级扣除积分", width = 15)
     @ApiModelProperty(value = "升级扣除积分")

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

@@ -0,0 +1,51 @@
+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: bus_market_member_group_info
+ * @Author: jeecg-boot
+ * @Date:   2023-03-03
+ * @Version: V1.0
+ */
+@Data
+@TableName("bus_market_member_group_info")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="bus_market_member_group_info对象", description="bus_market_member_group_info")
+public class BusMarketMemberGroup 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 name;
+}

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

@@ -0,0 +1,51 @@
+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: bus_market_member_lable_info
+ * @Author: jeecg-boot
+ * @Date:   2023-03-03
+ * @Version: V1.0
+ */
+@Data
+@TableName("bus_market_member_lable_info")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="bus_market_member_lable_info对象", description="bus_market_member_lable_info")
+public class BusMarketMemberLable 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 name;
+}

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

@@ -0,0 +1,64 @@
+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.*;
+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: bus_market_recharge_info
+ * @Author: jeecg-boot
+ * @Date:   2023-03-03
+ * @Version: V1.0
+ */
+@Data
+@TableName("bus_market_recharge_info")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="bus_market_recharge_info对象", description="bus_market_recharge_info")
+public class BusMarketRecharge 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 name;
+	/**充值金额*/
+	@Excel(name = "充值金额", width = 15)
+    @ApiModelProperty(value = "充值金额")
+    private BigDecimal money;
+	/**赠送金额*/
+	@Excel(name = "赠送金额", width = 15)
+    @ApiModelProperty(value = "赠送金额")
+    private BigDecimal returnRoney;
+	/**备注信息*/
+	@Excel(name = "备注信息", width = 15)
+    @ApiModelProperty(value = "备注信息")
+    private String remarks;
+
+    @TableField(exist = false)
+    private String hotelName;
+}

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,5 +1,6 @@
 package org.jeecg.modules.business.service;
 
+import org.jeecg.common.api.vo.Result;
 import org.jeecg.modules.business.entity.BusMarketMember;
 import com.baomidou.mybatisplus.extension.service.IService;
 
@@ -10,5 +11,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @Version: V1.0
  */
 public interface IBusMarketMemberService extends IService<BusMarketMember> {
-
+    public Result getList(String id);
 }

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

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

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

@@ -0,0 +1,19 @@
+package org.jeecg.modules.business.service.impl;
+
+import org.jeecg.modules.business.entity.BusMarketMemberGroup;
+import org.jeecg.modules.business.mapper.BusMarketMemberGroupMapper;
+import org.jeecg.modules.business.service.IBusMarketMemberGroupService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: bus_market_member_group_info
+ * @Author: jeecg-boot
+ * @Date:   2023-03-03
+ * @Version: V1.0
+ */
+@Service
+public class BusMarketMemberGroupServiceImpl extends ServiceImpl<BusMarketMemberGroupMapper, BusMarketMemberGroup> implements IBusMarketMemberGroupService {
+
+}

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

@@ -0,0 +1,19 @@
+package org.jeecg.modules.business.service.impl;
+
+import org.jeecg.modules.business.entity.BusMarketMemberLable;
+import org.jeecg.modules.business.mapper.BusMarketMemberLableMapper;
+import org.jeecg.modules.business.service.IBusMarketMemberLableService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: bus_market_member_lable_info
+ * @Author: jeecg-boot
+ * @Date:   2023-03-03
+ * @Version: V1.0
+ */
+@Service
+public class BusMarketMemberLableServiceImpl extends ServiceImpl<BusMarketMemberLableMapper, BusMarketMemberLable> implements IBusMarketMemberLableService {
+
+}

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

@@ -1,13 +1,23 @@
 package org.jeecg.modules.business.service.impl;
 
 
+import cn.hutool.core.collection.CollectionUtil;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import org.jeecg.common.api.vo.Result;
 import org.jeecg.modules.business.entity.BusMarketMember;
 import org.jeecg.modules.business.mapper.BusMarketMemberMapper;
 import org.jeecg.modules.business.service.IBusMarketMemberService;
+import org.jeecg.modules.rooms.Vo.SelectVo;
+import org.jeecg.modules.rooms.entity.CesRoomPricePlan;
+import org.jeecg.modules.rooms.mapper.CesRoomPricePlanMapper;
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * @Description: bus_market_member_info
  * @Author: jeecg-boot
@@ -16,5 +26,24 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
  */
 @Service
 public class BusMarketMemberServiceImpl extends ServiceImpl<BusMarketMemberMapper, BusMarketMember> implements IBusMarketMemberService {
+    @Resource
+    private BusMarketMemberMapper busMarketMemberMapper;
 
+    /**
+     * 排除当前id查询列表
+     * @param id
+     * @return
+     */
+    public Result getList(String id){
+        List<BusMarketMember> list =  busMarketMemberMapper.selectList(Wrappers.<BusMarketMember>lambdaQuery().ne(BusMarketMember::getId,id));
+        if(CollectionUtil.isEmpty(list)) return Result.ok(new ArrayList<>());
+        List<SelectVo> vos = new ArrayList<>();
+        list.forEach(v -> {
+            SelectVo vo = new SelectVo();
+            vo.setLabel(v.getName());
+            vo.setValue(v.getId());
+            vos.add(vo);
+        });
+        return Result.ok(vos);
+    }
 }

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

@@ -0,0 +1,19 @@
+package org.jeecg.modules.business.service.impl;
+
+import org.jeecg.modules.business.entity.BusMarketRecharge;
+import org.jeecg.modules.business.mapper.BusMarketRechargeMapper;
+import org.jeecg.modules.business.service.IBusMarketRechargeService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: bus_market_recharge_info
+ * @Author: jeecg-boot
+ * @Date:   2023-03-03
+ * @Version: V1.0
+ */
+@Service
+public class BusMarketRechargeServiceImpl extends ServiceImpl<BusMarketRechargeMapper, BusMarketRecharge> implements IBusMarketRechargeService {
+
+}