瀏覽代碼

自动赠券模块

gqx 2 年之前
父節點
當前提交
d0d77f4e42
共有 25 個文件被更改,包括 1393 次插入0 次删除
  1. 178 0
      jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/BusMarketCouponsCashController.java
  2. 178 0
      jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/BusMarketCouponsController.java
  3. 208 0
      jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/BusMarketCouponsEventController.java
  4. 219 0
      jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/BusMarketCouponsEventDetailController.java
  5. 87 0
      jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/entity/BusMarketCoupons.java
  6. 95 0
      jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/entity/BusMarketCouponsCash.java
  7. 74 0
      jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/entity/BusMarketCouponsEvent.java
  8. 72 0
      jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/entity/BusMarketCouponsEventDetail.java
  9. 62 0
      jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/enums/CouponsEventEnum.java
  10. 17 0
      jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/BusMarketCouponsCashMapper.java
  11. 17 0
      jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/BusMarketCouponsEventDetailMapper.java
  12. 17 0
      jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/BusMarketCouponsEventMapper.java
  13. 17 0
      jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/BusMarketCouponsMapper.java
  14. 5 0
      jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/BusMarketCouponsCashMapper.xml
  15. 5 0
      jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/BusMarketCouponsEventDetailMapper.xml
  16. 5 0
      jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/BusMarketCouponsEventMapper.xml
  17. 5 0
      jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/BusMarketCouponsMapper.xml
  18. 14 0
      jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/IBusMarketCouponsCashService.java
  19. 14 0
      jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/IBusMarketCouponsEventDetailService.java
  20. 14 0
      jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/IBusMarketCouponsEventService.java
  21. 14 0
      jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/IBusMarketCouponsService.java
  22. 19 0
      jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/BusMarketCouponsCashServiceImpl.java
  23. 19 0
      jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/BusMarketCouponsEventDetailServiceImpl.java
  24. 19 0
      jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/BusMarketCouponsEventServiceImpl.java
  25. 19 0
      jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/BusMarketCouponsServiceImpl.java

+ 178 - 0
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/BusMarketCouponsCashController.java

@@ -0,0 +1,178 @@
+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.system.query.QueryGenerator;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.business.entity.BusMarketCouponsCash;
+import org.jeecg.modules.business.service.IBusMarketCouponsCashService;
+
+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_coupons_cash_info
+ * @Author: jeecg-boot
+ * @Date:   2023-03-03
+ * @Version: V1.0
+ */
+@Api(tags="bus_market_coupons_cash_info")
+@RestController
+@RequestMapping("/business/busMarketCouponsCash")
+@Slf4j
+public class BusMarketCouponsCashController extends JeecgController<BusMarketCouponsCash, IBusMarketCouponsCashService> {
+	@Autowired
+	private IBusMarketCouponsCashService busMarketCouponsCashService;
+	
+	/**
+	 * 分页列表查询
+	 *
+	 * @param busMarketCouponsCash
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "bus_market_coupons_cash_info-分页列表查询")
+	@ApiOperation(value="bus_market_coupons_cash_info-分页列表查询", notes="bus_market_coupons_cash_info-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<BusMarketCouponsCash>> queryPageList(BusMarketCouponsCash busMarketCouponsCash,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<BusMarketCouponsCash> queryWrapper = QueryGenerator.initQueryWrapper(busMarketCouponsCash, req.getParameterMap());
+		Page<BusMarketCouponsCash> page = new Page<BusMarketCouponsCash>(pageNo, pageSize);
+		IPage<BusMarketCouponsCash> pageList = busMarketCouponsCashService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+	
+	/**
+	 *   添加
+	 *
+	 * @param busMarketCouponsCash
+	 * @return
+	 */
+	@AutoLog(value = "bus_market_coupons_cash_info-添加")
+	@ApiOperation(value="bus_market_coupons_cash_info-添加", notes="bus_market_coupons_cash_info-添加")
+	//@RequiresPermissions("business:bus_market_coupons_cash_info:add")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody BusMarketCouponsCash busMarketCouponsCash) {
+		busMarketCouponsCashService.save(busMarketCouponsCash);
+		return Result.OK("添加成功!");
+	}
+	
+	/**
+	 *  编辑
+	 *
+	 * @param busMarketCouponsCash
+	 * @return
+	 */
+	@AutoLog(value = "bus_market_coupons_cash_info-编辑")
+	@ApiOperation(value="bus_market_coupons_cash_info-编辑", notes="bus_market_coupons_cash_info-编辑")
+	//@RequiresPermissions("business:bus_market_coupons_cash_info:edit")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody BusMarketCouponsCash busMarketCouponsCash) {
+		busMarketCouponsCashService.updateById(busMarketCouponsCash);
+		return Result.OK("编辑成功!");
+	}
+	
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "bus_market_coupons_cash_info-通过id删除")
+	@ApiOperation(value="bus_market_coupons_cash_info-通过id删除", notes="bus_market_coupons_cash_info-通过id删除")
+	//@RequiresPermissions("business:bus_market_coupons_cash_info:delete")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		busMarketCouponsCashService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+	
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "bus_market_coupons_cash_info-批量删除")
+	@ApiOperation(value="bus_market_coupons_cash_info-批量删除", notes="bus_market_coupons_cash_info-批量删除")
+	//@RequiresPermissions("business:bus_market_coupons_cash_info:deleteBatch")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.busMarketCouponsCashService.removeByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+	
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	//@AutoLog(value = "bus_market_coupons_cash_info-通过id查询")
+	@ApiOperation(value="bus_market_coupons_cash_info-通过id查询", notes="bus_market_coupons_cash_info-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<BusMarketCouponsCash> queryById(@RequestParam(name="id",required=true) String id) {
+		BusMarketCouponsCash busMarketCouponsCash = busMarketCouponsCashService.getById(id);
+		if(busMarketCouponsCash==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(busMarketCouponsCash);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param busMarketCouponsCash
+    */
+    //@RequiresPermissions("business:bus_market_coupons_cash_info:exportXls")
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, BusMarketCouponsCash busMarketCouponsCash) {
+        return super.exportXls(request, busMarketCouponsCash, BusMarketCouponsCash.class, "bus_market_coupons_cash_info");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    //@RequiresPermissions("business:bus_market_coupons_cash_info:importExcel")
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, BusMarketCouponsCash.class);
+    }
+
+}

+ 178 - 0
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/BusMarketCouponsController.java

@@ -0,0 +1,178 @@
+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.system.query.QueryGenerator;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.business.entity.BusMarketCoupons;
+import org.jeecg.modules.business.service.IBusMarketCouponsService;
+
+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_coupons_info
+ * @Author: jeecg-boot
+ * @Date:   2023-03-03
+ * @Version: V1.0
+ */
+@Api(tags="bus_market_coupons_info")
+@RestController
+@RequestMapping("/business/busMarketCoupons")
+@Slf4j
+public class BusMarketCouponsController extends JeecgController<BusMarketCoupons, IBusMarketCouponsService> {
+	@Autowired
+	private IBusMarketCouponsService busMarketCouponsService;
+	
+	/**
+	 * 分页列表查询
+	 *
+	 * @param busMarketCoupons
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "bus_market_coupons_info-分页列表查询")
+	@ApiOperation(value="bus_market_coupons_info-分页列表查询", notes="bus_market_coupons_info-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<BusMarketCoupons>> queryPageList(BusMarketCoupons busMarketCoupons,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<BusMarketCoupons> queryWrapper = QueryGenerator.initQueryWrapper(busMarketCoupons, req.getParameterMap());
+		Page<BusMarketCoupons> page = new Page<BusMarketCoupons>(pageNo, pageSize);
+		IPage<BusMarketCoupons> pageList = busMarketCouponsService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+	
+	/**
+	 *   添加
+	 *
+	 * @param busMarketCoupons
+	 * @return
+	 */
+	@AutoLog(value = "bus_market_coupons_info-添加")
+	@ApiOperation(value="bus_market_coupons_info-添加", notes="bus_market_coupons_info-添加")
+	//@RequiresPermissions("business:bus_market_coupons_info:add")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody BusMarketCoupons busMarketCoupons) {
+		busMarketCouponsService.save(busMarketCoupons);
+		return Result.OK("添加成功!");
+	}
+	
+	/**
+	 *  编辑
+	 *
+	 * @param busMarketCoupons
+	 * @return
+	 */
+	@AutoLog(value = "bus_market_coupons_info-编辑")
+	@ApiOperation(value="bus_market_coupons_info-编辑", notes="bus_market_coupons_info-编辑")
+	//@RequiresPermissions("business:bus_market_coupons_info:edit")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody BusMarketCoupons busMarketCoupons) {
+		busMarketCouponsService.updateById(busMarketCoupons);
+		return Result.OK("编辑成功!");
+	}
+	
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "bus_market_coupons_info-通过id删除")
+	@ApiOperation(value="bus_market_coupons_info-通过id删除", notes="bus_market_coupons_info-通过id删除")
+	//@RequiresPermissions("business:bus_market_coupons_info:delete")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		busMarketCouponsService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+	
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "bus_market_coupons_info-批量删除")
+	@ApiOperation(value="bus_market_coupons_info-批量删除", notes="bus_market_coupons_info-批量删除")
+	//@RequiresPermissions("business:bus_market_coupons_info:deleteBatch")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.busMarketCouponsService.removeByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+	
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	//@AutoLog(value = "bus_market_coupons_info-通过id查询")
+	@ApiOperation(value="bus_market_coupons_info-通过id查询", notes="bus_market_coupons_info-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<BusMarketCoupons> queryById(@RequestParam(name="id",required=true) String id) {
+		BusMarketCoupons busMarketCoupons = busMarketCouponsService.getById(id);
+		if(busMarketCoupons==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(busMarketCoupons);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param busMarketCoupons
+    */
+    //@RequiresPermissions("business:bus_market_coupons_info:exportXls")
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, BusMarketCoupons busMarketCoupons) {
+        return super.exportXls(request, busMarketCoupons, BusMarketCoupons.class, "bus_market_coupons_info");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    //@RequiresPermissions("business:bus_market_coupons_info:importExcel")
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, BusMarketCoupons.class);
+    }
+
+}

+ 208 - 0
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/BusMarketCouponsEventController.java

@@ -0,0 +1,208 @@
+package org.jeecg.modules.business.controller;
+
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import cn.hutool.core.util.EnumUtil;
+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.BusMarketCouponsEvent;
+import org.jeecg.modules.business.enums.CouponsEventEnum;
+import org.jeecg.modules.business.service.IBusHotelService;
+import org.jeecg.modules.business.service.IBusMarketCouponsEventService;
+
+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.message.enums.RangeDateEnum;
+import org.jeecg.modules.rooms.Enum.CouponEnums;
+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_coupons_event_info
+ * @Author: jeecg-boot
+ * @Date:   2023-03-03
+ * @Version: V1.0
+ */
+@Api(tags="bus_market_coupons_event_info")
+@RestController
+@RequestMapping("/business/busMarketCouponsEvent")
+@Slf4j
+public class BusMarketCouponsEventController extends JeecgController<BusMarketCouponsEvent, IBusMarketCouponsEventService> {
+	@Autowired
+	private IBusMarketCouponsEventService busMarketCouponsEventService;
+	 @Autowired
+	 private IBusHotelService busHotelService;
+	/**
+	 * 分页列表查询
+	 *
+	 * @param busMarketCouponsEvent
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "bus_market_coupons_event_info-分页列表查询")
+	@ApiOperation(value="bus_market_coupons_event_info-分页列表查询", notes="bus_market_coupons_event_info-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<BusMarketCouponsEvent>> queryPageList(BusMarketCouponsEvent busMarketCouponsEvent,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<BusMarketCouponsEvent> queryWrapper = QueryGenerator.initQueryWrapper(busMarketCouponsEvent, req.getParameterMap());
+		Page<BusMarketCouponsEvent> page = new Page<BusMarketCouponsEvent>(pageNo, pageSize);
+		IPage<BusMarketCouponsEvent> pageList = busMarketCouponsEventService.page(page, queryWrapper);
+		if (pageList.getSize() > 0) {
+			pageList.getRecords().forEach(item -> {
+				BusHotel hotle = busHotelService.getById(item.getHotelId());
+				if (hotle != null) {
+					item.setHotelName(hotle.getName());
+				}
+				CouponsEventEnum couponsEventEnum = CouponsEventEnum.val(item.getType());
+				if (couponsEventEnum != null) {
+					item.setTypeName(couponsEventEnum.getTitle());
+				}
+			});
+		}
+		return Result.OK(pageList);
+	}
+	
+	/**
+	 *   添加
+	 *
+	 * @param busMarketCouponsEvent
+	 * @return
+	 */
+	@AutoLog(value = "bus_market_coupons_event_info-添加")
+	@ApiOperation(value="bus_market_coupons_event_info-添加", notes="bus_market_coupons_event_info-添加")
+	//@RequiresPermissions("business:bus_market_coupons_event_info:add")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody BusMarketCouponsEvent busMarketCouponsEvent) {
+		LoginUser user = TokenUtils.getAuthUser();
+		if (user.getRelTenantIds() != null && !user.getRelTenantIds().equals("")) {
+			busMarketCouponsEvent.setTenantId(user.getRelTenantIds());
+		} else {
+			throw new JeecgBootException("当前登录人租户信息错误");
+		}
+		busMarketCouponsEventService.save(busMarketCouponsEvent);
+		return Result.OK("添加成功!");
+	}
+	
+	/**
+	 *  编辑
+	 *
+	 * @param busMarketCouponsEvent
+	 * @return
+	 */
+	@AutoLog(value = "bus_market_coupons_event_info-编辑")
+	@ApiOperation(value="bus_market_coupons_event_info-编辑", notes="bus_market_coupons_event_info-编辑")
+	//@RequiresPermissions("business:bus_market_coupons_event_info:edit")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody BusMarketCouponsEvent busMarketCouponsEvent) {
+		busMarketCouponsEventService.updateById(busMarketCouponsEvent);
+		return Result.OK("编辑成功!");
+	}
+	
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "bus_market_coupons_event_info-通过id删除")
+	@ApiOperation(value="bus_market_coupons_event_info-通过id删除", notes="bus_market_coupons_event_info-通过id删除")
+	//@RequiresPermissions("business:bus_market_coupons_event_info:delete")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		busMarketCouponsEventService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+	
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "bus_market_coupons_event_info-批量删除")
+	@ApiOperation(value="bus_market_coupons_event_info-批量删除", notes="bus_market_coupons_event_info-批量删除")
+	//@RequiresPermissions("business:bus_market_coupons_event_info:deleteBatch")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.busMarketCouponsEventService.removeByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+	
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	//@AutoLog(value = "bus_market_coupons_event_info-通过id查询")
+	@ApiOperation(value="bus_market_coupons_event_info-通过id查询", notes="bus_market_coupons_event_info-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<BusMarketCouponsEvent> queryById(@RequestParam(name="id",required=true) String id) {
+		BusMarketCouponsEvent busMarketCouponsEvent = busMarketCouponsEventService.getById(id);
+		if(busMarketCouponsEvent==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(busMarketCouponsEvent);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param busMarketCouponsEvent
+    */
+    //@RequiresPermissions("business:bus_market_coupons_event_info:exportXls")
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, BusMarketCouponsEvent busMarketCouponsEvent) {
+        return super.exportXls(request, busMarketCouponsEvent, BusMarketCouponsEvent.class, "bus_market_coupons_event_info");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    //@RequiresPermissions("business:bus_market_coupons_event_info:importExcel")
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, BusMarketCouponsEvent.class);
+    }
+
+}

+ 219 - 0
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/BusMarketCouponsEventDetailController.java

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

+ 87 - 0
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/entity/BusMarketCoupons.java

@@ -0,0 +1,87 @@
+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_coupons_info
+ * @Author: jeecg-boot
+ * @Date:   2023-03-03
+ * @Version: V1.0
+ */
+@Data
+@TableName("bus_market_coupons_info")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="bus_market_coupons_info对象", description="bus_market_coupons_info")
+public class BusMarketCoupons 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, format = "yyyy-MM-dd")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "开始时间")
+    private Date startTime;
+	/**结束时间*/
+	@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 endTime;
+	/**适用房型*/
+	@Excel(name = "适用房型", width = 15)
+    @ApiModelProperty(value = "适用房型")
+    private String roomIds;
+	/**可领取张数*/
+	@Excel(name = "可领取张数", width = 15)
+    @ApiModelProperty(value = "可领取张数")
+    private Integer klqzs;
+	/**类型*/
+	@Excel(name = "类型", width = 15)
+    @ApiModelProperty(value = "类型")
+    private String type;
+	/**说明*/
+	@Excel(name = "说明", width = 15)
+    @ApiModelProperty(value = "说明")
+    private String introduce;
+	/**领取数量*/
+	@Excel(name = "领取数量", width = 15)
+    @ApiModelProperty(value = "领取数量")
+    private Integer lqNum;
+	/**使用说明*/
+	@Excel(name = "使用说明", width = 15)
+    @ApiModelProperty(value = "使用说明")
+    private String ruleDec;
+}

+ 95 - 0
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/entity/BusMarketCouponsCash.java

@@ -0,0 +1,95 @@
+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_coupons_cash_info
+ * @Author: jeecg-boot
+ * @Date:   2023-03-03
+ * @Version: V1.0
+ */
+@Data
+@TableName("bus_market_coupons_cash_info")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="bus_market_coupons_cash_info对象", description="bus_market_coupons_cash_info")
+public class BusMarketCouponsCash 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, format = "yyyy-MM-dd")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "开始时间")
+    private Date startTime;
+	/**结束时间*/
+	@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 endTime;
+	/**优惠限制*/
+	@Excel(name = "优惠限制", width = 15)
+    @ApiModelProperty(value = "优惠限制")
+    private String type;
+	/**可使用最低金额*/
+	@Excel(name = "可使用最低金额", width = 15)
+    @ApiModelProperty(value = "可使用最低金额")
+    private BigDecimal conditions;
+	/**可使用张数*/
+	@Excel(name = "可使用张数", width = 15)
+    @ApiModelProperty(value = "可使用张数")
+    private Integer ksyzs;
+	/**金额*/
+	@Excel(name = "金额", width = 15)
+    @ApiModelProperty(value = "金额")
+    private BigDecimal cost;
+	/**说明*/
+	@Excel(name = "说明", width = 15)
+    @ApiModelProperty(value = "说明")
+    private String introduce;
+	/**领取数量*/
+	@Excel(name = "领取数量", width = 15)
+    @ApiModelProperty(value = "领取数量")
+    private Integer lqNum;
+	/**可领取张数*/
+	@Excel(name = "可领取张数", width = 15)
+    @ApiModelProperty(value = "可领取张数")
+    private Integer klqzs;
+	/**使用说明*/
+	@Excel(name = "使用说明", width = 15)
+    @ApiModelProperty(value = "使用说明")
+    private String ruleDec;
+}

+ 74 - 0
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/entity/BusMarketCouponsEvent.java

@@ -0,0 +1,74 @@
+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_coupons_event_info
+ * @Author: jeecg-boot
+ * @Date:   2023-03-03
+ * @Version: V1.0
+ */
+@Data
+@TableName("bus_market_coupons_event_info")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="bus_market_coupons_event_info对象", description="bus_market_coupons_event_info")
+public class BusMarketCouponsEvent 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, format = "yyyy-MM-dd")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "开始时间")
+    private Date startTime;
+	/**结束时间*/
+	@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 endTime;
+	/**类型*/
+	@Excel(name = "类型", width = 15)
+    @ApiModelProperty(value = "类型")
+    private Integer type;
+	/**状态*/
+	@Excel(name = "状态", width = 15)
+    @ApiModelProperty(value = "状态")
+    private Integer state;
+
+    @TableField(exist = false)
+    private String hotelName;
+    @TableField(exist = false)
+    private String typeName;
+}

+ 72 - 0
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/entity/BusMarketCouponsEventDetail.java

@@ -0,0 +1,72 @@
+package org.jeecg.modules.business.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.util.Date;
+import java.math.BigDecimal;
+
+import com.baomidou.mybatisplus.annotation.*;
+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_coupons_event_detail_info
+ * @Author: jeecg-boot
+ * @Date:   2023-03-03
+ * @Version: V1.0
+ */
+@Data
+@TableName("bus_market_coupons_event_detail_info")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="bus_market_coupons_event_detail_info对象", description="bus_market_coupons_event_detail_info")
+public class BusMarketCouponsEventDetail 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 eventId;
+	/**关联会员*/
+	@Excel(name = "关联会员", width = 15)
+    @ApiModelProperty(value = "关联会员")
+    private String levelId;
+	/**关联卷*/
+	@Excel(name = "关联卷", width = 15)
+    @ApiModelProperty(value = "关联卷")
+    private String couponsCashId;
+	/**类型(1-优惠卷;3-免房卷)*/
+	@Excel(name = "类型(1-优惠卷;3-免房卷)", width = 15)
+    @ApiModelProperty(value = "类型(1-优惠卷;3-免房卷)")
+    private Integer type;
+	/**赠送数量*/
+	@Excel(name = "赠送数量", width = 15)
+    @ApiModelProperty(value = "赠送数量")
+    private Integer count;
+
+    @TableField(exist = false)
+    private String hotelName;
+    @TableField(exist = false)
+    private  String levelName;
+    @TableField(exist = false)
+    private  String couponsName;
+}

+ 62 - 0
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/enums/CouponsEventEnum.java

@@ -0,0 +1,62 @@
+package org.jeecg.modules.business.enums;
+
+import org.jeecg.common.system.annotation.EnumDict;
+import org.jeecg.common.system.vo.DictModel;
+import org.jeecg.modules.rooms.Enum.CouponEnums;
+
+import java.util.ArrayList;
+import java.util.List;
+
+
+@EnumDict("couponsEventEnum")
+public enum CouponsEventEnum {
+
+    memberReg(1, "会员注册"),
+    memberBirthday(2, "会员生日"),
+    memberUpgrade(3, "会员升级"),
+    memberRecharge(4,"会员充值"),
+    completed(5, "已完成"),
+    fiveStarPraise(6, "五星好评");
+
+    Integer key;
+
+    String title;
+
+    CouponsEventEnum(Integer key, String title){
+        this.key = key;
+        this.title = title;
+    }
+    public Integer getKey() {
+        return key;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    /**
+     * 获取字典数据
+     * @return
+     */
+    public static List<DictModel> getDictList(){
+        List<DictModel> list = new ArrayList<>();
+        DictModel dictModel = null;
+        for(CouponsEventEnum e: CouponsEventEnum.values()){
+            dictModel = new DictModel();
+            dictModel.setValue(e.key.toString());
+            dictModel.setText(e.title);
+            list.add(dictModel);
+        }
+        return list;
+    }
+
+    public static CouponsEventEnum val(Integer key){
+        for(CouponsEventEnum bld: values()){
+            if(bld.key == key){
+                return bld;
+            }
+        }
+        return null;
+    }
+
+}

+ 17 - 0
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/BusMarketCouponsCashMapper.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.BusMarketCouponsCash;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: bus_market_coupons_cash_info
+ * @Author: jeecg-boot
+ * @Date:   2023-03-03
+ * @Version: V1.0
+ */
+public interface BusMarketCouponsCashMapper extends BaseMapper<BusMarketCouponsCash> {
+
+}

+ 17 - 0
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/BusMarketCouponsEventDetailMapper.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.BusMarketCouponsEventDetail;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: bus_market_coupons_event_detail_info
+ * @Author: jeecg-boot
+ * @Date:   2023-03-03
+ * @Version: V1.0
+ */
+public interface BusMarketCouponsEventDetailMapper extends BaseMapper<BusMarketCouponsEventDetail> {
+
+}

+ 17 - 0
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/BusMarketCouponsEventMapper.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.BusMarketCouponsEvent;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: bus_market_coupons_event_info
+ * @Author: jeecg-boot
+ * @Date:   2023-03-03
+ * @Version: V1.0
+ */
+public interface BusMarketCouponsEventMapper extends BaseMapper<BusMarketCouponsEvent> {
+
+}

+ 17 - 0
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/BusMarketCouponsMapper.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.BusMarketCoupons;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: bus_market_coupons_info
+ * @Author: jeecg-boot
+ * @Date:   2023-03-03
+ * @Version: V1.0
+ */
+public interface BusMarketCouponsMapper extends BaseMapper<BusMarketCoupons> {
+
+}

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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