Merge remote-tracking branch 'origin/master'

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/basics/domain/PtCardtype.java

@@ -32,6 +32,8 @@ public class PtCardtype extends TenantEntity {
      */
     private String typeName;
 
+    private Long code;
+
     /**
      * 管理费
      */

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/basics/domain/bo/PtCardtypeBo.java

@@ -25,6 +25,11 @@ public class PtCardtypeBo extends BaseEntity {
      */
     private Long typeId;
 
+    @NotNull(message = "code不能为空", groups = { AddGroup.class, EditGroup.class })
+    @Max(value = 32, message = "code不能大于32", groups = { AddGroup.class, EditGroup.class })
+    @Min(value = 1, message = "code必须大于等于1", groups = { AddGroup.class, EditGroup.class })
+    private Long code;
+
     /**
      * 卡类别
      */

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/basics/domain/vo/PtCardtypeVo.java

@@ -40,6 +40,8 @@ public class PtCardtypeVo implements Serializable {
     @ExcelProperty(value = "卡类别")
     private String typeName;
 
+    @ExcelProperty(value = "code")
+    private Long code;
     /**
      * 管理费
      */

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/basics/service/impl/PtCardtypeServiceImpl.java

@@ -3,6 +3,7 @@ package org.dromara.backstage.basics.service.impl;
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.util.ObjectUtil;
 import org.dromara.backstage.payment.domain.vo.PtUserAccountVo;
+import org.dromara.common.core.exception.ServiceException;
 import org.dromara.common.core.utils.MapstructUtils;
 import org.dromara.common.core.utils.SpringUtils;
 import org.dromara.common.core.utils.StringUtils;
@@ -116,7 +117,12 @@ public class PtCardtypeServiceImpl implements IPtCardtypeService {
      * 保存前的数据校验
      */
     private void validEntityBeforeSave(PtCardtype entity){
-        //TODO 做一些数据校验,如唯一约束
+        LambdaQueryWrapper<PtCardtype> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.ne(entity.getTypeId()!=null, PtCardtype::getTypeId, entity.getTypeId())
+            .and(e -> e.eq(PtCardtype::getTypeName, entity.getTypeName()).or().eq(PtCardtype::getCode, entity.getCode()));
+        if(baseMapper.selectCount(queryWrapper) > 0){
+            throw new ServiceException("卡片类别名称或编号已存在");
+        }
     }
 
     /**

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/cardCenter/controller/PtSubsidyController.java

@@ -0,0 +1,106 @@
+package org.dromara.backstage.cardCenter.controller;
+
+import java.util.List;
+
+import lombok.RequiredArgsConstructor;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.*;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.validation.annotation.Validated;
+import org.dromara.common.idempotent.annotation.RepeatSubmit;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.backstage.cardCenter.domain.vo.PtSubsidyVo;
+import org.dromara.backstage.cardCenter.domain.bo.PtSubsidyBo;
+import org.dromara.backstage.cardCenter.service.IPtSubsidyService;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+
+/**
+ * 补助设置
+ * 前端访问路由地址为:/subsidy/ptSubsidy
+ *
+ * @author Yz
+ * @date 2024-08-12
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/subsidy/ptSubsidy")
+public class PtSubsidyController extends BaseController {
+
+    private final IPtSubsidyService ptSubsidyService;
+
+    /**
+     * 查询补助设置列表
+     */
+    @SaCheckPermission("subsidy:ptSubsidy:list")
+    @GetMapping("/list")
+    public TableDataInfo<PtSubsidyVo> list(PtSubsidyBo bo, PageQuery pageQuery) {
+        return ptSubsidyService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出补助设置列表
+     */
+    @SaCheckPermission("subsidy:ptSubsidy:export")
+    @Log(title = "补助设置", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(PtSubsidyBo bo, HttpServletResponse response) {
+        List<PtSubsidyVo> list = ptSubsidyService.queryList(bo);
+        ExcelUtil.exportExcel(list, "补助设置", PtSubsidyVo.class, response);
+    }
+
+    /**
+     * 获取补助设置详细信息
+     *
+     * @param mainId 主键
+     */
+    @SaCheckPermission("subsidy:ptSubsidy:query")
+    @GetMapping("/{mainId}")
+    public R<PtSubsidyVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable Long mainId) {
+        return R.ok(ptSubsidyService.queryById(mainId));
+    }
+
+    /**
+     * 新增补助设置
+     */
+    @SaCheckPermission("subsidy:ptSubsidy:add")
+    @Log(title = "补助设置", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody PtSubsidyBo bo) {
+        return toAjax(ptSubsidyService.insertByBo(bo));
+    }
+
+    /**
+     * 修改补助设置
+     */
+    @SaCheckPermission("subsidy:ptSubsidy:edit")
+    @Log(title = "补助设置", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody PtSubsidyBo bo) {
+        return toAjax(ptSubsidyService.updateByBo(bo));
+    }
+
+    /**
+     * 删除补助设置
+     *
+     * @param mainIds 主键串
+     */
+    @SaCheckPermission("subsidy:ptSubsidy:remove")
+    @Log(title = "补助设置", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{mainIds}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] mainIds) {
+        return toAjax(ptSubsidyService.deleteWithValidByIds(List.of(mainIds), true));
+    }
+}

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/cardCenter/controller/PtSubsidyitemController.java

@@ -0,0 +1,106 @@
+package org.dromara.backstage.cardCenter.controller;
+
+import java.util.List;
+
+import lombok.RequiredArgsConstructor;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.*;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.validation.annotation.Validated;
+import org.dromara.common.idempotent.annotation.RepeatSubmit;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.backstage.cardCenter.domain.vo.PtSubsidyitemVo;
+import org.dromara.backstage.cardCenter.domain.bo.PtSubsidyitemBo;
+import org.dromara.backstage.cardCenter.service.IPtSubsidyitemService;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+
+/**
+ * 补助明细
+ * 前端访问路由地址为:/subsidy/ptSubsidyitem
+ *
+ * @author Yz
+ * @date 2024-08-14
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/subsidy/ptSubsidyitem")
+public class PtSubsidyitemController extends BaseController {
+
+    private final IPtSubsidyitemService ptSubsidyitemService;
+
+    /**
+     * 查询补助明细列表
+     */
+    @SaCheckPermission("subsidy:ptSubsidyitem:list")
+    @GetMapping("/list")
+    public TableDataInfo<PtSubsidyitemVo> list(PtSubsidyitemBo bo, PageQuery pageQuery) {
+        return ptSubsidyitemService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出补助明细列表
+     */
+    @SaCheckPermission("subsidy:ptSubsidyitem:export")
+    @Log(title = "补助明细", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(PtSubsidyitemBo bo, HttpServletResponse response) {
+        List<PtSubsidyitemVo> list = ptSubsidyitemService.queryList(bo);
+        ExcelUtil.exportExcel(list, "补助明细", PtSubsidyitemVo.class, response);
+    }
+
+    /**
+     * 获取补助明细详细信息
+     *
+     * @param itemId 主键
+     */
+    @SaCheckPermission("subsidy:ptSubsidyitem:query")
+    @GetMapping("/{itemId}")
+    public R<PtSubsidyitemVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable Long itemId) {
+        return R.ok(ptSubsidyitemService.queryById(itemId));
+    }
+
+    /**
+     * 新增补助明细
+     */
+    @SaCheckPermission("subsidy:ptSubsidyitem:add")
+    @Log(title = "补助明细", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody PtSubsidyitemBo bo) {
+        return toAjax(ptSubsidyitemService.insertByBo(bo));
+    }
+
+    /**
+     * 修改补助明细
+     */
+    @SaCheckPermission("subsidy:ptSubsidyitem:edit")
+    @Log(title = "补助明细", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody PtSubsidyitemBo bo) {
+        return toAjax(ptSubsidyitemService.updateByBo(bo));
+    }
+
+    /**
+     * 删除补助明细
+     *
+     * @param itemIds 主键串
+     */
+    @SaCheckPermission("subsidy:ptSubsidyitem:remove")
+    @Log(title = "补助明细", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{itemIds}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] itemIds) {
+        return toAjax(ptSubsidyitemService.deleteWithValidByIds(List.of(itemIds), true));
+    }
+}

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/cardCenter/domain/PtSubsidy.java

@@ -0,0 +1,89 @@
+package org.dromara.backstage.cardCenter.domain;
+
+import org.dromara.common.tenant.core.TenantEntity;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.io.Serial;
+
+/**
+ * 补助设置对象 t_pt_subsidy
+ *
+ * @author Yz
+ * @date 2024-08-12
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("t_pt_subsidy")
+public class PtSubsidy extends TenantEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+    @TableId(value = "main_id")
+    private Long mainId;
+
+    /**
+     * 补助名称
+     */
+    private String subsidyName;
+
+    /**
+     * 补助类型
+     */
+    private String subsidyType;
+
+    /**
+     * 补助金额
+     */
+    private Long fillMoney;
+
+    /**
+     * 预计到账时间
+     */
+    private Date fillDate;
+
+    /**
+     * 入账钱包
+     */
+    private Long bagCode;
+
+    /**
+     * 到账状态
+     */
+    private String fillStatus;
+
+    /**
+     * 审核状态
+     */
+    private String auditStatus;
+
+    /**
+     * 审核人
+     */
+    private Long auditUser;
+
+    /**
+     * 审核时间
+     */
+    private Date auditDate;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 删除标志(0-未删除 2-已删除)
+     */
+    @TableLogic
+    private String delFlag;
+
+
+}

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/cardCenter/domain/PtSubsidyitem.java

@@ -0,0 +1,109 @@
+package org.dromara.backstage.cardCenter.domain;
+
+import org.dromara.common.tenant.core.TenantEntity;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.io.Serial;
+
+/**
+ * 补助明细对象 t_pt_subsidyItem
+ *
+ * @author Yz
+ * @date 2024-08-14
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("t_pt_subsidyItem")
+public class PtSubsidyitem extends TenantEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 明细Id,主键
+     */
+    @TableId(value = "item_id")
+    private Long itemId;
+
+    /**
+     * 补助设置Id
+     */
+    private Long mainId;
+
+    /**
+     * 补助人员Id
+     */
+    private Long userId;
+
+    /**
+     * 补助类型
+     */
+    private String subsidyType;
+
+    /**
+     * 补助金额
+     */
+    private Long fillMoney;
+
+    /**
+     * 预计到账时间
+     */
+    private Date fillDate;
+
+    /**
+     * 领取状态
+     */
+    private String fillStatus;
+
+    /**
+     * 领取时间
+     */
+    private Date getDate;
+
+    /**
+     * 领取补助之后钱包余额
+     */
+    private Long beforeMoney;
+
+    /**
+     * 领取补助之后钱包余额
+     */
+    private Long afterMoney;
+
+    /**
+     * 原始记录Id,一般是指写入的充值备份表主键
+     */
+    private String originalId;
+
+    /**
+     * 用户编号/工号
+     */
+    private String userNumb;
+
+    /**
+     * 用户姓名
+     */
+    private String realName;
+
+    /**
+     * 部门名称
+     */
+    private String deptName;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 删除标志(0-未删除 2-已删除)
+     */
+    @TableLogic
+    private String delFlag;
+
+
+}

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/cardCenter/domain/bo/PtSubsidyBo.java

@@ -0,0 +1,90 @@
+package org.dromara.backstage.cardCenter.domain.bo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import net.bytebuddy.implementation.bind.annotation.Default;
+import org.dromara.backstage.cardCenter.domain.PtSubsidy;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 补助设置业务对象 t_pt_subsidy
+ *
+ * @author Yz
+ * @date 2024-08-12
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = PtSubsidy.class, reverseConvertGenerate = false)
+public class PtSubsidyBo extends BaseEntity {
+
+    /**
+     * ID
+     */
+    @NotNull(message = "ID不能为空", groups = { EditGroup.class })
+    private Long mainId;
+
+    /**
+     * 补助名称
+     */
+    @NotBlank(message = "补助名称不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String subsidyName;
+
+    /**
+     * 补助类型
+     */
+    @NotBlank(message = "补助类型不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String subsidyType;
+
+    /**
+     * 补助金额
+     */
+    @NotNull(message = "补助金额不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long fillMoney;
+
+    /**
+     * 预计到账时间
+     */
+    @NotNull(message = "预计到账时间不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Date fillDate;
+
+    /**
+     * 入账钱包
+     */
+    @NotNull(message = "入账钱包不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long bagCode;
+
+    /**
+     * 到账状态
+     */
+    private String fillStatus;
+
+    /**
+     * 审核状态
+     */
+    private String auditStatus;
+
+    /**
+     * 审核人
+     */
+    private Long auditUser;
+
+    /**
+     * 审核时间
+     */
+    private Date auditDate;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    private List<PtSubsidyitemBo> subsidyitemBoList;
+}

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/cardCenter/domain/bo/PtSubsidyitemBo.java

@@ -0,0 +1,116 @@
+package org.dromara.backstage.cardCenter.domain.bo;
+
+import org.dromara.backstage.cardCenter.domain.PtSubsidyitem;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import jakarta.validation.constraints.*;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+/**
+ * 补助明细业务对象 t_pt_subsidyItem
+ *
+ * @author Yz
+ * @date 2024-08-14
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = PtSubsidyitem.class, reverseConvertGenerate = false)
+public class PtSubsidyitemBo extends BaseEntity {
+
+    /**
+     * 明细Id,主键
+     */
+    @NotNull(message = "明细Id,主键不能为空", groups = { EditGroup.class })
+    private Long itemId;
+
+    /**
+     * 补助设置Id
+     */
+    @NotNull(message = "补助设置Id不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long mainId;
+
+    /**
+     * 补助人员Id
+     */
+    @NotNull(message = "补助人员Id不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long userId;
+
+    /**
+     * 补助类型
+     */
+    @NotBlank(message = "补助类型不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String subsidyType;
+
+    /**
+     * 补助金额
+     */
+    @NotNull(message = "补助金额不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long fillMoney;
+
+    /**
+     * 预计到账时间
+     */
+    @NotNull(message = "预计到账时间不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Date fillDate;
+
+    /**
+     * 领取状态
+     */
+    @NotBlank(message = "领取状态不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String fillStatus;
+
+    /**
+     * 领取时间
+     */
+    @NotNull(message = "领取时间不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Date getDate;
+
+    /**
+     * 领取补助之后钱包余额
+     */
+    @NotNull(message = "领取补助之后钱包余额不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long beforeMoney;
+
+    /**
+     * 领取补助之后钱包余额
+     */
+    @NotNull(message = "领取补助之后钱包余额不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long afterMoney;
+
+    /**
+     * 原始记录Id,一般是指写入的充值备份表主键
+     */
+    @NotBlank(message = "原始记录Id,一般是指写入的充值备份表主键不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String originalId;
+
+    /**
+     * 用户编号/工号
+     */
+    @NotBlank(message = "用户编号/工号不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String userNumb;
+
+    /**
+     * 用户姓名
+     */
+    @NotBlank(message = "用户姓名不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String realName;
+
+    /**
+     * 部门名称
+     */
+    @NotBlank(message = "部门名称不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String deptName;
+
+    /**
+     * 备注
+     */
+    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String remark;
+
+
+}

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/cardCenter/domain/vo/PtSubsidyVo.java

@@ -0,0 +1,104 @@
+package org.dromara.backstage.cardCenter.domain.vo;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.dromara.backstage.cardCenter.domain.PtSubsidy;
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import org.dromara.common.excel.annotation.ExcelDictFormat;
+import org.dromara.common.excel.convert.ExcelDictConvert;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+
+
+/**
+ * 补助设置视图对象 t_pt_subsidy
+ *
+ * @author Yz
+ * @date 2024-08-12
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = PtSubsidy.class)
+public class PtSubsidyVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+    @ExcelProperty(value = "ID")
+    private Long mainId;
+
+    /**
+     * 补助名称
+     */
+    @ExcelProperty(value = "补助名称")
+    private String subsidyName;
+
+    /**
+     * 补助类型
+     */
+    @ExcelProperty(value = "补助类型", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "SUBTYPE")
+    private String subsidyType;
+
+    /**
+     * 补助金额
+     */
+    @ExcelProperty(value = "补助金额")
+    private Long fillMoney;
+
+    /**
+     * 预计到账时间
+     */
+    @ExcelProperty(value = "预计到账时间")
+    private Date fillDate;
+
+    /**
+     * 入账钱包
+     */
+    @ExcelProperty(value = "入账钱包", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "CARDBAGTYPE")
+    private Long bagCode;
+
+    /**
+     * 到账状态
+     */
+    @ExcelProperty(value = "到账状态", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "sys_yes_no")
+    private String fillStatus;
+
+    /**
+     * 审核状态
+     */
+    @ExcelProperty(value = "审核状态", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "sys_yes_no")
+    private String auditStatus;
+
+    /**
+     * 审核人
+     */
+    @ExcelProperty(value = "审核人")
+    private Long auditUser;
+
+    /**
+     * 审核时间
+     */
+    @ExcelProperty(value = "审核时间")
+    private Date auditDate;
+
+    /**
+     * 备注
+     */
+    @ExcelProperty(value = "备注")
+    private String remark;
+
+
+}

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/cardCenter/domain/vo/PtSubsidyitemVo.java

@@ -0,0 +1,128 @@
+package org.dromara.backstage.cardCenter.domain.vo;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.dromara.backstage.cardCenter.domain.PtSubsidyitem;
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import org.dromara.common.excel.annotation.ExcelDictFormat;
+import org.dromara.common.excel.convert.ExcelDictConvert;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+
+
+/**
+ * 补助明细视图对象 t_pt_subsidyItem
+ *
+ * @author Yz
+ * @date 2024-08-14
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = PtSubsidyitem.class)
+public class PtSubsidyitemVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 明细Id,主键
+     */
+    @ExcelProperty(value = "明细Id,主键")
+    private Long itemId;
+
+    /**
+     * 补助设置Id
+     */
+    @ExcelProperty(value = "补助设置Id")
+    private Long mainId;
+
+    /**
+     * 补助人员Id
+     */
+    @ExcelProperty(value = "补助人员Id")
+    private Long userId;
+
+    /**
+     * 补助类型
+     */
+    @ExcelProperty(value = "补助类型")
+    private String subsidyType;
+
+    /**
+     * 补助金额
+     */
+    @ExcelProperty(value = "补助金额")
+    private Long fillMoney;
+
+    /**
+     * 预计到账时间
+     */
+    @ExcelProperty(value = "预计到账时间")
+    private Date fillDate;
+
+    /**
+     * 领取状态
+     */
+    @ExcelProperty(value = "领取状态")
+    private String fillStatus;
+
+    /**
+     * 领取时间
+     */
+    @ExcelProperty(value = "领取时间")
+    private Date getDate;
+
+    /**
+     * 领取补助之后钱包余额
+     */
+    @ExcelProperty(value = "领取补助之后钱包余额")
+    private Long beforeMoney;
+
+    /**
+     * 领取补助之后钱包余额
+     */
+    @ExcelProperty(value = "领取补助之后钱包余额")
+    private Long afterMoney;
+
+    /**
+     * 原始记录Id,一般是指写入的充值备份表主键
+     */
+    @ExcelProperty(value = "原始记录Id,一般是指写入的充值备份表主键")
+    private String originalId;
+
+    /**
+     * 用户编号/工号
+     */
+    @ExcelProperty(value = "用户编号/工号")
+    private String userNumb;
+
+    /**
+     * 用户姓名
+     */
+    @ExcelProperty(value = "用户姓名")
+    private String realName;
+
+    /**
+     * 部门名称
+     */
+    @ExcelProperty(value = "部门名称")
+    private String deptName;
+
+    /**
+     * 备注
+     */
+    @ExcelProperty(value = "备注")
+    private String remark;
+
+    @ExcelProperty(value = "创建人")
+    private Long createBy;
+
+    @ExcelProperty(value = "创建时间")
+    private Date createTime;
+}

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/cardCenter/mapper/PtSubsidyMapper.java

@@ -0,0 +1,15 @@
+package org.dromara.backstage.cardCenter.mapper;
+
+import org.dromara.backstage.cardCenter.domain.PtSubsidy;
+import org.dromara.backstage.cardCenter.domain.vo.PtSubsidyVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * 补助设置Mapper接口
+ *
+ * @author Yz
+ * @date 2024-08-12
+ */
+public interface PtSubsidyMapper extends BaseMapperPlus<PtSubsidy, PtSubsidyVo> {
+
+}

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/cardCenter/mapper/PtSubsidyitemMapper.java

@@ -0,0 +1,15 @@
+package org.dromara.backstage.cardCenter.mapper;
+
+import org.dromara.backstage.cardCenter.domain.PtSubsidyitem;
+import org.dromara.backstage.cardCenter.domain.vo.PtSubsidyitemVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * 补助明细Mapper接口
+ *
+ * @author Yz
+ * @date 2024-08-14
+ */
+public interface PtSubsidyitemMapper extends BaseMapperPlus<PtSubsidyitem, PtSubsidyitemVo> {
+
+}

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/cardCenter/service/IPtSubsidyService.java

@@ -0,0 +1,69 @@
+package org.dromara.backstage.cardCenter.service;
+
+import org.dromara.backstage.cardCenter.domain.PtSubsidy;
+import org.dromara.backstage.cardCenter.domain.vo.PtSubsidyVo;
+import org.dromara.backstage.cardCenter.domain.bo.PtSubsidyBo;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 补助设置Service接口
+ *
+ * @author Yz
+ * @date 2024-08-12
+ */
+public interface IPtSubsidyService {
+
+    /**
+     * 查询补助设置
+     *
+     * @param mainId 主键
+     * @return 补助设置
+     */
+    PtSubsidyVo queryById(Long mainId);
+
+    /**
+     * 分页查询补助设置列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 补助设置分页列表
+     */
+    TableDataInfo<PtSubsidyVo> queryPageList(PtSubsidyBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询符合条件的补助设置列表
+     *
+     * @param bo 查询条件
+     * @return 补助设置列表
+     */
+    List<PtSubsidyVo> queryList(PtSubsidyBo bo);
+
+    /**
+     * 新增补助设置
+     *
+     * @param bo 补助设置
+     * @return 是否新增成功
+     */
+    Boolean insertByBo(PtSubsidyBo bo);
+
+    /**
+     * 修改补助设置
+     *
+     * @param bo 补助设置
+     * @return 是否修改成功
+     */
+    Boolean updateByBo(PtSubsidyBo bo);
+
+    /**
+     * 校验并批量删除补助设置信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/cardCenter/service/IPtSubsidyitemService.java

@@ -0,0 +1,69 @@
+package org.dromara.backstage.cardCenter.service;
+
+import org.dromara.backstage.cardCenter.domain.PtSubsidyitem;
+import org.dromara.backstage.cardCenter.domain.vo.PtSubsidyitemVo;
+import org.dromara.backstage.cardCenter.domain.bo.PtSubsidyitemBo;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 补助明细Service接口
+ *
+ * @author Yz
+ * @date 2024-08-14
+ */
+public interface IPtSubsidyitemService {
+
+    /**
+     * 查询补助明细
+     *
+     * @param itemId 主键
+     * @return 补助明细
+     */
+    PtSubsidyitemVo queryById(Long itemId);
+
+    /**
+     * 分页查询补助明细列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 补助明细分页列表
+     */
+    TableDataInfo<PtSubsidyitemVo> queryPageList(PtSubsidyitemBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询符合条件的补助明细列表
+     *
+     * @param bo 查询条件
+     * @return 补助明细列表
+     */
+    List<PtSubsidyitemVo> queryList(PtSubsidyitemBo bo);
+
+    /**
+     * 新增补助明细
+     *
+     * @param bo 补助明细
+     * @return 是否新增成功
+     */
+    Boolean insertByBo(PtSubsidyitemBo bo);
+
+    /**
+     * 修改补助明细
+     *
+     * @param bo 补助明细
+     * @return 是否修改成功
+     */
+    Boolean updateByBo(PtSubsidyitemBo bo);
+
+    /**
+     * 校验并批量删除补助明细信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/cardCenter/service/impl/PtSubsidyServiceImpl.java

@@ -0,0 +1,153 @@
+package org.dromara.backstage.cardCenter.service.impl;
+
+import org.dromara.backstage.cardCenter.domain.PtSubsidyitem;
+import org.dromara.backstage.cardCenter.domain.bo.PtSubsidyitemBo;
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.dromara.backstage.cardCenter.domain.bo.PtSubsidyBo;
+import org.dromara.backstage.cardCenter.domain.vo.PtSubsidyVo;
+import org.dromara.backstage.cardCenter.domain.PtSubsidy;
+import org.dromara.backstage.cardCenter.mapper.PtSubsidyMapper;
+import org.dromara.backstage.cardCenter.service.IPtSubsidyService;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Collection;
+
+/**
+ * 补助设置Service业务层处理
+ *
+ * @author Yz
+ * @date 2024-08-12
+ */
+@RequiredArgsConstructor
+@Service
+public class PtSubsidyServiceImpl implements IPtSubsidyService {
+
+    private final PtSubsidyMapper baseMapper;
+    private final PtSubsidyitemServiceImpl subsidyitemService;
+    /**
+     * 查询补助设置
+     *
+     * @param mainId 主键
+     * @return 补助设置
+     */
+    @Override
+    public PtSubsidyVo queryById(Long mainId){
+        return baseMapper.selectVoById(mainId);
+    }
+
+    /**
+     * 分页查询补助设置列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 补助设置分页列表
+     */
+    @Override
+    public TableDataInfo<PtSubsidyVo> queryPageList(PtSubsidyBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<PtSubsidy> lqw = buildQueryWrapper(bo);
+        Page<PtSubsidyVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询符合条件的补助设置列表
+     *
+     * @param bo 查询条件
+     * @return 补助设置列表
+     */
+    @Override
+    public List<PtSubsidyVo> queryList(PtSubsidyBo bo) {
+        LambdaQueryWrapper<PtSubsidy> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<PtSubsidy> buildQueryWrapper(PtSubsidyBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<PtSubsidy> lqw = Wrappers.lambdaQuery();
+        lqw.like(StringUtils.isNotBlank(bo.getSubsidyName()), PtSubsidy::getSubsidyName, bo.getSubsidyName());
+        lqw.eq(StringUtils.isNotBlank(bo.getSubsidyType()), PtSubsidy::getSubsidyType, bo.getSubsidyType());
+        lqw.eq(bo.getFillDate() != null, PtSubsidy::getFillDate, bo.getFillDate());
+        lqw.eq(StringUtils.isNotBlank(bo.getFillStatus()), PtSubsidy::getFillStatus, bo.getFillStatus());
+        return lqw;
+    }
+
+    /**
+     * 新增补助设置
+     *
+     * @param bo 补助设置
+     * @return 是否新增成功
+     */
+    @Override
+    @Transactional
+    public Boolean insertByBo(PtSubsidyBo bo) {
+        PtSubsidy add = MapstructUtils.convert(bo, PtSubsidy.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            List<PtSubsidyitemBo> subsidyitemBoList = bo.getSubsidyitemBoList();
+            bo.setMainId(add.getMainId());
+            subsidyitemBoList.stream().forEach(subsidyitemBo ->{
+                subsidyitemBo.setMainId(add.getMainId());
+                subsidyitemService.insertByBo(subsidyitemBo);
+            });
+        }
+        return flag;
+    }
+
+    /**
+     * 修改补助设置
+     *
+     * @param bo 补助设置
+     * @return 是否修改成功
+     */
+    @Override
+    public Boolean updateByBo(PtSubsidyBo bo) {
+        PtSubsidy update = MapstructUtils.convert(bo, PtSubsidy.class);
+        validEntityBeforeSave(update);
+        boolean flag = baseMapper.updateById(update) > 0;
+        if(flag){
+            List<PtSubsidyitemBo> subsidyitemBoList = bo.getSubsidyitemBoList();
+            subsidyitemBoList.stream().forEach(subsidyitemBo ->{
+                if(subsidyitemBo.getMainId() == null){
+                    subsidyitemBo.setMainId(bo.getMainId());
+                    subsidyitemService.insertByBo(subsidyitemBo);
+                }else {
+                    subsidyitemService.updateByBo(subsidyitemBo);
+                }
+            });
+        }
+        return flag;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(PtSubsidy entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 校验并批量删除补助设置信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteByIds(ids) > 0;
+    }
+}

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/cardCenter/service/impl/PtSubsidyitemServiceImpl.java

@@ -0,0 +1,138 @@
+package org.dromara.backstage.cardCenter.service.impl;
+
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.dromara.backstage.cardCenter.domain.bo.PtSubsidyitemBo;
+import org.dromara.backstage.cardCenter.domain.vo.PtSubsidyitemVo;
+import org.dromara.backstage.cardCenter.domain.PtSubsidyitem;
+import org.dromara.backstage.cardCenter.mapper.PtSubsidyitemMapper;
+import org.dromara.backstage.cardCenter.service.IPtSubsidyitemService;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Collection;
+
+/**
+ * 补助明细Service业务层处理
+ *
+ * @author Yz
+ * @date 2024-08-14
+ */
+@RequiredArgsConstructor
+@Service
+public class PtSubsidyitemServiceImpl implements IPtSubsidyitemService {
+
+    private final PtSubsidyitemMapper baseMapper;
+
+
+    /**
+     * 查询补助明细
+     *
+     * @param itemId 主键
+     * @return 补助明细
+     */
+    @Override
+    public PtSubsidyitemVo queryById(Long itemId){
+        return baseMapper.selectVoById(itemId);
+    }
+
+    /**
+     * 分页查询补助明细列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 补助明细分页列表
+     */
+    @Override
+    public TableDataInfo<PtSubsidyitemVo> queryPageList(PtSubsidyitemBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<PtSubsidyitem> lqw = buildQueryWrapper(bo);
+        Page<PtSubsidyitemVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询符合条件的补助明细列表
+     *
+     * @param bo 查询条件
+     * @return 补助明细列表
+     */
+    @Override
+    public List<PtSubsidyitemVo> queryList(PtSubsidyitemBo bo) {
+        LambdaQueryWrapper<PtSubsidyitem> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<PtSubsidyitem> buildQueryWrapper(PtSubsidyitemBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<PtSubsidyitem> lqw = Wrappers.lambdaQuery();
+        lqw.eq(bo.getMainId() != null, PtSubsidyitem::getMainId, bo.getMainId());
+        lqw.eq(bo.getUserId() != null, PtSubsidyitem::getUserId, bo.getUserId());
+        lqw.eq(StringUtils.isNotBlank(bo.getSubsidyType()), PtSubsidyitem::getSubsidyType, bo.getSubsidyType());
+        lqw.eq(StringUtils.isNotBlank(bo.getFillStatus()), PtSubsidyitem::getFillStatus, bo.getFillStatus());
+        lqw.like(StringUtils.isNotBlank(bo.getRealName()), PtSubsidyitem::getRealName, bo.getRealName());
+        lqw.like(StringUtils.isNotBlank(bo.getDeptName()), PtSubsidyitem::getDeptName, bo.getDeptName());
+
+        lqw.between(null != params && params.size() > 0, PtSubsidyitem::getFillDate
+            , params.get("beginFillDate"), params.get("endFillDate"));
+        return lqw;
+    }
+
+    /**
+     * 新增补助明细
+     *
+     * @param bo 补助明细
+     * @return 是否新增成功
+     */
+    @Override
+    public Boolean insertByBo(PtSubsidyitemBo bo) {
+        PtSubsidyitem add = MapstructUtils.convert(bo, PtSubsidyitem.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setItemId(add.getItemId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改补助明细
+     *
+     * @param bo 补助明细
+     * @return 是否修改成功
+     */
+    @Override
+    public Boolean updateByBo(PtSubsidyitemBo bo) {
+        PtSubsidyitem update = MapstructUtils.convert(bo, PtSubsidyitem.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(PtSubsidyitem entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 校验并批量删除补助明细信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteByIds(ids) > 0;
+    }
+}

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/consumption/controller/XfLimitedController.java

@@ -0,0 +1,106 @@
+package org.dromara.backstage.consumption.controller;
+
+import java.util.List;
+
+import lombok.RequiredArgsConstructor;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.*;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.validation.annotation.Validated;
+import org.dromara.common.idempotent.annotation.RepeatSubmit;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.backstage.consumption.domain.vo.XfLimitedVo;
+import org.dromara.backstage.consumption.domain.bo.XfLimitedBo;
+import org.dromara.backstage.consumption.service.IXfLimitedService;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+
+/**
+ * 限次管理
+ * 前端访问路由地址为:/consumption/xfLimited
+ *
+ * @author bing
+ * @date 2024-08-15
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/consumption/xfLimited")
+public class XfLimitedController extends BaseController {
+
+    private final IXfLimitedService xfLimitedService;
+
+    /**
+     * 查询限次管理列表
+     */
+    @SaCheckPermission("consumption:xfLimited:list")
+    @GetMapping("/list")
+    public TableDataInfo<XfLimitedVo> list(XfLimitedBo bo, PageQuery pageQuery) {
+        return xfLimitedService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出限次管理列表
+     */
+    @SaCheckPermission("consumption:xfLimited:export")
+    @Log(title = "限次管理", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(XfLimitedBo bo, HttpServletResponse response) {
+        List<XfLimitedVo> list = xfLimitedService.queryList(bo);
+        ExcelUtil.exportExcel(list, "限次管理", XfLimitedVo.class, response);
+    }
+
+    /**
+     * 获取限次管理详细信息
+     *
+     * @param limitedId 主键
+     */
+    @SaCheckPermission("consumption:xfLimited:query")
+    @GetMapping("/{limitedId}")
+    public R<XfLimitedVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable Long limitedId) {
+        return R.ok(xfLimitedService.queryById(limitedId));
+    }
+
+    /**
+     * 新增限次管理
+     */
+    @SaCheckPermission("consumption:xfLimited:add")
+    @Log(title = "限次管理", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody XfLimitedBo bo) {
+        return toAjax(xfLimitedService.insertByBo(bo));
+    }
+
+    /**
+     * 修改限次管理
+     */
+    @SaCheckPermission("consumption:xfLimited:edit")
+    @Log(title = "限次管理", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody XfLimitedBo bo) {
+        return toAjax(xfLimitedService.updateByBo(bo));
+    }
+
+    /**
+     * 删除限次管理
+     *
+     * @param limitedIds 主键串
+     */
+    @SaCheckPermission("consumption:xfLimited:remove")
+    @Log(title = "限次管理", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{limitedIds}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] limitedIds) {
+        return toAjax(xfLimitedService.deleteWithValidByIds(List.of(limitedIds), true));
+    }
+}

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/consumption/controller/XfLimitedtermController.java

@@ -0,0 +1,117 @@
+package org.dromara.backstage.consumption.controller;
+
+import java.util.List;
+
+import lombok.RequiredArgsConstructor;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.*;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.validation.annotation.Validated;
+import org.dromara.common.idempotent.annotation.RepeatSubmit;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.backstage.consumption.domain.vo.XfLimitedtermVo;
+import org.dromara.backstage.consumption.domain.bo.XfLimitedtermBo;
+import org.dromara.backstage.consumption.service.IXfLimitedtermService;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+
+/**
+ * 限次设备绑定
+ * 前端访问路由地址为:/consumption/xfLimitedterm
+ *
+ * @author bing
+ * @date 2024-08-15
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/consumption/xfLimitedterm")
+public class XfLimitedtermController extends BaseController {
+
+    private final IXfLimitedtermService xfLimitedtermService;
+
+    /**
+     * 查询限次设备绑定列表
+     */
+    @SaCheckPermission("consumption:xfLimitedterm:list")
+    @GetMapping("/list")
+    public TableDataInfo<XfLimitedtermVo> list(XfLimitedtermBo bo, PageQuery pageQuery) {
+        return xfLimitedtermService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出限次设备绑定列表
+     */
+    @SaCheckPermission("consumption:xfLimitedterm:export")
+    @Log(title = "限次设备绑定", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(XfLimitedtermBo bo, HttpServletResponse response) {
+        List<XfLimitedtermVo> list = xfLimitedtermService.queryList(bo);
+        ExcelUtil.exportExcel(list, "限次设备绑定", XfLimitedtermVo.class, response);
+    }
+
+    /**
+     * 获取限次设备绑定详细信息
+     *
+     * @param limitedTermId 主键
+     */
+    @SaCheckPermission("consumption:xfLimitedterm:query")
+    @GetMapping("/{limitedTermId}")
+    public R<XfLimitedtermVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable Long limitedTermId) {
+        return R.ok(xfLimitedtermService.queryById(limitedTermId));
+    }
+
+    /**
+     * 新增限次设备绑定
+     */
+    @SaCheckPermission("consumption:xfLimitedterm:add")
+    @Log(title = "限次设备绑定", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody XfLimitedtermBo bo) {
+        return toAjax(xfLimitedtermService.insertByBo(bo));
+    }
+
+    /**
+     * 新增限次设备绑定
+     */
+    @SaCheckPermission("consumption:xfDiscountterm:add")
+    @Log(title = "批量添加限次设备", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping("/batchAdd")
+    public R<Void> batchAdd(@RequestBody List<Long> ids) {
+        return toAjax(xfLimitedtermService.insertByTermIds(ids));
+    }
+
+    /**
+     * 修改限次设备绑定
+     */
+    @SaCheckPermission("consumption:xfLimitedterm:edit")
+    @Log(title = "限次设备绑定", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody XfLimitedtermBo bo) {
+        return toAjax(xfLimitedtermService.updateByBo(bo));
+    }
+
+    /**
+     * 删除限次设备绑定
+     *
+     * @param limitedTermIds 主键串
+     */
+    @SaCheckPermission("consumption:xfLimitedterm:remove")
+    @Log(title = "限次设备绑定", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{limitedTermIds}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] limitedTermIds) {
+        return toAjax(xfLimitedtermService.deleteWithValidByIds(List.of(limitedTermIds), true));
+    }
+}

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/consumption/controller/XfQuotatermController.java

@@ -80,6 +80,17 @@ public class XfQuotatermController extends BaseController {
         return toAjax(xfQuotatermService.insertByBo(bo));
     }
 
+    /**
+     * 新增限额设备绑定
+     */
+    @SaCheckPermission("consumption:xfDiscountterm:add")
+    @Log(title = "批量添加限额设备", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping("/batchAdd")
+    public R<Void> batchAdd(@RequestBody List<Long> ids) {
+        return toAjax(xfQuotatermService.insertByTermIds(ids));
+    }
+
     /**
      * 修改限额设备绑定
      */

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/consumption/domain/XfLimited.java

@@ -0,0 +1,77 @@
+package org.dromara.backstage.consumption.domain;
+
+import org.dromara.common.tenant.core.TenantEntity;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serial;
+
+/**
+ * 限次管理对象 t_xf_limited
+ *
+ * @author bing
+ * @date 2024-08-15
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("t_xf_limited")
+public class XfLimited extends TenantEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 限次Id,主键
+     */
+    @TableId(value = "limited_id")
+    private Long limitedId;
+
+    /**
+     * 卡类Id
+     */
+    private Long cardType;
+
+    /**
+     * 每日次数
+     */
+    private Long dailyCount;
+
+    /**
+     * 早餐次数
+     */
+    private Long oneCount;
+
+    /**
+     * 午餐次数
+     */
+    private Long twoCount;
+
+    /**
+     * 晚餐次数
+     */
+    private Long threeCount;
+
+    /**
+     * 宵夜次数
+     */
+    private Long fourCount;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 删除标志(0-未删除 2-已删除)
+     */
+    @TableLogic
+    private String delFlag;
+
+    /**
+     * 启用状态，0-未启用 1-启用
+     */
+    private String status;
+
+
+}

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/consumption/domain/XfLimitedterm.java

@@ -0,0 +1,42 @@
+package org.dromara.backstage.consumption.domain;
+
+import org.dromara.common.tenant.core.TenantEntity;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serial;
+
+/**
+ * 限次设备绑定对象 t_xf_limitedTerm
+ *
+ * @author bing
+ * @date 2024-08-15
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("t_xf_limitedTerm")
+public class XfLimitedterm extends TenantEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 限次Id,主键
+     */
+    @TableId(value = "limited_term_id")
+    private Long limitedTermId;
+
+    /**
+     * 设备Id
+     */
+    private Long termId;
+
+    /**
+     * 删除标志(0-未删除 2-已删除)
+     */
+    @TableLogic
+    private String delFlag;
+
+
+}

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/consumption/domain/bo/XfLimitedBo.java

@@ -0,0 +1,71 @@
+package org.dromara.backstage.consumption.domain.bo;
+
+import org.dromara.backstage.consumption.domain.XfLimited;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import jakarta.validation.constraints.*;
+
+/**
+ * 限次管理业务对象 t_xf_limited
+ *
+ * @author bing
+ * @date 2024-08-15
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = XfLimited.class, reverseConvertGenerate = false)
+public class XfLimitedBo extends BaseEntity {
+
+    /**
+     * 限次Id,主键
+     */
+    @NotNull(message = "限次Id,主键不能为空", groups = { EditGroup.class })
+    private Long limitedId;
+
+    /**
+     * 卡类Id
+     */
+    @NotNull(message = "卡类Id不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long cardType;
+
+    /**
+     * 每日次数
+     */
+    private Long dailyCount;
+
+    /**
+     * 早餐次数
+     */
+    private Long oneCount;
+
+    /**
+     * 午餐次数
+     */
+    private Long twoCount;
+
+    /**
+     * 晚餐次数
+     */
+    private Long threeCount;
+
+    /**
+     * 宵夜次数
+     */
+    private Long fourCount;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 启用状态，0-未启用 1-启用
+     */
+    private String status;
+
+
+}

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/consumption/domain/bo/XfLimitedtermBo.java

@@ -0,0 +1,36 @@
+package org.dromara.backstage.consumption.domain.bo;
+
+import org.dromara.backstage.consumption.domain.XfLimitedterm;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import jakarta.validation.constraints.*;
+
+/**
+ * 限次设备绑定业务对象 t_xf_limitedTerm
+ *
+ * @author bing
+ * @date 2024-08-15
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = XfLimitedterm.class, reverseConvertGenerate = false)
+public class XfLimitedtermBo extends BaseEntity {
+
+    /**
+     * 限次Id,主键
+     */
+    @NotNull(message = "限次Id,主键不能为空", groups = { EditGroup.class })
+    private Long limitedTermId;
+
+    /**
+     * 设备Id
+     */
+    @NotNull(message = "设备Id不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long termId;
+
+
+}

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/consumption/domain/vo/XfLimitedVo.java

@@ -0,0 +1,92 @@
+package org.dromara.backstage.consumption.domain.vo;
+
+import org.dromara.backstage.consumption.domain.XfLimited;
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import org.dromara.common.excel.annotation.ExcelDictFormat;
+import org.dromara.common.excel.convert.ExcelDictConvert;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import org.dromara.common.translation.annotation.Translation;
+import org.dromara.common.translation.constant.TransConstant;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+
+
+/**
+ * 限次管理视图对象 t_xf_limited
+ *
+ * @author bing
+ * @date 2024-08-15
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = XfLimited.class)
+public class XfLimitedVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 限次Id,主键
+     */
+//    @ExcelProperty(value = "限次Id,主键")
+    private Long limitedId;
+
+    /**
+     * 卡类Id
+     */
+//    @ExcelProperty(value = "卡类Id")
+    private Long cardType;
+
+    @ExcelProperty(value = "卡类")
+    @Translation(type = TransConstant.CARD_TYPE_ID_TO_NAME, mapper = "cardType")
+    private String cardTypeName;
+
+    /**
+     * 每日次数
+     */
+    @ExcelProperty(value = "每日次数")
+    private Long dailyCount;
+
+    /**
+     * 早餐次数
+     */
+    @ExcelProperty(value = "早餐次数")
+    private Long oneCount;
+
+    /**
+     * 午餐次数
+     */
+    @ExcelProperty(value = "午餐次数")
+    private Long twoCount;
+
+    /**
+     * 晚餐次数
+     */
+    @ExcelProperty(value = "晚餐次数")
+    private Long threeCount;
+
+    /**
+     * 宵夜次数
+     */
+    @ExcelProperty(value = "宵夜次数")
+    private Long fourCount;
+
+    /**
+     * 备注
+     */
+    @ExcelProperty(value = "备注")
+    private String remark;
+
+    /**
+     * 启用状态，0-未启用 1-启用
+     */
+    @ExcelProperty(value = "启用状态，0-未启用 1-启用")
+    private String status;
+
+
+}

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/consumption/domain/vo/XfLimitedtermVo.java

@@ -0,0 +1,56 @@
+package org.dromara.backstage.consumption.domain.vo;
+
+import org.dromara.backstage.consumption.domain.XfLimitedterm;
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import org.dromara.common.excel.annotation.ExcelDictFormat;
+import org.dromara.common.excel.convert.ExcelDictConvert;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+
+
+/**
+ * 限次设备绑定视图对象 t_xf_limitedTerm
+ *
+ * @author bing
+ * @date 2024-08-15
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = XfLimitedterm.class)
+public class XfLimitedtermVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 限次Id,主键
+     */
+//    @ExcelProperty(value = "限次Id,主键")
+    private Long limitedTermId;
+
+    /**
+     * 设备Id
+     */
+//    @ExcelProperty(value = "设备Id")
+    private Long termId;
+
+    @ExcelProperty(value = "设备名称")
+    private String termName;
+
+    @ExcelProperty(value = "设备编号")
+    private Long termNo;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty(value = "创建时间")
+    private Date createTime;
+
+
+}

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/consumption/mapper/XfLimitedMapper.java

@@ -0,0 +1,15 @@
+package org.dromara.backstage.consumption.mapper;
+
+import org.dromara.backstage.consumption.domain.XfLimited;
+import org.dromara.backstage.consumption.domain.vo.XfLimitedVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * 限次管理Mapper接口
+ *
+ * @author bing
+ * @date 2024-08-15
+ */
+public interface XfLimitedMapper extends BaseMapperPlus<XfLimited, XfLimitedVo> {
+
+}

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/consumption/mapper/XfLimitedtermMapper.java

@@ -0,0 +1,15 @@
+package org.dromara.backstage.consumption.mapper;
+
+import org.dromara.backstage.consumption.domain.XfLimitedterm;
+import org.dromara.backstage.consumption.domain.vo.XfLimitedtermVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * 限次设备绑定Mapper接口
+ *
+ * @author bing
+ * @date 2024-08-15
+ */
+public interface XfLimitedtermMapper extends BaseMapperPlus<XfLimitedterm, XfLimitedtermVo> {
+
+}

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/consumption/service/IXfLimitedService.java

@@ -0,0 +1,69 @@
+package org.dromara.backstage.consumption.service;
+
+import org.dromara.backstage.consumption.domain.XfLimited;
+import org.dromara.backstage.consumption.domain.vo.XfLimitedVo;
+import org.dromara.backstage.consumption.domain.bo.XfLimitedBo;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 限次管理Service接口
+ *
+ * @author bing
+ * @date 2024-08-15
+ */
+public interface IXfLimitedService {
+
+    /**
+     * 查询限次管理
+     *
+     * @param limitedId 主键
+     * @return 限次管理
+     */
+    XfLimitedVo queryById(Long limitedId);
+
+    /**
+     * 分页查询限次管理列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 限次管理分页列表
+     */
+    TableDataInfo<XfLimitedVo> queryPageList(XfLimitedBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询符合条件的限次管理列表
+     *
+     * @param bo 查询条件
+     * @return 限次管理列表
+     */
+    List<XfLimitedVo> queryList(XfLimitedBo bo);
+
+    /**
+     * 新增限次管理
+     *
+     * @param bo 限次管理
+     * @return 是否新增成功
+     */
+    Boolean insertByBo(XfLimitedBo bo);
+
+    /**
+     * 修改限次管理
+     *
+     * @param bo 限次管理
+     * @return 是否修改成功
+     */
+    Boolean updateByBo(XfLimitedBo bo);
+
+    /**
+     * 校验并批量删除限次管理信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/consumption/service/IXfLimitedtermService.java

@@ -0,0 +1,76 @@
+package org.dromara.backstage.consumption.service;
+
+import org.dromara.backstage.consumption.domain.XfLimitedterm;
+import org.dromara.backstage.consumption.domain.vo.XfLimitedtermVo;
+import org.dromara.backstage.consumption.domain.bo.XfLimitedtermBo;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 限次设备绑定Service接口
+ *
+ * @author bing
+ * @date 2024-08-15
+ */
+public interface IXfLimitedtermService {
+
+    /**
+     * 根据设备id批量新增折扣设备
+     * @param ids
+     * @return
+     */
+    Boolean insertByTermIds(List<Long> ids);
+
+    /**
+     * 查询限次设备绑定
+     *
+     * @param limitedTermId 主键
+     * @return 限次设备绑定
+     */
+    XfLimitedtermVo queryById(Long limitedTermId);
+
+    /**
+     * 分页查询限次设备绑定列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 限次设备绑定分页列表
+     */
+    TableDataInfo<XfLimitedtermVo> queryPageList(XfLimitedtermBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询符合条件的限次设备绑定列表
+     *
+     * @param bo 查询条件
+     * @return 限次设备绑定列表
+     */
+    List<XfLimitedtermVo> queryList(XfLimitedtermBo bo);
+
+    /**
+     * 新增限次设备绑定
+     *
+     * @param bo 限次设备绑定
+     * @return 是否新增成功
+     */
+    Boolean insertByBo(XfLimitedtermBo bo);
+
+    /**
+     * 修改限次设备绑定
+     *
+     * @param bo 限次设备绑定
+     * @return 是否修改成功
+     */
+    Boolean updateByBo(XfLimitedtermBo bo);
+
+    /**
+     * 校验并批量删除限次设备绑定信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/consumption/service/impl/XfLimitedServiceImpl.java

@@ -0,0 +1,135 @@
+package org.dromara.backstage.consumption.service.impl;
+
+import org.dromara.common.core.exception.ServiceException;
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.dromara.backstage.consumption.domain.bo.XfLimitedBo;
+import org.dromara.backstage.consumption.domain.vo.XfLimitedVo;
+import org.dromara.backstage.consumption.domain.XfLimited;
+import org.dromara.backstage.consumption.mapper.XfLimitedMapper;
+import org.dromara.backstage.consumption.service.IXfLimitedService;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Collection;
+
+/**
+ * 限次管理Service业务层处理
+ *
+ * @author bing
+ * @date 2024-08-15
+ */
+@RequiredArgsConstructor
+@Service
+public class XfLimitedServiceImpl implements IXfLimitedService {
+
+    private final XfLimitedMapper baseMapper;
+
+    /**
+     * 查询限次管理
+     *
+     * @param limitedId 主键
+     * @return 限次管理
+     */
+    @Override
+    public XfLimitedVo queryById(Long limitedId){
+        return baseMapper.selectVoById(limitedId);
+    }
+
+    /**
+     * 分页查询限次管理列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 限次管理分页列表
+     */
+    @Override
+    public TableDataInfo<XfLimitedVo> queryPageList(XfLimitedBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<XfLimited> lqw = buildQueryWrapper(bo);
+        Page<XfLimitedVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询符合条件的限次管理列表
+     *
+     * @param bo 查询条件
+     * @return 限次管理列表
+     */
+    @Override
+    public List<XfLimitedVo> queryList(XfLimitedBo bo) {
+        LambdaQueryWrapper<XfLimited> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<XfLimited> buildQueryWrapper(XfLimitedBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<XfLimited> lqw = Wrappers.lambdaQuery();
+        lqw.eq(StringUtils.isNotBlank(bo.getStatus()), XfLimited::getStatus, bo.getStatus());
+        return lqw;
+    }
+
+    /**
+     * 新增限次管理
+     *
+     * @param bo 限次管理
+     * @return 是否新增成功
+     */
+    @Override
+    public Boolean insertByBo(XfLimitedBo bo) {
+        XfLimited add = MapstructUtils.convert(bo, XfLimited.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setLimitedId(add.getLimitedId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改限次管理
+     *
+     * @param bo 限次管理
+     * @return 是否修改成功
+     */
+    @Override
+    public Boolean updateByBo(XfLimitedBo bo) {
+        XfLimited update = MapstructUtils.convert(bo, XfLimited.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(XfLimited entity){
+        LambdaQueryWrapper<XfLimited> query = Wrappers.lambdaQuery();
+        query.eq(XfLimited::getCardType, entity.getCardType())
+            .ne(entity.getLimitedId()!=null, XfLimited::getLimitedId, entity.getLimitedId());
+        if (baseMapper.selectCount(query) > 0) {
+            throw new ServiceException("设备已添加，请勿重复添加");
+        }
+    }
+
+    /**
+     * 校验并批量删除限次管理信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //可以删除
+        }
+        return baseMapper.deleteByIds(ids) > 0;
+    }
+}

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/consumption/service/impl/XfLimitedtermServiceImpl.java

@@ -0,0 +1,163 @@
+package org.dromara.backstage.consumption.service.impl;
+
+import cn.hutool.core.collection.CollectionUtil;
+import org.dromara.backstage.consumption.domain.XfDiscountterm;
+import org.dromara.common.core.exception.ServiceException;
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.dromara.backstage.consumption.domain.bo.XfLimitedtermBo;
+import org.dromara.backstage.consumption.domain.vo.XfLimitedtermVo;
+import org.dromara.backstage.consumption.domain.XfLimitedterm;
+import org.dromara.backstage.consumption.mapper.XfLimitedtermMapper;
+import org.dromara.backstage.consumption.service.IXfLimitedtermService;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Collection;
+import java.util.stream.Collectors;
+
+/**
+ * 限次设备绑定Service业务层处理
+ *
+ * @author bing
+ * @date 2024-08-15
+ */
+@RequiredArgsConstructor
+@Service
+public class XfLimitedtermServiceImpl implements IXfLimitedtermService {
+
+    private final XfLimitedtermMapper baseMapper;
+
+    @Override
+    public Boolean insertByTermIds(List<Long> ids) {
+        if(CollectionUtil.isEmpty(ids)) return true;
+        LambdaQueryWrapper<XfLimitedterm> w = Wrappers.lambdaQuery();
+        w.in(XfLimitedterm::getTermId, ids);
+        List<XfLimitedterm> exists = baseMapper.selectList(w);
+        List<Long> existIds = exists.stream().map(XfLimitedterm::getTermId).toList();
+        if(CollectionUtil.isNotEmpty(existIds)){
+            List<Long> adds = ids.stream().filter(id -> !existIds.contains(id)).toList();
+            if(CollectionUtil.isNotEmpty(adds)){
+                return baseMapper.insertBatch(adds.stream().map(id -> {
+                    XfLimitedterm limitedterm = new XfLimitedterm();
+                    limitedterm.setTermId(id);
+                    return limitedterm;
+                }).collect(Collectors.toList()));
+            }
+            return true;
+        }
+        return baseMapper.insertBatch(ids.stream().map(id -> {
+            XfLimitedterm limitedterm = new XfLimitedterm();
+            limitedterm.setTermId(id);
+            return limitedterm;
+        }).collect(Collectors.toList()));
+    }
+
+    /**
+     * 查询限次设备绑定
+     *
+     * @param limitedTermId 主键
+     * @return 限次设备绑定
+     */
+    @Override
+    public XfLimitedtermVo queryById(Long limitedTermId){
+        return baseMapper.selectVoById(limitedTermId);
+    }
+
+    /**
+     * 分页查询限次设备绑定列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 限次设备绑定分页列表
+     */
+    @Override
+    public TableDataInfo<XfLimitedtermVo> queryPageList(XfLimitedtermBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<XfLimitedterm> lqw = buildQueryWrapper(bo);
+        Page<XfLimitedtermVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询符合条件的限次设备绑定列表
+     *
+     * @param bo 查询条件
+     * @return 限次设备绑定列表
+     */
+    @Override
+    public List<XfLimitedtermVo> queryList(XfLimitedtermBo bo) {
+        LambdaQueryWrapper<XfLimitedterm> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<XfLimitedterm> buildQueryWrapper(XfLimitedtermBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<XfLimitedterm> lqw = Wrappers.lambdaQuery();
+        lqw.eq(bo.getTermId() != null, XfLimitedterm::getTermId, bo.getTermId());
+        return lqw;
+    }
+
+    /**
+     * 新增限次设备绑定
+     *
+     * @param bo 限次设备绑定
+     * @return 是否新增成功
+     */
+    @Override
+    public Boolean insertByBo(XfLimitedtermBo bo) {
+        XfLimitedterm add = MapstructUtils.convert(bo, XfLimitedterm.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setLimitedTermId(add.getLimitedTermId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改限次设备绑定
+     *
+     * @param bo 限次设备绑定
+     * @return 是否修改成功
+     */
+    @Override
+    public Boolean updateByBo(XfLimitedtermBo bo) {
+        XfLimitedterm update = MapstructUtils.convert(bo, XfLimitedterm.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(XfLimitedterm entity){
+        LambdaQueryWrapper<XfLimitedterm> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.eq(XfLimitedterm::getTermId,entity.getTermId())
+            .ne(entity.getLimitedTermId()!=null,XfLimitedterm::getLimitedTermId, entity.getLimitedTermId());
+        if (baseMapper.selectCount(queryWrapper) > 0) {
+            throw new ServiceException("设备已绑定");
+        }
+    }
+
+    /**
+     * 校验并批量删除限次设备绑定信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //可以删除
+        }
+        return baseMapper.deleteByIds(ids) > 0;
+    }
+}

ruoyi-modules/ruoyi-backstage/src/main/resources/mapper/cardCenter/cardOperation/PtSubsidyMapper.xml

@@ -0,0 +1,27 @@
+<?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.dromara.backstage.cardCenter.mapper.PtSubsidyMapper">
+
+    <resultMap type="org.dromara.backstage.cardCenter.domain.PtSubsidy" id="PtSubsidyResult">
+            <result property="mainId"    column="main_id"    />
+            <result property="tenantId"    column="tenant_id"    />
+            <result property="subsidyName"    column="subsidy_name"    />
+            <result property="subsidyType"    column="subsidy_type"    />
+            <result property="fillMoney"    column="fill_money"    />
+            <result property="fillDate"    column="fill_date"    />
+            <result property="bagCode"    column="bag_code"    />
+            <result property="fillStatus"    column="fill_status"    />
+            <result property="auditStatus"    column="audit_status"    />
+            <result property="auditUser"    column="audit_user"    />
+            <result property="auditDate"    column="audit_date"    />
+            <result property="remark"    column="remark"    />
+            <result property="delFlag"    column="del_flag"    />
+            <result property="createDept"    column="create_dept"    />
+            <result property="createBy"    column="create_by"    />
+            <result property="createTime"    column="create_time"    />
+            <result property="updateBy"    column="update_by"    />
+            <result property="updateTime"    column="update_time"    />
+    </resultMap>
+</mapper>

ruoyi-modules/ruoyi-backstage/src/main/resources/mapper/cardCenter/cardOperation/PtSubsidyitemMapper.xml

@@ -0,0 +1,31 @@
+<?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.dromara.backstage.cardCenter.mapper.PtSubsidyitemMapper">
+
+    <resultMap type="org.dromara.backstage.cardCenter.domain.PtSubsidyitem" id="PtSubsidyitemResult">
+            <result property="itemId"    column="item_id"    />
+            <result property="tenantId"    column="tenant_id"    />
+            <result property="mainId"    column="main_id"    />
+            <result property="userId"    column="user_id"    />
+            <result property="subsidyType"    column="subsidy_type"    />
+            <result property="fillMoney"    column="fill_money"    />
+            <result property="fillDate"    column="fill_date"    />
+            <result property="fillStatus"    column="fill_status"    />
+            <result property="getDate"    column="get_date"    />
+            <result property="beforeMoney"    column="before_money"    />
+            <result property="afterMoney"    column="after_money"    />
+            <result property="originalId"    column="original_id"    />
+            <result property="userNumb"    column="user_numb"    />
+            <result property="realName"    column="real_name"    />
+            <result property="deptName"    column="dept_name"    />
+            <result property="remark"    column="remark"    />
+            <result property="delFlag"    column="del_flag"    />
+            <result property="createDept"    column="create_dept"    />
+            <result property="createBy"    column="create_by"    />
+            <result property="createTime"    column="create_time"    />
+            <result property="updateBy"    column="update_by"    />
+            <result property="updateTime"    column="update_time"    />
+    </resultMap>
+</mapper>

ruoyi-modules/ruoyi-backstage/src/main/resources/mapper/consumption/XfLimitedMapper.xml

@@ -0,0 +1,25 @@
+<?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.dromara.backstage.consumption.mapper.XfLimitedMapper">
+
+    <resultMap type="org.dromara.backstage.consumption.domain.XfLimited" id="XfLimitedResult">
+            <result property="limitedId"    column="limited_id"    />
+            <result property="tenantId"    column="tenant_id"    />
+            <result property="cardType"    column="card_type"    />
+            <result property="dailyCount"    column="daily_count"    />
+            <result property="oneCount"    column="one_count"    />
+            <result property="twoCount"    column="two_count"    />
+            <result property="threeCount"    column="three_count"    />
+            <result property="fourCount"    column="four_count"    />
+            <result property="remark"    column="remark"    />
+            <result property="delFlag"    column="del_flag"    />
+            <result property="createDept"    column="create_dept"    />
+            <result property="createBy"    column="create_by"    />
+            <result property="createTime"    column="create_time"    />
+            <result property="updateBy"    column="update_by"    />
+            <result property="updateTime"    column="update_time"    />
+            <result property="status"    column="status"    />
+    </resultMap>
+</mapper>

ruoyi-modules/ruoyi-backstage/src/main/resources/mapper/consumption/XfLimitedtermMapper.xml

@@ -0,0 +1,18 @@
+<?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.dromara.backstage.consumption.mapper.XfLimitedtermMapper">
+
+    <resultMap type="org.dromara.backstage.consumption.domain.XfLimitedterm" id="XfLimitedtermResult">
+            <result property="limitedTermId"    column="limited_term_id"    />
+            <result property="tenantId"    column="tenant_id"    />
+            <result property="termId"    column="term_id"    />
+            <result property="delFlag"    column="del_flag"    />
+            <result property="createDept"    column="create_dept"    />
+            <result property="createBy"    column="create_by"    />
+            <result property="createTime"    column="create_time"    />
+            <result property="updateBy"    column="update_by"    />
+            <result property="updateTime"    column="update_time"    />
+    </resultMap>
+</mapper>