Преглед изворни кода

协议单位返佣(部分)

WIN-B904R0U0NNS\Administrator пре 2 година
родитељ
комит
4ed0301657
24 измењених фајлова са 1285 додато и 0 уклоњено
  1. 178 0
      jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/BusAgreementReturnedCommissionDetailController.java
  2. 178 0
      jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/BusAgreementReturnedCommissionPayTypeController.java
  3. 178 0
      jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/BusMarketAgreementReturnedCommissionController.java
  4. 191 0
      jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/BusMarketAgreementUnreturnedCommissionController.java
  5. 71 0
      jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/entity/BusAgreementReturnedCommissionDetail.java
  6. 75 0
      jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/entity/BusAgreementReturnedCommissionPayType.java
  7. 84 0
      jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/entity/BusMarketAgreementReturnedCommission.java
  8. 110 0
      jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/entity/BusMarketAgreementUnreturnedCommission.java
  9. 17 0
      jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/BusAgreementReturnedCommissionDetailMapper.java
  10. 17 0
      jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/BusAgreementReturnedCommissionPayTypeMapper.java
  11. 17 0
      jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/BusMarketAgreementReturnedCommissionMapper.java
  12. 17 0
      jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/BusMarketAgreementUnreturnedCommissionMapper.java
  13. 5 0
      jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/BusAgreementReturnedCommissionDetailMapper.xml
  14. 5 0
      jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/BusAgreementReturnedCommissionPayTypeMapper.xml
  15. 5 0
      jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/BusMarketAgreementReturnedCommissionMapper.xml
  16. 5 0
      jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/BusMarketAgreementUnreturnedCommissionMapper.xml
  17. 14 0
      jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/IBusAgreementReturnedCommissionDetailService.java
  18. 14 0
      jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/IBusAgreementReturnedCommissionPayTypeService.java
  19. 14 0
      jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/IBusMarketAgreementReturnedCommissionService.java
  20. 14 0
      jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/IBusMarketAgreementUnreturnedCommissionService.java
  21. 19 0
      jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/BusAgreementReturnedCommissionDetailServiceImpl.java
  22. 19 0
      jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/BusAgreementReturnedCommissionPayTypeServiceImpl.java
  23. 19 0
      jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/BusMarketAgreementReturnedCommissionServiceImpl.java
  24. 19 0
      jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/BusMarketAgreementUnreturnedCommissionServiceImpl.java

+ 178 - 0
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/BusAgreementReturnedCommissionDetailController.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 com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+
+import org.jeecg.modules.business.entity.BusAgreementReturnedCommissionDetail;
+import org.jeecg.modules.business.service.IBusAgreementReturnedCommissionDetailService;
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+import com.alibaba.fastjson.JSON;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+
+ /**
+ * @Description: 返佣详情
+ * @Author: jeecg-boot
+ * @Date:   2023-04-18
+ * @Version: V1.0
+ */
+@Api(tags="返佣详情")
+@RestController
+@RequestMapping("/business/busAgreementReturnedCommissionDetail")
+@Slf4j
+public class BusAgreementReturnedCommissionDetailController extends JeecgController<BusAgreementReturnedCommissionDetail, IBusAgreementReturnedCommissionDetailService> {
+	@Autowired
+	private IBusAgreementReturnedCommissionDetailService busAgreementReturnedCommissionDetailService;
+
+	/**
+	 * 分页列表查询
+	 *
+	 * @param busAgreementReturnedCommissionDetail
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "返佣详情-分页列表查询")
+	@ApiOperation(value="返佣详情-分页列表查询", notes="返佣详情-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<BusAgreementReturnedCommissionDetail>> queryPageList(BusAgreementReturnedCommissionDetail busAgreementReturnedCommissionDetail,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<BusAgreementReturnedCommissionDetail> queryWrapper = QueryGenerator.initQueryWrapper(busAgreementReturnedCommissionDetail, req.getParameterMap());
+		Page<BusAgreementReturnedCommissionDetail> page = new Page<BusAgreementReturnedCommissionDetail>(pageNo, pageSize);
+		IPage<BusAgreementReturnedCommissionDetail> pageList = busAgreementReturnedCommissionDetailService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+
+	/**
+	 *   添加
+	 *
+	 * @param busAgreementReturnedCommissionDetail
+	 * @return
+	 */
+	@AutoLog(value = "返佣详情-添加")
+	@ApiOperation(value="返佣详情-添加", notes="返佣详情-添加")
+	//@RequiresPermissions("business:bus_agreement_returned_commission_detail_info:add")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody BusAgreementReturnedCommissionDetail busAgreementReturnedCommissionDetail) {
+		busAgreementReturnedCommissionDetailService.save(busAgreementReturnedCommissionDetail);
+		return Result.OK("添加成功!");
+	}
+
+	/**
+	 *  编辑
+	 *
+	 * @param busAgreementReturnedCommissionDetail
+	 * @return
+	 */
+	@AutoLog(value = "返佣详情-编辑")
+	@ApiOperation(value="返佣详情-编辑", notes="返佣详情-编辑")
+	//@RequiresPermissions("business:bus_agreement_returned_commission_detail_info:edit")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody BusAgreementReturnedCommissionDetail busAgreementReturnedCommissionDetail) {
+		busAgreementReturnedCommissionDetailService.updateById(busAgreementReturnedCommissionDetail);
+		return Result.OK("编辑成功!");
+	}
+
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "返佣详情-通过id删除")
+	@ApiOperation(value="返佣详情-通过id删除", notes="返佣详情-通过id删除")
+	//@RequiresPermissions("business:bus_agreement_returned_commission_detail_info:delete")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		busAgreementReturnedCommissionDetailService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "返佣详情-批量删除")
+	@ApiOperation(value="返佣详情-批量删除", notes="返佣详情-批量删除")
+	//@RequiresPermissions("business:bus_agreement_returned_commission_detail_info:deleteBatch")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.busAgreementReturnedCommissionDetailService.removeByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	//@AutoLog(value = "返佣详情-通过id查询")
+	@ApiOperation(value="返佣详情-通过id查询", notes="返佣详情-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<BusAgreementReturnedCommissionDetail> queryById(@RequestParam(name="id",required=true) String id) {
+		BusAgreementReturnedCommissionDetail busAgreementReturnedCommissionDetail = busAgreementReturnedCommissionDetailService.getById(id);
+		if(busAgreementReturnedCommissionDetail==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(busAgreementReturnedCommissionDetail);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param busAgreementReturnedCommissionDetail
+    */
+    //@RequiresPermissions("business:bus_agreement_returned_commission_detail_info:exportXls")
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, BusAgreementReturnedCommissionDetail busAgreementReturnedCommissionDetail) {
+        return super.exportXls(request, busAgreementReturnedCommissionDetail, BusAgreementReturnedCommissionDetail.class, "返佣详情");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    //@RequiresPermissions("business:bus_agreement_returned_commission_detail_info:importExcel")
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, BusAgreementReturnedCommissionDetail.class);
+    }
+
+}

+ 178 - 0
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/BusAgreementReturnedCommissionPayTypeController.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 com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+
+import org.jeecg.modules.business.entity.BusAgreementReturnedCommissionPayType;
+import org.jeecg.modules.business.service.IBusAgreementReturnedCommissionPayTypeService;
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+import com.alibaba.fastjson.JSON;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+
+ /**
+ * @Description: 返佣支付方式
+ * @Author: jeecg-boot
+ * @Date:   2023-04-18
+ * @Version: V1.0
+ */
+@Api(tags="返佣支付方式")
+@RestController
+@RequestMapping("/business/busAgreementReturnedCommissionPayType")
+@Slf4j
+public class BusAgreementReturnedCommissionPayTypeController extends JeecgController<BusAgreementReturnedCommissionPayType, IBusAgreementReturnedCommissionPayTypeService> {
+	@Autowired
+	private IBusAgreementReturnedCommissionPayTypeService busAgreementReturnedCommissionPayTypeService;
+
+	/**
+	 * 分页列表查询
+	 *
+	 * @param busAgreementReturnedCommissionPayType
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "返佣支付方式-分页列表查询")
+	@ApiOperation(value="返佣支付方式-分页列表查询", notes="返佣支付方式-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<BusAgreementReturnedCommissionPayType>> queryPageList(BusAgreementReturnedCommissionPayType busAgreementReturnedCommissionPayType,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<BusAgreementReturnedCommissionPayType> queryWrapper = QueryGenerator.initQueryWrapper(busAgreementReturnedCommissionPayType, req.getParameterMap());
+		Page<BusAgreementReturnedCommissionPayType> page = new Page<BusAgreementReturnedCommissionPayType>(pageNo, pageSize);
+		IPage<BusAgreementReturnedCommissionPayType> pageList = busAgreementReturnedCommissionPayTypeService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+
+	/**
+	 *   添加
+	 *
+	 * @param busAgreementReturnedCommissionPayType
+	 * @return
+	 */
+	@AutoLog(value = "返佣支付方式-添加")
+	@ApiOperation(value="返佣支付方式-添加", notes="返佣支付方式-添加")
+	//@RequiresPermissions("business:bus_agreement_returned_commission_pay_type_info:add")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody BusAgreementReturnedCommissionPayType busAgreementReturnedCommissionPayType) {
+		busAgreementReturnedCommissionPayTypeService.save(busAgreementReturnedCommissionPayType);
+		return Result.OK("添加成功!");
+	}
+
+	/**
+	 *  编辑
+	 *
+	 * @param busAgreementReturnedCommissionPayType
+	 * @return
+	 */
+	@AutoLog(value = "返佣支付方式-编辑")
+	@ApiOperation(value="返佣支付方式-编辑", notes="返佣支付方式-编辑")
+	//@RequiresPermissions("business:bus_agreement_returned_commission_pay_type_info:edit")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody BusAgreementReturnedCommissionPayType busAgreementReturnedCommissionPayType) {
+		busAgreementReturnedCommissionPayTypeService.updateById(busAgreementReturnedCommissionPayType);
+		return Result.OK("编辑成功!");
+	}
+
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "返佣支付方式-通过id删除")
+	@ApiOperation(value="返佣支付方式-通过id删除", notes="返佣支付方式-通过id删除")
+	//@RequiresPermissions("business:bus_agreement_returned_commission_pay_type_info:delete")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		busAgreementReturnedCommissionPayTypeService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "返佣支付方式-批量删除")
+	@ApiOperation(value="返佣支付方式-批量删除", notes="返佣支付方式-批量删除")
+	//@RequiresPermissions("business:bus_agreement_returned_commission_pay_type_info:deleteBatch")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.busAgreementReturnedCommissionPayTypeService.removeByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	//@AutoLog(value = "返佣支付方式-通过id查询")
+	@ApiOperation(value="返佣支付方式-通过id查询", notes="返佣支付方式-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<BusAgreementReturnedCommissionPayType> queryById(@RequestParam(name="id",required=true) String id) {
+		BusAgreementReturnedCommissionPayType busAgreementReturnedCommissionPayType = busAgreementReturnedCommissionPayTypeService.getById(id);
+		if(busAgreementReturnedCommissionPayType==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(busAgreementReturnedCommissionPayType);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param busAgreementReturnedCommissionPayType
+    */
+    //@RequiresPermissions("business:bus_agreement_returned_commission_pay_type_info:exportXls")
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, BusAgreementReturnedCommissionPayType busAgreementReturnedCommissionPayType) {
+        return super.exportXls(request, busAgreementReturnedCommissionPayType, BusAgreementReturnedCommissionPayType.class, "返佣支付方式");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    //@RequiresPermissions("business:bus_agreement_returned_commission_pay_type_info:importExcel")
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, BusAgreementReturnedCommissionPayType.class);
+    }
+
+}

+ 178 - 0
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/BusMarketAgreementReturnedCommissionController.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 com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+
+import org.jeecg.modules.business.entity.BusMarketAgreementReturnedCommission;
+import org.jeecg.modules.business.service.IBusMarketAgreementReturnedCommissionService;
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+import com.alibaba.fastjson.JSON;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+
+ /**
+ * @Description: 已返佣记录
+ * @Author: jeecg-boot
+ * @Date:   2023-04-18
+ * @Version: V1.0
+ */
+@Api(tags="已返佣记录")
+@RestController
+@RequestMapping("/business/busMarketAgreementReturnedCommission")
+@Slf4j
+public class BusMarketAgreementReturnedCommissionController extends JeecgController<BusMarketAgreementReturnedCommission, IBusMarketAgreementReturnedCommissionService> {
+	@Autowired
+	private IBusMarketAgreementReturnedCommissionService busMarketAgreementReturnedCommissionService;
+
+	/**
+	 * 分页列表查询
+	 *
+	 * @param busMarketAgreementReturnedCommission
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "已返佣记录-分页列表查询")
+	@ApiOperation(value="已返佣记录-分页列表查询", notes="已返佣记录-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<BusMarketAgreementReturnedCommission>> queryPageList(BusMarketAgreementReturnedCommission busMarketAgreementReturnedCommission,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<BusMarketAgreementReturnedCommission> queryWrapper = QueryGenerator.initQueryWrapper(busMarketAgreementReturnedCommission, req.getParameterMap());
+		Page<BusMarketAgreementReturnedCommission> page = new Page<BusMarketAgreementReturnedCommission>(pageNo, pageSize);
+		IPage<BusMarketAgreementReturnedCommission> pageList = busMarketAgreementReturnedCommissionService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+
+	/**
+	 *   添加
+	 *
+	 * @param busMarketAgreementReturnedCommission
+	 * @return
+	 */
+	@AutoLog(value = "已返佣记录-添加")
+	@ApiOperation(value="已返佣记录-添加", notes="已返佣记录-添加")
+	//@RequiresPermissions("business:bus_market_agreement_returned_commission_info:add")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody BusMarketAgreementReturnedCommission busMarketAgreementReturnedCommission) {
+		busMarketAgreementReturnedCommissionService.save(busMarketAgreementReturnedCommission);
+		return Result.OK("添加成功!");
+	}
+
+	/**
+	 *  编辑
+	 *
+	 * @param busMarketAgreementReturnedCommission
+	 * @return
+	 */
+	@AutoLog(value = "已返佣记录-编辑")
+	@ApiOperation(value="已返佣记录-编辑", notes="已返佣记录-编辑")
+	//@RequiresPermissions("business:bus_market_agreement_returned_commission_info:edit")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody BusMarketAgreementReturnedCommission busMarketAgreementReturnedCommission) {
+		busMarketAgreementReturnedCommissionService.updateById(busMarketAgreementReturnedCommission);
+		return Result.OK("编辑成功!");
+	}
+
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "已返佣记录-通过id删除")
+	@ApiOperation(value="已返佣记录-通过id删除", notes="已返佣记录-通过id删除")
+	//@RequiresPermissions("business:bus_market_agreement_returned_commission_info:delete")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		busMarketAgreementReturnedCommissionService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "已返佣记录-批量删除")
+	@ApiOperation(value="已返佣记录-批量删除", notes="已返佣记录-批量删除")
+	//@RequiresPermissions("business:bus_market_agreement_returned_commission_info:deleteBatch")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.busMarketAgreementReturnedCommissionService.removeByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	//@AutoLog(value = "已返佣记录-通过id查询")
+	@ApiOperation(value="已返佣记录-通过id查询", notes="已返佣记录-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<BusMarketAgreementReturnedCommission> queryById(@RequestParam(name="id",required=true) String id) {
+		BusMarketAgreementReturnedCommission busMarketAgreementReturnedCommission = busMarketAgreementReturnedCommissionService.getById(id);
+		if(busMarketAgreementReturnedCommission==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(busMarketAgreementReturnedCommission);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param busMarketAgreementReturnedCommission
+    */
+    //@RequiresPermissions("business:bus_market_agreement_returned_commission_info:exportXls")
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, BusMarketAgreementReturnedCommission busMarketAgreementReturnedCommission) {
+        return super.exportXls(request, busMarketAgreementReturnedCommission, BusMarketAgreementReturnedCommission.class, "已返佣记录");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    //@RequiresPermissions("business:bus_market_agreement_returned_commission_info:importExcel")
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, BusMarketAgreementReturnedCommission.class);
+    }
+
+}

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

@@ -0,0 +1,191 @@
+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.annotation.Resource;
+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 com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+
+import org.jeecg.modules.business.entity.BusMarketAgreementUnreturnedCommission;
+import org.jeecg.modules.business.service.IBusMarketAgreementUnreturnedCommissionService;
+import org.jeecg.modules.rooms.entity.CesRooms;
+import org.jeecg.modules.rooms.service.CesRoomsServiceImpl;
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+import com.alibaba.fastjson.JSON;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+
+ /**
+ * @Description: 未返佣记录
+ * @Author: jeecg-boot
+ * @Date:   2023-04-18
+ * @Version: V1.0
+ */
+@Api(tags="未返佣记录")
+@RestController
+@RequestMapping("/business/busMarketAgreementUnreturnedCommission")
+@Slf4j
+public class BusMarketAgreementUnreturnedCommissionController extends JeecgController<BusMarketAgreementUnreturnedCommission, IBusMarketAgreementUnreturnedCommissionService> {
+	@Autowired
+	private IBusMarketAgreementUnreturnedCommissionService busMarketAgreementUnreturnedCommissionService;
+
+	 @Resource
+	 private CesRoomsServiceImpl roomsService;
+
+	/**
+	 * 分页列表查询
+	 *
+	 * @param busMarketAgreementUnreturnedCommission
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "未返佣记录-分页列表查询")
+	@ApiOperation(value="未返佣记录-分页列表查询", notes="未返佣记录-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<BusMarketAgreementUnreturnedCommission>> queryPageList(BusMarketAgreementUnreturnedCommission busMarketAgreementUnreturnedCommission,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<BusMarketAgreementUnreturnedCommission> queryWrapper = QueryGenerator.initQueryWrapper(busMarketAgreementUnreturnedCommission, req.getParameterMap());
+		Page<BusMarketAgreementUnreturnedCommission> page = new Page<BusMarketAgreementUnreturnedCommission>(pageNo, pageSize);
+		IPage<BusMarketAgreementUnreturnedCommission> pageList = busMarketAgreementUnreturnedCommissionService.page(page, queryWrapper);
+		pageList.getRecords().forEach(item->{
+			CesRooms cesRooms = roomsService.getById(item.getRoomId());
+			if (cesRooms != null){
+				String _roomNumber = cesRooms.getPrefix()+cesRooms.getName();
+				item.setRoomNumber(_roomNumber);
+			}
+		});
+		return Result.OK(pageList);
+	}
+
+	/**
+	 *   添加
+	 *
+	 * @param busMarketAgreementUnreturnedCommission
+	 * @return
+	 */
+	@AutoLog(value = "未返佣记录-添加")
+	@ApiOperation(value="未返佣记录-添加", notes="未返佣记录-添加")
+	//@RequiresPermissions("business:bus_market_agreement_unreturned_commission_info:add")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody BusMarketAgreementUnreturnedCommission busMarketAgreementUnreturnedCommission) {
+		busMarketAgreementUnreturnedCommissionService.save(busMarketAgreementUnreturnedCommission);
+		return Result.OK("添加成功!");
+	}
+
+	/**
+	 *  编辑
+	 *
+	 * @param busMarketAgreementUnreturnedCommission
+	 * @return
+	 */
+	@AutoLog(value = "未返佣记录-编辑")
+	@ApiOperation(value="未返佣记录-编辑", notes="未返佣记录-编辑")
+	//@RequiresPermissions("business:bus_market_agreement_unreturned_commission_info:edit")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody BusMarketAgreementUnreturnedCommission busMarketAgreementUnreturnedCommission) {
+		busMarketAgreementUnreturnedCommissionService.updateById(busMarketAgreementUnreturnedCommission);
+		return Result.OK("编辑成功!");
+	}
+
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "未返佣记录-通过id删除")
+	@ApiOperation(value="未返佣记录-通过id删除", notes="未返佣记录-通过id删除")
+	//@RequiresPermissions("business:bus_market_agreement_unreturned_commission_info:delete")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		busMarketAgreementUnreturnedCommissionService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "未返佣记录-批量删除")
+	@ApiOperation(value="未返佣记录-批量删除", notes="未返佣记录-批量删除")
+	//@RequiresPermissions("business:bus_market_agreement_unreturned_commission_info:deleteBatch")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.busMarketAgreementUnreturnedCommissionService.removeByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	//@AutoLog(value = "未返佣记录-通过id查询")
+	@ApiOperation(value="未返佣记录-通过id查询", notes="未返佣记录-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<BusMarketAgreementUnreturnedCommission> queryById(@RequestParam(name="id",required=true) String id) {
+		BusMarketAgreementUnreturnedCommission busMarketAgreementUnreturnedCommission = busMarketAgreementUnreturnedCommissionService.getById(id);
+		if(busMarketAgreementUnreturnedCommission==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(busMarketAgreementUnreturnedCommission);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param busMarketAgreementUnreturnedCommission
+    */
+    //@RequiresPermissions("business:bus_market_agreement_unreturned_commission_info:exportXls")
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, BusMarketAgreementUnreturnedCommission busMarketAgreementUnreturnedCommission) {
+        return super.exportXls(request, busMarketAgreementUnreturnedCommission, BusMarketAgreementUnreturnedCommission.class, "未返佣记录");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    //@RequiresPermissions("business:bus_market_agreement_unreturned_commission_info:importExcel")
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, BusMarketAgreementUnreturnedCommission.class);
+    }
+
+}

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

@@ -0,0 +1,71 @@
+package org.jeecg.modules.business.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.jeecg.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @Description: 返佣详情
+ * @Author: jeecg-boot
+ * @Date:   2023-04-18
+ * @Version: V1.0
+ */
+@Data
+@TableName("bus_agreement_returned_commission_detail_info")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="bus_agreement_returned_commission_detail_info对象", description="返佣详情")
+public class BusAgreementReturnedCommissionDetail 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 agreementReturnedId;
+	/**关联未返佣记录*/
+	@Excel(name = "关联未返佣记录", width = 15)
+    @ApiModelProperty(value = "关联未返佣记录")
+    private String agreementUnreturnedId;
+	/**创建人*/
+    @ApiModelProperty(value = "创建人")
+    private String createBy;
+	/**创建时间*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+	/**更新人*/
+    @ApiModelProperty(value = "更新人")
+    private String updateBy;
+	/**更新时间*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "更新时间")
+    private Date updateTime;
+}

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

@@ -0,0 +1,75 @@
+package org.jeecg.modules.business.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.jeecg.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @Description: 返佣支付方式
+ * @Author: jeecg-boot
+ * @Date:   2023-04-18
+ * @Version: V1.0
+ */
+@Data
+@TableName("bus_agreement_returned_commission_pay_type_info")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="bus_agreement_returned_commission_pay_type_info对象", description="返佣支付方式")
+public class BusAgreementReturnedCommissionPayType 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 agreementReturnedId;
+	/**关联支付方式*/
+	@Excel(name = "关联支付方式", width = 15)
+    @ApiModelProperty(value = "关联支付方式")
+    private String payTypeId;
+	/**支付金额*/
+	@Excel(name = "支付金额", width = 15)
+    @ApiModelProperty(value = "支付金额")
+    private BigDecimal money;
+	/**创建人*/
+    @ApiModelProperty(value = "创建人")
+    private String createBy;
+	/**创建时间*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+	/**更新人*/
+    @ApiModelProperty(value = "更新人")
+    private String updateBy;
+	/**更新时间*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "更新时间")
+    private Date updateTime;
+}

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

@@ -0,0 +1,84 @@
+package org.jeecg.modules.business.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.jeecg.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @Description: 已返佣记录
+ * @Author: jeecg-boot
+ * @Date:   2023-04-18
+ * @Version: V1.0
+ */
+@Data
+@TableName("bus_market_agreement_returned_commission_info")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="bus_market_agreement_returned_commission_info对象", description="已返佣记录")
+public class BusMarketAgreementReturnedCommission 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 agreementId;
+//	/**关联返佣记录*/
+//	@Excel(name = "关联返佣记录", width = 15)
+//    @ApiModelProperty(value = "关联返佣记录")
+//    private String agreementUnreturnedId;
+	/**总金额*/
+	@Excel(name = "总金额", width = 15)
+    @ApiModelProperty(value = "总金额")
+    private BigDecimal sumMoney;
+	/**已返佣金*/
+	@Excel(name = "已返佣金", width = 15)
+    @ApiModelProperty(value = "已返佣金")
+    private BigDecimal returnedCommission;
+	/**删除状态(0-正常,1-已删除)*/
+	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
+    @ApiModelProperty(value = "删除状态(0-正常,1-已删除)")
+    @TableLogic
+    private Integer delFlag;
+	/**创建人*/
+    @ApiModelProperty(value = "创建人")
+    private String createBy;
+	/**创建时间*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+	/**更新人*/
+    @ApiModelProperty(value = "更新人")
+    private String updateBy;
+	/**更新时间*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "更新时间")
+    private Date updateTime;
+}

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

@@ -0,0 +1,110 @@
+package org.jeecg.modules.business.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.jeecg.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @Description: 未返佣记录
+ * @Author: jeecg-boot
+ * @Date:   2023-04-18
+ * @Version: V1.0
+ */
+@Data
+@TableName("bus_market_agreement_unreturned_commission_info")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="bus_market_agreement_unreturned_commission_info对象", description="未返佣记录")
+public class BusMarketAgreementUnreturnedCommission 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 agreementId;
+	/**关联客户协议*/
+	@Excel(name = "关联客户协议", width = 15)
+    @ApiModelProperty(value = "关联客户协议")
+    private String customerId;
+	/**单据号*/
+	@Excel(name = "单据号", width = 15)
+    @ApiModelProperty(value = "单据号")
+    private String livingOrderNo;
+	/**房间号*/
+	@Excel(name = "房间号", width = 15)
+    @ApiModelProperty(value = "房间号")
+    private String roomId;
+	/**入住时间*/
+	@Excel(name = "入住时间", width = 15, format = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "入住时间")
+    private Date businessDay;
+	/**需返佣金*/
+	@Excel(name = "需返佣金", width = 15)
+    @ApiModelProperty(value = "需返佣金")
+    private BigDecimal refundedCommission;
+	/**每日记佣(0-否;1-是)*/
+	@Excel(name = "每日记佣(0-否;1-是)", width = 15)
+    @ApiModelProperty(value = "每日记佣(0-否;1-是)")
+    private Integer commission;
+	/**记佣时间*/
+	@Excel(name = "记佣时间", width = 15, format = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "记佣时间")
+    private Date commissionDate;
+	/**是否已返佣(0-否;1-是)*/
+	@Excel(name = "是否已返佣(0-否;1-是)", width = 15)
+    @ApiModelProperty(value = "是否已返佣(0-否;1-是)")
+    private Integer rebate;
+	/**删除状态(0-正常,1-已删除)*/
+	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
+    @ApiModelProperty(value = "删除状态(0-正常,1-已删除)")
+    @TableLogic
+    private Integer delFlag;
+	/**创建人*/
+    @ApiModelProperty(value = "创建人")
+    private String createBy;
+	/**创建时间*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+	/**更新人*/
+    @ApiModelProperty(value = "更新人")
+    private String updateBy;
+	/**更新时间*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "更新时间")
+    private Date updateTime;
+
+    private transient String roomNumber;
+}

+ 17 - 0
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/BusAgreementReturnedCommissionDetailMapper.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.business.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.business.entity.BusAgreementReturnedCommissionDetail;
+
+/**
+ * @Description: 返佣详情
+ * @Author: jeecg-boot
+ * @Date:   2023-04-18
+ * @Version: V1.0
+ */
+public interface BusAgreementReturnedCommissionDetailMapper extends BaseMapper<BusAgreementReturnedCommissionDetail> {
+
+}

+ 17 - 0
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/BusAgreementReturnedCommissionPayTypeMapper.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.business.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.business.entity.BusAgreementReturnedCommissionPayType;
+
+/**
+ * @Description: 返佣支付方式
+ * @Author: jeecg-boot
+ * @Date:   2023-04-18
+ * @Version: V1.0
+ */
+public interface BusAgreementReturnedCommissionPayTypeMapper extends BaseMapper<BusAgreementReturnedCommissionPayType> {
+
+}

+ 17 - 0
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/BusMarketAgreementReturnedCommissionMapper.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.business.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.business.entity.BusMarketAgreementReturnedCommission;
+
+/**
+ * @Description: 已返佣记录
+ * @Author: jeecg-boot
+ * @Date:   2023-04-18
+ * @Version: V1.0
+ */
+public interface BusMarketAgreementReturnedCommissionMapper extends BaseMapper<BusMarketAgreementReturnedCommission> {
+
+}

+ 17 - 0
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/BusMarketAgreementUnreturnedCommissionMapper.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.business.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.business.entity.BusMarketAgreementUnreturnedCommission;
+
+/**
+ * @Description: 未返佣记录
+ * @Author: jeecg-boot
+ * @Date:   2023-04-18
+ * @Version: V1.0
+ */
+public interface BusMarketAgreementUnreturnedCommissionMapper extends BaseMapper<BusMarketAgreementUnreturnedCommission> {
+
+}

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

+ 5 - 0
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/BusAgreementReturnedCommissionPayTypeMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.jeecg.modules.business.mapper.BusAgreementReturnedCommissionPayTypeMapper">
+
+</mapper>

+ 5 - 0
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/BusMarketAgreementReturnedCommissionMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.jeecg.modules.business.mapper.BusMarketAgreementReturnedCommissionMapper">
+
+</mapper>

+ 5 - 0
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/BusMarketAgreementUnreturnedCommissionMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.jeecg.modules.business.mapper.BusMarketAgreementUnreturnedCommissionMapper">
+
+</mapper>

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

@@ -0,0 +1,14 @@
+package org.jeecg.modules.business.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.business.entity.BusAgreementReturnedCommissionDetail;
+
+/**
+ * @Description: 返佣详情
+ * @Author: jeecg-boot
+ * @Date:   2023-04-18
+ * @Version: V1.0
+ */
+public interface IBusAgreementReturnedCommissionDetailService extends IService<BusAgreementReturnedCommissionDetail> {
+
+}

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

@@ -0,0 +1,14 @@
+package org.jeecg.modules.business.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.business.entity.BusAgreementReturnedCommissionPayType;
+
+/**
+ * @Description: 返佣支付方式
+ * @Author: jeecg-boot
+ * @Date:   2023-04-18
+ * @Version: V1.0
+ */
+public interface IBusAgreementReturnedCommissionPayTypeService extends IService<BusAgreementReturnedCommissionPayType> {
+
+}

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

@@ -0,0 +1,14 @@
+package org.jeecg.modules.business.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.business.entity.BusMarketAgreementReturnedCommission;
+
+/**
+ * @Description: 已返佣记录
+ * @Author: jeecg-boot
+ * @Date:   2023-04-18
+ * @Version: V1.0
+ */
+public interface IBusMarketAgreementReturnedCommissionService extends IService<BusMarketAgreementReturnedCommission> {
+
+}

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

@@ -0,0 +1,14 @@
+package org.jeecg.modules.business.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.business.entity.BusMarketAgreementUnreturnedCommission;
+
+/**
+ * @Description: 未返佣记录
+ * @Author: jeecg-boot
+ * @Date:   2023-04-18
+ * @Version: V1.0
+ */
+public interface IBusMarketAgreementUnreturnedCommissionService extends IService<BusMarketAgreementUnreturnedCommission> {
+
+}

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

@@ -0,0 +1,19 @@
+package org.jeecg.modules.business.service.impl;
+
+import org.jeecg.modules.business.entity.BusAgreementReturnedCommissionDetail;
+import org.jeecg.modules.business.mapper.BusAgreementReturnedCommissionDetailMapper;
+import org.jeecg.modules.business.service.IBusAgreementReturnedCommissionDetailService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 返佣详情
+ * @Author: jeecg-boot
+ * @Date:   2023-04-18
+ * @Version: V1.0
+ */
+@Service
+public class BusAgreementReturnedCommissionDetailServiceImpl extends ServiceImpl<BusAgreementReturnedCommissionDetailMapper, BusAgreementReturnedCommissionDetail> implements IBusAgreementReturnedCommissionDetailService {
+
+}

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

@@ -0,0 +1,19 @@
+package org.jeecg.modules.business.service.impl;
+
+import org.jeecg.modules.business.entity.BusAgreementReturnedCommissionPayType;
+import org.jeecg.modules.business.mapper.BusAgreementReturnedCommissionPayTypeMapper;
+import org.jeecg.modules.business.service.IBusAgreementReturnedCommissionPayTypeService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 返佣支付方式
+ * @Author: jeecg-boot
+ * @Date:   2023-04-18
+ * @Version: V1.0
+ */
+@Service
+public class BusAgreementReturnedCommissionPayTypeServiceImpl extends ServiceImpl<BusAgreementReturnedCommissionPayTypeMapper, BusAgreementReturnedCommissionPayType> implements IBusAgreementReturnedCommissionPayTypeService {
+
+}

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

@@ -0,0 +1,19 @@
+package org.jeecg.modules.business.service.impl;
+
+import org.jeecg.modules.business.entity.BusMarketAgreementReturnedCommission;
+import org.jeecg.modules.business.mapper.BusMarketAgreementReturnedCommissionMapper;
+import org.jeecg.modules.business.service.IBusMarketAgreementReturnedCommissionService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 已返佣记录
+ * @Author: jeecg-boot
+ * @Date:   2023-04-18
+ * @Version: V1.0
+ */
+@Service
+public class BusMarketAgreementReturnedCommissionServiceImpl extends ServiceImpl<BusMarketAgreementReturnedCommissionMapper, BusMarketAgreementReturnedCommission> implements IBusMarketAgreementReturnedCommissionService {
+
+}

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

@@ -0,0 +1,19 @@
+package org.jeecg.modules.business.service.impl;
+
+import org.jeecg.modules.business.entity.BusMarketAgreementUnreturnedCommission;
+import org.jeecg.modules.business.mapper.BusMarketAgreementUnreturnedCommissionMapper;
+import org.jeecg.modules.business.service.IBusMarketAgreementUnreturnedCommissionService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 未返佣记录
+ * @Author: jeecg-boot
+ * @Date:   2023-04-18
+ * @Version: V1.0
+ */
+@Service
+public class BusMarketAgreementUnreturnedCommissionServiceImpl extends ServiceImpl<BusMarketAgreementUnreturnedCommissionMapper, BusMarketAgreementUnreturnedCommission> implements IBusMarketAgreementUnreturnedCommissionService {
+
+}