Bladeren bron

feat(physical): 添加会员等级权益配置功能

- 创建会员等级权益配置实体类,包含等级名称、编码、状态、图标URL等字段
- 实现会员等级权益配置的增删改查接口和业务逻辑
- 添加控制器层实现列表查询、详情获取、新增、修改、删除和导出功能
- 集成MyBatis Plus实现数据持久化操作
- 添加晋升条件和保级条件的JSON解析功能
- 实现分页查询和条件筛选功能
- 添加数据验证和权限控制功能
fugui001 2 weken geleden
bovenliggende
commit
a20f810e39

+ 105 - 0
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/physical/controller/PhysicalMemberLevelConfigController.java

@@ -0,0 +1,105 @@
+package org.dromara.physical.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.dromara.physical.domain.bo.PhysicalMemberLevelConfigBo;
+import org.dromara.physical.domain.vo.PhysicalMemberLevelConfigVo;
+import org.dromara.physical.service.IPhysicalMemberLevelConfigService;
+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.common.mybatis.core.page.TableDataInfo;
+
+/**
+ * 会员等级权益配置
+ *
+ * @author Lion Li
+ * @date 2026-01-21
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/physical/memberLevelConfig")
+public class PhysicalMemberLevelConfigController extends BaseController {
+
+    private final IPhysicalMemberLevelConfigService physicalMemberLevelConfigService;
+
+    /**
+     * 查询会员等级权益配置列表
+     */
+    @SaCheckPermission("physical:memberLevelConfig:list")
+    @GetMapping("/list")
+    public TableDataInfo<PhysicalMemberLevelConfigVo> list(PhysicalMemberLevelConfigBo bo, PageQuery pageQuery) {
+        return physicalMemberLevelConfigService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出会员等级权益配置列表
+     */
+    @SaCheckPermission("physical:memberLevelConfig:export")
+    @Log(title = "会员等级权益配置", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(PhysicalMemberLevelConfigBo bo, HttpServletResponse response) {
+        List<PhysicalMemberLevelConfigVo> list = physicalMemberLevelConfigService.queryList(bo);
+        ExcelUtil.exportExcel(list, "会员等级权益配置", PhysicalMemberLevelConfigVo.class, response);
+    }
+
+    /**
+     * 获取会员等级权益配置详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission("physical:memberLevelConfig:query")
+    @GetMapping("/{id}")
+    public R<PhysicalMemberLevelConfigVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable Long id) {
+        return R.ok(physicalMemberLevelConfigService.queryById(id));
+    }
+
+    /**
+     * 新增会员等级权益配置
+     */
+    @SaCheckPermission("physical:memberLevelConfig:add")
+    @Log(title = "会员等级权益配置", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody PhysicalMemberLevelConfigBo bo) {
+        return toAjax(physicalMemberLevelConfigService.insertByBo(bo));
+    }
+
+    /**
+     * 修改会员等级权益配置
+     */
+    @SaCheckPermission("physical:memberLevelConfig:edit")
+    @Log(title = "会员等级权益配置", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody PhysicalMemberLevelConfigBo bo) {
+        return toAjax(physicalMemberLevelConfigService.updateByBo(bo));
+    }
+
+    /**
+     * 删除会员等级权益配置
+     *
+     * @param ids 主键串
+     */
+    @SaCheckPermission("physical:memberLevelConfig:remove")
+    @Log(title = "会员等级权益配置", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] ids) {
+        return toAjax(physicalMemberLevelConfigService.deleteWithValidByIds(List.of(ids), true));
+    }
+}

+ 98 - 0
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/physical/domain/PhysicalMemberLevelConfig.java

@@ -0,0 +1,98 @@
+package org.dromara.physical.domain;
+
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+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;
+
+/**
+ * 会员等级权益配置对象 physical_member_level_config
+ *
+ * @author Lion Li
+ * @date 2026-01-21
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("physical_member_level_config")
+public class PhysicalMemberLevelConfig extends BaseEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 等级名称,如:青铜会员(T0)
+     */
+    private String levelName;
+
+    /**
+     * 等级编码,如:T0, T1, ..., T5
+     */
+    private String levelCode;
+
+    /**
+     * 发布状态:draft=草稿, published=已发布, disabled=已禁用
+     */
+    private String status;
+
+    /**
+     * 会员等级图标URL
+     */
+    private String imageUrl;
+
+    /**
+     * 主赛赠送次数
+     */
+    private Long mainTournamentGiftCount;
+
+    /**
+     * 附赛赠送次数
+     */
+    private Long sideTournamentGiftCount;
+
+    /**
+     * 服务券赠送次数
+     */
+    private Long serviceVoucherGiftCount;
+
+    /**
+     * 是否允许被赠送给他人
+     */
+    private Boolean allowGift;
+
+    /**
+     * 晋升条件配置,支持多个条件组合
+     */
+    private String promotionConditions;
+
+    /**
+     * 保级条件配置,逻辑与晋升一致
+     */
+    private String retentionConditions;
+
+    /**
+     *
+     */
+    private Date createdAt;
+
+    /**
+     *
+     */
+    private Date updatedAt;
+
+    /**
+     *
+     */
+    private Date deletedAt;
+
+
+}

+ 100 - 0
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/physical/domain/bo/PhysicalMemberLevelConfigBo.java

@@ -0,0 +1,100 @@
+package org.dromara.physical.domain.bo;
+
+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 org.dromara.physical.domain.PhysicalMemberLevelConfig;
+
+import java.util.Date;
+
+/**
+ * 会员等级权益配置业务对象 physical_member_level_config
+ *
+ * @author Lion Li
+ * @date 2026-01-21
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = PhysicalMemberLevelConfig.class, reverseConvertGenerate = false)
+public class PhysicalMemberLevelConfigBo extends BaseEntity {
+
+    /**
+     * 主键ID
+     */
+    @NotNull(message = "主键ID不能为空", groups = { EditGroup.class })
+    private Long id;
+
+    /**
+     * 等级名称,如:青铜会员(T0)
+     */
+    @NotBlank(message = "等级名称,如:青铜会员(T0)不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String levelName;
+
+    /**
+     * 等级编码,如:T0, T1, ..., T5
+     */
+    @NotBlank(message = "等级编码,如:T0, T1, ..., T5不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String levelCode;
+
+    /**
+     * 发布状态:draft=草稿, published=已发布, disabled=已禁用
+     */
+    @NotBlank(message = "发布状态:draft=草稿, published=已发布, disabled=已禁用不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String status;
+
+    /**
+     * 会员等级图标URL
+     */
+    private String imageUrl;
+
+    /**
+     * 主赛赠送次数
+     */
+    private Long mainTournamentGiftCount;
+
+    /**
+     * 附赛赠送次数
+     */
+    private Long sideTournamentGiftCount;
+
+    /**
+     * 服务券赠送次数
+     */
+    private Long serviceVoucherGiftCount;
+
+    /**
+     * 是否允许被赠送给他人
+     */
+    private Boolean allowGift;
+
+    /**
+     * 晋升条件配置,支持多个条件组合
+     */
+    private String promotionConditions;
+
+    /**
+     * 保级条件配置,逻辑与晋升一致
+     */
+    private String retentionConditions;
+
+    /**
+     *
+     */
+    private Date createdAt;
+
+    /**
+     *
+     */
+    private Date updatedAt;
+
+    /**
+     *
+     */
+    private Date deletedAt;
+
+
+}

+ 124 - 0
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/physical/domain/vo/PhysicalMemberLevelConfigVo.java

@@ -0,0 +1,124 @@
+package org.dromara.physical.domain.vo;
+
+import java.util.Date;
+import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
+import cn.idev.excel.annotation.ExcelProperty;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import org.dromara.physical.domain.PhysicalMemberLevelConfig;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.List;
+
+
+/**
+ * 会员等级权益配置视图对象 physical_member_level_config
+ *
+ * @author Lion Li
+ * @date 2026-01-21
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = PhysicalMemberLevelConfig.class)
+public class PhysicalMemberLevelConfigVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @ExcelProperty(value = "主键ID")
+    private Long id;
+
+    /**
+     * 等级名称,如:青铜会员(T0)
+     */
+    @ExcelProperty(value = "等级名称,如:青铜会员(T0)")
+    private String levelName;
+
+    /**
+     * 等级编码,如:T0, T1, ..., T5
+     */
+    @ExcelProperty(value = "等级编码,如:T0, T1, ..., T5")
+    private String levelCode;
+
+    /**
+     * 发布状态:draft=草稿, published=已发布, disabled=已禁用
+     */
+    @ExcelProperty(value = "发布状态:draft=草稿, published=已发布, disabled=已禁用")
+    private String status;
+
+    /**
+     * 会员等级图标URL
+     */
+    @ExcelProperty(value = "会员等级图标URL")
+    private String imageUrl;
+
+    /**
+     * 主赛赠送次数
+     */
+    @ExcelProperty(value = "主赛赠送次数")
+    private Long mainTournamentGiftCount;
+
+    /**
+     * 附赛赠送次数
+     */
+    @ExcelProperty(value = "附赛赠送次数")
+    private Long sideTournamentGiftCount;
+
+    /**
+     * 服务券赠送次数
+     */
+    @ExcelProperty(value = "服务券赠送次数")
+    private Long serviceVoucherGiftCount;
+
+    /**
+     * 是否允许被赠送给他人
+     */
+    @ExcelProperty(value = "是否允许被赠送给他人")
+    private Boolean allowGift;
+
+    /**
+     * 晋升条件配置,支持多个条件组合
+     */
+    @ExcelProperty(value = "晋升条件配置,支持多个条件组合")
+    private String promotionConditions;
+
+    /**
+     * 保级条件配置,逻辑与晋升一致
+     */
+    @ExcelProperty(value = "保级条件配置,逻辑与晋升一致")
+    private String retentionConditions;
+
+
+    @ExcelProperty(value = "晋升条件配置,支持多个条件组合")
+    private List<PhysicalMemberTypeVo> promotionConditions2;
+
+    /**
+     * 保级条件配置,逻辑与晋升一致
+     */
+    @ExcelProperty(value = "保级条件配置,逻辑与晋升一致")
+    private List<PhysicalMemberTypeVo> retentionConditions2;
+
+    /**
+     *
+     */
+    @ExcelProperty(value = "")
+    private Date createdAt;
+
+    /**
+     *
+     */
+    @ExcelProperty(value = "")
+    private Date updatedAt;
+
+    /**
+     *
+     */
+    @ExcelProperty(value = "")
+    private Date deletedAt;
+
+
+}

+ 29 - 0
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/physical/domain/vo/PhysicalMemberTypeVo.java

@@ -0,0 +1,29 @@
+package org.dromara.physical.domain.vo;
+
+import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import org.dromara.physical.domain.PhysicalJudge;
+import java.io.Serial;
+import java.io.Serializable;
+
+
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = PhysicalJudge.class)
+public class PhysicalMemberTypeVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    private String type;
+
+    private Integer count;
+
+    private String timeScope;
+
+    private String description;
+
+
+
+}

+ 42 - 0
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/physical/mapper/PhysicalMemberLevelConfigMapper.java

@@ -0,0 +1,42 @@
+package org.dromara.physical.mapper;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.ibatis.annotations.Param;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+import org.dromara.physical.domain.PhysicalMemberLevelConfig;
+import org.dromara.physical.domain.vo.PhysicalMemberLevelConfigVo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 会员等级权益配置Mapper接口
+ *
+ * @author Lion Li
+ * @date 2026-01-21
+ */
+@DS("mysql2")
+public interface PhysicalMemberLevelConfigMapper extends BaseMapperPlus<PhysicalMemberLevelConfig, PhysicalMemberLevelConfigVo> {
+
+    @InterceptorIgnore(tenantLine = "true")
+    Page<PhysicalMemberLevelConfigVo> selectPhysicalMemberLevelConfigPage(@Param("page") Page<PhysicalMemberLevelConfig> page, @Param("ew") Wrapper<PhysicalMemberLevelConfig> wrapper);
+
+    @InterceptorIgnore(tenantLine = "true")
+    PhysicalMemberLevelConfigVo selectPhysicalMemberLevelConfigById(Long id);
+
+    @InterceptorIgnore(tenantLine = "true")
+    int updatePhysicalMemberLevelConfigById(PhysicalMemberLevelConfig update);
+
+    @InterceptorIgnore(tenantLine = "true")
+    int insertPhysicalMemberLevelConfig(PhysicalMemberLevelConfig insert);
+
+    @InterceptorIgnore(tenantLine = "true")
+    int deletePhysicalMemberLevelConfigById(@Param("ids") Collection<Long> ids);
+
+    @InterceptorIgnore(tenantLine = "true")
+    List<PhysicalMemberLevelConfigVo> selectPhysicalMemberLevelConfigList(@Param("ew") Wrapper<PhysicalMemberLevelConfig> wrapper);
+
+}

+ 77 - 0
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/physical/service/IPhysicalMemberLevelConfigService.java

@@ -0,0 +1,77 @@
+package org.dromara.physical.service;
+
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.physical.domain.bo.PhysicalMemberLevelConfigBo;
+import org.dromara.physical.domain.vo.PhysicalMemberLevelConfigVo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 会员等级权益配置Service接口
+ *
+ * @author Lion Li
+ * @date 2026-01-21
+ */
+public interface IPhysicalMemberLevelConfigService {
+
+    /**
+     * 查询会员等级权益配置
+     *
+     * @param id 主键
+     * @return 会员等级权益配置
+     */
+    PhysicalMemberLevelConfigVo queryById(Long id);
+
+    /**
+     * 分页查询会员等级权益配置列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 会员等级权益配置分页列表
+     */
+    TableDataInfo<PhysicalMemberLevelConfigVo> queryPageList(PhysicalMemberLevelConfigBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询符合条件的会员等级权益配置列表
+     *
+     * @param bo 查询条件
+     * @return 会员等级权益配置列表
+     */
+    List<PhysicalMemberLevelConfigVo> queryList(PhysicalMemberLevelConfigBo bo);
+
+    /**
+     * 新增会员等级权益配置
+     *
+     * @param bo 会员等级权益配置
+     * @return 是否新增成功
+     */
+    Boolean insertByBo(PhysicalMemberLevelConfigBo bo);
+
+    /**
+     * 修改会员等级权益配置
+     *
+     * @param bo 会员等级权益配置
+     * @return 是否修改成功
+     */
+    Boolean updateByBo(PhysicalMemberLevelConfigBo bo);
+
+    /**
+     * 校验并批量删除会员等级权益配置信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    /**
+     * 发布会员等级权益配置
+     *
+     * @param id
+     * @return
+     */
+    Boolean pubMemberLevelConfig(Long id);
+
+}

+ 222 - 0
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/physical/service/impl/PhysicalMemberLevelConfigServiceImpl.java

@@ -0,0 +1,222 @@
+package org.dromara.physical.service.impl;
+
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
+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 lombok.extern.slf4j.Slf4j;
+import org.dromara.physical.domain.PhysicalMemberLevelConfig;
+import org.dromara.physical.domain.bo.PhysicalMemberLevelConfigBo;
+import org.dromara.physical.domain.vo.PhysicalMemberLevelConfigVo;
+import org.dromara.physical.domain.vo.PhysicalMemberTypeVo;
+import org.dromara.physical.mapper.PhysicalMemberLevelConfigMapper;
+import org.dromara.physical.service.IPhysicalMemberLevelConfigService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Collection;
+
+/**
+ * 会员等级权益配置Service业务层处理
+ *
+ * @author Lion Li
+ * @date 2026-01-21
+ */
+@Slf4j
+@RequiredArgsConstructor
+@Service
+public class PhysicalMemberLevelConfigServiceImpl implements IPhysicalMemberLevelConfigService {
+
+    private final PhysicalMemberLevelConfigMapper baseMapper;
+
+    @Autowired
+    private ObjectMapper objectMapper; // 注入 ObjectMapper
+
+
+    /**
+     * 查询会员等级权益配置
+     *
+     * @param id 主键
+     * @return 会员等级权益配置
+     */
+    @Override
+    public PhysicalMemberLevelConfigVo queryById(Long id){
+        PhysicalMemberLevelConfigVo physicalMemberLevelConfigVo = baseMapper.selectPhysicalMemberLevelConfigById(id);
+        if(physicalMemberLevelConfigVo!=null){
+            // 转换晋升条件
+            if (StringUtils.isNotBlank(physicalMemberLevelConfigVo.getPromotionConditions())) {
+                try {
+                    physicalMemberLevelConfigVo.setPromotionConditions2(
+                        objectMapper.readValue(
+                            physicalMemberLevelConfigVo.getPromotionConditions(),
+                            new TypeReference<List<PhysicalMemberTypeVo>>() {}
+                        )
+                    );
+                } catch (Exception e) {
+                    log.error("解析晋升条件失败: {}", physicalMemberLevelConfigVo.getPromotionConditions(), e);
+                    physicalMemberLevelConfigVo.setPromotionConditions2(new ArrayList<>());
+                }
+            }
+            // 转换保级条件
+            if (StringUtils.isNotBlank(physicalMemberLevelConfigVo.getRetentionConditions())) {
+                try {
+                    physicalMemberLevelConfigVo.setRetentionConditions2(
+                        objectMapper.readValue(
+                            physicalMemberLevelConfigVo.getRetentionConditions(),
+                            new TypeReference<List<PhysicalMemberTypeVo>>() {}
+                        )
+                    );
+                } catch (Exception e) {
+                    log.error("解析保级条件失败: {}", physicalMemberLevelConfigVo.getRetentionConditions(), e);
+                    physicalMemberLevelConfigVo.setRetentionConditions2(new ArrayList<>());
+                }
+            }
+
+        }
+        return physicalMemberLevelConfigVo;
+    }
+
+    /**
+     * 分页查询会员等级权益配置列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 会员等级权益配置分页列表
+     */
+    @Override
+    public TableDataInfo<PhysicalMemberLevelConfigVo> queryPageList(PhysicalMemberLevelConfigBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<PhysicalMemberLevelConfig> lqw = buildQueryWrapper(bo);
+        Page<PhysicalMemberLevelConfigVo> result = baseMapper.selectPhysicalMemberLevelConfigPage(pageQuery.build(), lqw);
+        List<PhysicalMemberLevelConfigVo> physicalMemberLevelConfigVoList = result.getRecords();
+        for (PhysicalMemberLevelConfigVo physicalMemberLevelConfigVo : physicalMemberLevelConfigVoList) {
+            // 转换晋升条件
+            if (StringUtils.isNotBlank(physicalMemberLevelConfigVo.getPromotionConditions())) {
+                try {
+                    physicalMemberLevelConfigVo.setPromotionConditions2(
+                        objectMapper.readValue(
+                            physicalMemberLevelConfigVo.getPromotionConditions(),
+                            new TypeReference<List<PhysicalMemberTypeVo>>() {}
+                        )
+                    );
+                } catch (Exception e) {
+                    log.error("解析晋升条件失败: {}", physicalMemberLevelConfigVo.getPromotionConditions(), e);
+                    physicalMemberLevelConfigVo.setPromotionConditions2(new ArrayList<>());
+                }
+            }
+            // 转换保级条件
+            if (StringUtils.isNotBlank(physicalMemberLevelConfigVo.getRetentionConditions())) {
+                try {
+                    physicalMemberLevelConfigVo.setRetentionConditions2(
+                        objectMapper.readValue(
+                            physicalMemberLevelConfigVo.getRetentionConditions(),
+                            new TypeReference<List<PhysicalMemberTypeVo>>() {}
+                        )
+                    );
+                } catch (Exception e) {
+                    log.error("解析保级条件失败: {}", physicalMemberLevelConfigVo.getRetentionConditions(), e);
+                    physicalMemberLevelConfigVo.setRetentionConditions2(new ArrayList<>());
+                }
+            }
+
+        }
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询符合条件的会员等级权益配置列表
+     *
+     * @param bo 查询条件
+     * @return 会员等级权益配置列表
+     */
+    @Override
+    public List<PhysicalMemberLevelConfigVo> queryList(PhysicalMemberLevelConfigBo bo) {
+        LambdaQueryWrapper<PhysicalMemberLevelConfig> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectPhysicalMemberLevelConfigList(lqw);
+    }
+
+    private LambdaQueryWrapper<PhysicalMemberLevelConfig> buildQueryWrapper(PhysicalMemberLevelConfigBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<PhysicalMemberLevelConfig> lqw = Wrappers.lambdaQuery();
+        lqw.orderByAsc(PhysicalMemberLevelConfig::getId);
+        lqw.like(StringUtils.isNotBlank(bo.getLevelName()), PhysicalMemberLevelConfig::getLevelName, bo.getLevelName());
+        lqw.eq(StringUtils.isNotBlank(bo.getLevelCode()), PhysicalMemberLevelConfig::getLevelCode, bo.getLevelCode());
+        lqw.eq(StringUtils.isNotBlank(bo.getStatus()), PhysicalMemberLevelConfig::getStatus, bo.getStatus());
+        lqw.eq(StringUtils.isNotBlank(bo.getImageUrl()), PhysicalMemberLevelConfig::getImageUrl, bo.getImageUrl());
+        lqw.eq(bo.getMainTournamentGiftCount() != null, PhysicalMemberLevelConfig::getMainTournamentGiftCount, bo.getMainTournamentGiftCount());
+        lqw.eq(bo.getSideTournamentGiftCount() != null, PhysicalMemberLevelConfig::getSideTournamentGiftCount, bo.getSideTournamentGiftCount());
+        lqw.eq(bo.getServiceVoucherGiftCount() != null, PhysicalMemberLevelConfig::getServiceVoucherGiftCount, bo.getServiceVoucherGiftCount());
+        lqw.eq(bo.getAllowGift() != null, PhysicalMemberLevelConfig::getAllowGift, bo.getAllowGift());
+        lqw.eq(StringUtils.isNotBlank(bo.getPromotionConditions()), PhysicalMemberLevelConfig::getPromotionConditions, bo.getPromotionConditions());
+        lqw.eq(StringUtils.isNotBlank(bo.getRetentionConditions()), PhysicalMemberLevelConfig::getRetentionConditions, bo.getRetentionConditions());
+        lqw.eq(bo.getCreatedAt() != null, PhysicalMemberLevelConfig::getCreatedAt, bo.getCreatedAt());
+        lqw.eq(bo.getUpdatedAt() != null, PhysicalMemberLevelConfig::getUpdatedAt, bo.getUpdatedAt());
+        lqw.eq(bo.getDeletedAt() != null, PhysicalMemberLevelConfig::getDeletedAt, bo.getDeletedAt());
+        return lqw;
+    }
+
+    /**
+     * 新增会员等级权益配置
+     *
+     * @param bo 会员等级权益配置
+     * @return 是否新增成功
+     */
+    @Override
+    public Boolean insertByBo(PhysicalMemberLevelConfigBo bo) {
+        PhysicalMemberLevelConfig add = MapstructUtils.convert(bo, PhysicalMemberLevelConfig.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insertPhysicalMemberLevelConfig(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改会员等级权益配置
+     *
+     * @param bo 会员等级权益配置
+     * @return 是否修改成功
+     */
+    @Override
+    public Boolean updateByBo(PhysicalMemberLevelConfigBo bo) {
+        PhysicalMemberLevelConfig update = MapstructUtils.convert(bo, PhysicalMemberLevelConfig.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updatePhysicalMemberLevelConfigById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(PhysicalMemberLevelConfig entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 校验并批量删除会员等级权益配置信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deletePhysicalMemberLevelConfigById(ids) > 0;
+    }
+
+    @Override
+    public Boolean pubMemberLevelConfig(Long id) {
+        return null;
+    }
+}

+ 124 - 0
ruoyi-modules/ruoyi-system/src/main/resources/mapper/physical/PhysicalMemberLevelConfigMapper.xml

@@ -0,0 +1,124 @@
+<?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.physical.mapper.PhysicalMemberLevelConfigMapper">
+
+    <!-- 字段列表(用于 SELECT) -->
+    <sql id="columns">
+        id,
+        level_name,
+        level_code,
+        status,
+        image_url,
+        main_tournament_gift_count,
+        side_tournament_gift_count,
+        service_voucher_gift_count,
+        allow_gift,
+        promotion_conditions,
+        retention_conditions,
+        created_at,
+        updated_at,
+        deleted_at
+    </sql>
+
+    <!-- 基础 WHERE 条件(排除已逻辑删除的记录) -->
+    <sql id="where_not_deleted">
+        WHERE deleted_at IS NULL
+    </sql>
+
+    <!-- 1. 查询所有(未删除) -->
+    <select id="selectPhysicalMemberLevelConfigPage" resultType="org.dromara.physical.domain.vo.PhysicalMemberLevelConfigVo">
+        SELECT
+        <include refid="columns"/>
+        FROM physical_member_level_config
+        ${ew.customSqlSegment}
+    </select>
+
+    <!-- 2. 根据 ID 查询 -->
+    <select id="selectPhysicalMemberLevelConfigById" parameterType="long" resultType="org.dromara.physical.domain.vo.PhysicalMemberLevelConfigVo">
+        SELECT
+        <include refid="columns"/>
+        FROM physical_member_level_config
+        WHERE id = #{id}
+     </select>
+
+
+    <!-- 1. 查询所有(未删除) -->
+    <select id="selectPhysicalMemberLevelConfigList" resultType="org.dromara.physical.domain.vo.PhysicalMemberLevelConfigVo">
+        SELECT
+        <include refid="columns"/>
+        FROM physical_member_level_config
+        ${ew.customSqlSegment}
+    </select>
+
+    <!-- 5. 新增记录 -->
+    <insert id="insertPhysicalMemberLevelConfig"  useGeneratedKeys="true" keyProperty="id">
+        INSERT INTO physical_member_level_config (
+        <trim suffixOverrides=",">
+            <if test="levelName != null and levelName != ''">level_name,</if>
+            <if test="levelCode != null and levelCode != ''">level_code,</if>
+            <if test="status != null and status != ''">status,</if>
+            <if test="imageUrl != null">image_url,</if>
+            <if test="mainTournamentGiftCount != null">main_tournament_gift_count,</if>
+            <if test="sideTournamentGiftCount != null">side_tournament_gift_count,</if>
+            <if test="serviceVoucherGiftCount != null">service_voucher_gift_count,</if>
+            <if test="allowGift != null">allow_gift,</if>
+            <if test="promotionConditions != null">promotion_conditions,</if>
+            <if test="retentionConditions != null">retention_conditions,</if>
+            created_at,
+            updated_at
+        </trim>
+        ) VALUES (
+        <trim suffixOverrides=",">
+            <if test="levelName != null and levelName != ''">#{levelName},</if>
+            <if test="levelCode != null and levelCode != ''">#{levelCode},</if>
+            <if test="status != null and status != ''">#{status},</if>
+            <if test="imageUrl != null">#{imageUrl},</if>
+            <if test="mainTournamentGiftCount != null">#{mainTournamentGiftCount},</if>
+            <if test="sideTournamentGiftCount != null">#{sideTournamentGiftCount},</if>
+            <if test="serviceVoucherGiftCount != null">#{serviceVoucherGiftCount},</if>
+            <if test="allowGift != null">#{allowGift},</if>
+            <if test="promotionConditions != null">#{promotionConditions},</if>
+            <if test="retentionConditions != null">#{retentionConditions},</if>
+            NOW(),
+            NOW()
+        </trim>
+        )
+    </insert>
+
+    <!-- 6. 更新记录(仅更新非空字段) -->
+    <update id="updatePhysicalMemberLevelConfigById">
+        UPDATE physical_member_level_config
+        <set>
+            <if test="levelName != null and levelName != ''">level_name = #{levelName},</if>
+            <if test="levelCode != null and levelCode != ''">level_code = #{levelCode},</if>
+            <if test="status != null and status != ''">status = #{status},</if>
+            <if test="imageUrl != null">image_url = #{imageUrl},</if>
+            <if test="mainTournamentGiftCount != null">main_tournament_gift_count = #{mainTournamentGiftCount},</if>
+            <if test="sideTournamentGiftCount != null">side_tournament_gift_count = #{sideTournamentGiftCount},</if>
+            <if test="serviceVoucherGiftCount != null">service_voucher_gift_count = #{serviceVoucherGiftCount},</if>
+            <if test="allowGift != null">allow_gift = #{allowGift},</if>
+            <if test="promotionConditions != null">promotion_conditions = #{promotionConditions},</if>
+            <if test="retentionConditions != null">retention_conditions = #{retentionConditions},</if>
+            updated_at = NOW()
+        </set>
+        WHERE id = #{id}
+        AND deleted_at IS NULL
+    </update>
+
+    <!-- 删除记录 -->
+    <delete id="deletePhysicalMemberLevelConfigById">
+        DELETE FROM physical_member_level_config
+        <where>
+            id IN
+            <foreach item="id" collection="ids" open="(" separator="," close=")">
+                <if test="id > 0">
+                    #{id}
+                </if>
+            </foreach>
+        </where>
+    </delete>
+
+
+</mapper>