Răsfoiți Sursa

feat(business): 添加用户核销记录功能

- 新增用户核销记录相关实体类、Mapper、Service、Controller
- 实现用户核销记录的增删查改功能
- 添加玩家道具查询接口
- 优化用户积分和道具的扣减逻辑
fugui001 5 luni în urmă
părinte
comite
b47fcdad5a
16 a modificat fișierele cu 786 adăugiri și 3 ștergeri
  1. 120 0
      ruoyi-modules/ruoyi-system/src/main/java/org/dromara/business/controller/UserCheckRecordController.java
  2. 3 1
      ruoyi-modules/ruoyi-system/src/main/java/org/dromara/business/domain/RechargeProducts.java
  3. 62 0
      ruoyi-modules/ruoyi-system/src/main/java/org/dromara/business/domain/UserCheckRecord.java
  4. 5 0
      ruoyi-modules/ruoyi-system/src/main/java/org/dromara/business/domain/bo/ItemsUserBo.java
  5. 3 1
      ruoyi-modules/ruoyi-system/src/main/java/org/dromara/business/domain/bo/RechargeProductsBo.java
  6. 68 0
      ruoyi-modules/ruoyi-system/src/main/java/org/dromara/business/domain/bo/UserCheckRecordBo.java
  7. 7 0
      ruoyi-modules/ruoyi-system/src/main/java/org/dromara/business/domain/vo/PlayerItemsVo.java
  8. 2 1
      ruoyi-modules/ruoyi-system/src/main/java/org/dromara/business/domain/vo/RechargeProductsVo.java
  9. 90 0
      ruoyi-modules/ruoyi-system/src/main/java/org/dromara/business/domain/vo/UserCheckRecordVo.java
  10. 3 0
      ruoyi-modules/ruoyi-system/src/main/java/org/dromara/business/mapper/PlayerItemsMapper.java
  11. 42 0
      ruoyi-modules/ruoyi-system/src/main/java/org/dromara/business/mapper/UserCheckRecordMapper.java
  12. 78 0
      ruoyi-modules/ruoyi-system/src/main/java/org/dromara/business/service/IUserCheckRecordService.java
  13. 202 0
      ruoyi-modules/ruoyi-system/src/main/java/org/dromara/business/service/impl/UserCheckRecordServiceImpl.java
  14. 1 0
      ruoyi-modules/ruoyi-system/src/main/java/org/dromara/business/service/impl/UserServiceImpl.java
  15. 9 0
      ruoyi-modules/ruoyi-system/src/main/resources/mapper/business/PlayerItemsMapper.xml
  16. 91 0
      ruoyi-modules/ruoyi-system/src/main/resources/mapper/business/UserCheckRecordMapper.xml

+ 120 - 0
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/business/controller/UserCheckRecordController.java

@@ -0,0 +1,120 @@
+package org.dromara.business.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.business.domain.bo.UserCheckRecordBo;
+import org.dromara.business.domain.vo.PlayerItemsVo;
+import org.dromara.business.domain.vo.UserCheckRecordVo;
+import org.dromara.business.service.IUserCheckRecordService;
+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 2025-08-15
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/business/checkRecord")
+public class UserCheckRecordController extends BaseController {
+
+    private final IUserCheckRecordService userCheckRecordService;
+
+    /**
+     * 查询用户核销记录列表
+     */
+    @SaCheckPermission("business:checkRecord:list")
+    @GetMapping("/list")
+    public TableDataInfo<UserCheckRecordVo> list(UserCheckRecordBo bo, PageQuery pageQuery) {
+        return userCheckRecordService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出用户核销记录列表
+     */
+    @SaCheckPermission("business:checkRecord:export")
+    @Log(title = "用户核销记录", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(UserCheckRecordBo bo, HttpServletResponse response) {
+        List<UserCheckRecordVo> list = userCheckRecordService.queryList(bo);
+        ExcelUtil.exportExcel(list, "用户核销记录", UserCheckRecordVo.class, response);
+    }
+
+    /**
+     * 获取用户核销记录详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission("business:checkRecord:query")
+    @GetMapping("/{id}")
+    public R<UserCheckRecordVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable Long id) {
+        return R.ok(userCheckRecordService.queryById(id));
+    }
+
+    /**
+     * 新增用户核销记录
+     */
+    @SaCheckPermission("business:checkRecord:add")
+    @Log(title = "用户核销记录", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody UserCheckRecordBo bo) {
+        return toAjax(userCheckRecordService.insertByBo(bo));
+    }
+
+    /**
+     * 修改用户核销记录
+     */
+    @SaCheckPermission("business:checkRecord:edit")
+    @Log(title = "用户核销记录", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody UserCheckRecordBo bo) {
+        return toAjax(userCheckRecordService.updateByBo(bo));
+    }
+
+    /**
+     * 删除用户核销记录
+     *
+     * @param ids 主键串
+     */
+    @SaCheckPermission("business:checkRecord:remove")
+    @Log(title = "用户核销记录", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] ids) {
+        return toAjax(userCheckRecordService.deleteWithValidByIds(List.of(ids), true));
+    }
+
+
+    @SaCheckPermission("business:checkRecord:selectPlayerItemsListByUser")
+    @Log(title = "检查", businessType = BusinessType.OTHER)
+    @GetMapping("/selectPlayerItemsListByUser")
+    public R<List<PlayerItemsVo>> selectPlayerItemsListByUser(@RequestParam String searchUserKeyword) {
+        if(searchUserKeyword.isBlank()){
+            return R.fail();
+        }
+
+        return R.ok(userCheckRecordService.selectPlayerItemsListByUser(searchUserKeyword));
+    }
+
+
+}

+ 3 - 1
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/business/domain/RechargeProducts.java

@@ -2,6 +2,8 @@ package org.dromara.business.domain;
 
 import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
+
+import java.math.BigDecimal;
 import java.util.Date;
 import java.io.Serial;
 
@@ -32,7 +34,7 @@ public class RechargeProducts {
     /**
      * 价格
      */
-    private Long productPrice;
+    private BigDecimal productPrice;
 
     /**
      * 说明

+ 62 - 0
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/business/domain/UserCheckRecord.java

@@ -0,0 +1,62 @@
+package org.dromara.business.domain;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import java.io.Serial;
+
+/**
+ * 用户核销记录对象 user_check_record
+ *
+ * @author Lion Li
+ * @date 2025-08-15
+ */
+@Data
+@TableName("user_check_record")
+public class UserCheckRecord{
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     *
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 被核销用户ID
+     */
+    private Long userId;
+
+    /**
+     * 核销数量
+     */
+    private Long num;
+
+    /**
+     * 核销道具
+     */
+    private Long itemId;
+
+    /**
+     * 创建时间
+     */
+    private String createdAt;
+
+    /**
+     * 更新时间
+     */
+    private String updatedAt;
+
+    /**
+     * 创建人
+     */
+    private Long createUserId;
+
+    /**
+     * 创建人名称
+     */
+    private String createUserName;
+
+
+}

+ 5 - 0
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/business/domain/bo/ItemsUserBo.java

@@ -35,4 +35,9 @@ public class ItemsUserBo extends BaseEntity {
      */
     private Long userId;
 
+    /**
+     * 1 新增  2 扣除 3 其他
+     */
+    private String type = "1"; // ✅ 默认值
+
 }

+ 3 - 1
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/business/domain/bo/RechargeProductsBo.java

@@ -8,6 +8,8 @@ import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import jakarta.validation.constraints.*;
+
+import java.math.BigDecimal;
 import java.util.Date;
 
 /**
@@ -37,7 +39,7 @@ public class RechargeProductsBo extends BaseEntity {
      * 价格
      */
     @NotNull(message = "价格不能为空", groups = { AddGroup.class, EditGroup.class })
-    private Long productPrice;
+    private BigDecimal productPrice;
 
     /**
      * 说明

+ 68 - 0
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/business/domain/bo/UserCheckRecordBo.java

@@ -0,0 +1,68 @@
+package org.dromara.business.domain.bo;
+
+import org.dromara.business.domain.UserCheckRecord;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.common.core.validate.EditGroup;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import jakarta.validation.constraints.*;
+/**
+ * 用户核销记录业务对象 user_check_record
+ *
+ * @author Lion Li
+ * @date 2025-08-15
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = UserCheckRecord.class, reverseConvertGenerate = false)
+public class UserCheckRecordBo extends BaseEntity {
+
+    /**
+     *
+     */
+    @NotNull(message = "不能为空", groups = { EditGroup.class })
+    private Long id;
+
+    /**
+     * 被核销用户ID
+     */
+    private Long userId;
+
+    /**
+     * 核销数量
+     */
+    private Long num;
+
+    /**
+     * 核销道具
+     */
+    private Long itemId;
+
+    /**
+     * 创建时间
+     */
+    private String createdAt;
+
+    /**
+     * 更新时间
+     */
+    private String updatedAt;
+
+    /**
+     * 创建人
+     */
+    private Long createUserId;
+
+    /**
+     * 创建人名称
+     */
+    private String createUserName;
+
+    /**
+     * 手机号和用户名
+     */
+    private String userIds;
+
+
+}

+ 7 - 0
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/business/domain/vo/PlayerItemsVo.java

@@ -49,5 +49,12 @@ public class PlayerItemsVo implements Serializable {
     @ExcelProperty(value = "道具数量")
     private Long quantity;
 
+    private String itemName;
+
+    private String phone;
+
+    private String nickName;
+
+    private Long userId;
 
 }

+ 2 - 1
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/business/domain/vo/RechargeProductsVo.java

@@ -1,5 +1,6 @@
 package org.dromara.business.domain.vo;
 
+import java.math.BigDecimal;
 import java.util.Date;
 import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
 import cn.idev.excel.annotation.ExcelProperty;
@@ -43,7 +44,7 @@ public class RechargeProductsVo implements Serializable {
      * 价格
      */
     @ExcelProperty(value = "价格")
-    private Long productPrice;
+    private BigDecimal productPrice;
 
     /**
      * 说明

+ 90 - 0
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/business/domain/vo/UserCheckRecordVo.java

@@ -0,0 +1,90 @@
+package org.dromara.business.domain.vo;
+
+import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
+import cn.idev.excel.annotation.ExcelProperty;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import org.dromara.business.domain.UserCheckRecord;
+import java.io.Serial;
+import java.io.Serializable;
+
+
+
+/**
+ * 用户核销记录视图对象 user_check_record
+ *
+ * @author Lion Li
+ * @date 2025-08-15
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = UserCheckRecord.class)
+public class UserCheckRecordVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     *
+     */
+    @ExcelProperty(value = "")
+    private Long id;
+
+    /**
+     * 被核销用户ID
+     */
+    @ExcelProperty(value = "被核销用户ID")
+    private Long userId;
+
+    /**
+     * 核销数量
+     */
+    @ExcelProperty(value = "核销数量")
+    private Long num;
+
+    /**
+     * 核销道具
+     */
+    @ExcelProperty(value = "核销道具")
+    private Long itemId;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty(value = "创建时间")
+    private String createdAt;
+
+    /**
+     * 更新时间
+     */
+    @ExcelProperty(value = "更新时间")
+    private String updatedAt;
+
+    /**
+     * 创建人
+     */
+    @ExcelProperty(value = "创建人")
+    private Long createUserId;
+
+    /**
+     * 创建人名称
+     */
+    @ExcelProperty(value = "创建人名称")
+    private String createUserName;
+
+    /**
+     * 昵称
+     */
+    private String nickName;
+
+    /**
+     * 手机号
+     */
+    private String phone;
+
+    /**
+     * 道具名称
+     */
+    private String itemsName;
+
+}

+ 3 - 0
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/business/mapper/PlayerItemsMapper.java

@@ -38,5 +38,8 @@ public interface PlayerItemsMapper extends BaseMapperPlus<PlayerItems, PlayerIte
     @InterceptorIgnore(tenantLine = "true")
     Long selectPlayerJiFenCount(@Param("playerId") Long playerId);
 
+    @InterceptorIgnore(tenantLine = "true")
+    List<PlayerItemsVo> selectPlayerItemsListByUser(@Param("userIds") String userIds);
+
 
 }

+ 42 - 0
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/business/mapper/UserCheckRecordMapper.java

@@ -0,0 +1,42 @@
+package org.dromara.business.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.business.domain.UserCheckRecord;
+import org.dromara.business.domain.vo.UserCheckRecordVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 用户核销记录Mapper接口
+ *
+ * @author Lion Li
+ * @date 2025-08-15
+ */
+@DS("mysql2")
+public interface UserCheckRecordMapper extends BaseMapperPlus<UserCheckRecord, UserCheckRecordVo> {
+
+    @InterceptorIgnore(tenantLine = "true")
+    Page<UserCheckRecordVo> selectCheckRecordList(@Param("page") Page<UserCheckRecord> page, @Param("ew") Wrapper<UserCheckRecord> wrapper);
+
+    @InterceptorIgnore(tenantLine = "true")
+    UserCheckRecordVo selectCheckRecordById(Long id);
+
+    @InterceptorIgnore(tenantLine = "true")
+    int updateCheckRecordById(UserCheckRecord update);
+
+    @InterceptorIgnore(tenantLine = "true")
+    int insertCheckRecord(UserCheckRecord insert);
+
+    @InterceptorIgnore(tenantLine = "true")
+    int deleteCheckRecordById(@Param("ids") Collection<Long> ids);
+
+    @InterceptorIgnore(tenantLine = "true")
+    List<UserCheckRecordVo> selectCheckRecordAllList(@Param("ew") Wrapper<UserCheckRecord> wrapper);
+
+}

+ 78 - 0
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/business/service/IUserCheckRecordService.java

@@ -0,0 +1,78 @@
+package org.dromara.business.service;
+
+import org.apache.ibatis.annotations.Param;
+import org.dromara.business.domain.bo.UserCheckRecordBo;
+import org.dromara.business.domain.vo.PlayerItemsVo;
+import org.dromara.business.domain.vo.UserCheckRecordVo;
+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 Lion Li
+ * @date 2025-08-15
+ */
+public interface IUserCheckRecordService {
+
+    /**
+     * 查询用户核销记录
+     *
+     * @param id 主键
+     * @return 用户核销记录
+     */
+    UserCheckRecordVo queryById(Long id);
+
+    /**
+     * 分页查询用户核销记录列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 用户核销记录分页列表
+     */
+    TableDataInfo<UserCheckRecordVo> queryPageList(UserCheckRecordBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询符合条件的用户核销记录列表
+     *
+     * @param bo 查询条件
+     * @return 用户核销记录列表
+     */
+    List<UserCheckRecordVo> queryList(UserCheckRecordBo bo);
+
+    /**
+     * 新增用户核销记录
+     *
+     * @param bo 用户核销记录
+     * @return 是否新增成功
+     */
+    Boolean insertByBo(UserCheckRecordBo bo);
+
+    /**
+     * 修改用户核销记录
+     *
+     * @param bo 用户核销记录
+     * @return 是否修改成功
+     */
+    Boolean updateByBo(UserCheckRecordBo bo);
+
+    /**
+     * 校验并批量删除用户核销记录信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+     /**
+     * 查询玩家道具列表
+     *
+     * @param userIds
+     * @return
+     */
+    List<PlayerItemsVo> selectPlayerItemsListByUser(String userIds);
+}

+ 202 - 0
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/business/service/impl/UserCheckRecordServiceImpl.java

@@ -0,0 +1,202 @@
+package org.dromara.business.service.impl;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import org.dromara.business.domain.UserCheckRecord;
+import org.dromara.business.domain.bo.UserCheckRecordBo;
+import org.dromara.business.domain.vo.PlayerItemsVo;
+import org.dromara.business.domain.vo.UserCheckRecordVo;
+import org.dromara.business.mapper.PlayerItemsMapper;
+import org.dromara.business.mapper.UserCheckRecordMapper;
+import org.dromara.business.service.IUserCheckRecordService;
+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 lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+
+import java.util.List;
+import java.util.Map;
+import java.util.Collection;
+
+/**
+ * 用户核销记录Service业务层处理
+ *
+ * @author Lion Li
+ * @date 2025-08-15
+ */
+@Slf4j
+@RequiredArgsConstructor
+@Service
+public class UserCheckRecordServiceImpl implements IUserCheckRecordService {
+
+    private final UserCheckRecordMapper baseMapper;
+
+    private final PlayerItemsMapper playerItemsMapper;
+
+    /**
+     * 查询用户核销记录
+     *
+     * @param id 主键
+     * @return 用户核销记录
+     */
+    @Override
+    public UserCheckRecordVo queryById(Long id){
+        return baseMapper.selectCheckRecordById(id);
+    }
+
+    /**
+     * 分页查询用户核销记录列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 用户核销记录分页列表
+     */
+    @Override
+    public TableDataInfo<UserCheckRecordVo> queryPageList(UserCheckRecordBo bo, PageQuery pageQuery) {
+        Wrapper<UserCheckRecord> lqw = buildQueryWrapper(bo);
+        Page<UserCheckRecordVo> result = baseMapper.selectCheckRecordList(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询符合条件的用户核销记录列表
+     *
+     * @param bo 查询条件
+     * @return 用户核销记录列表
+     */
+    @Override
+    public List<UserCheckRecordVo> queryList(UserCheckRecordBo bo) {
+        Wrapper<UserCheckRecord> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectCheckRecordAllList(lqw);
+    }
+
+    private Wrapper<UserCheckRecord> buildQueryWrapper(UserCheckRecordBo bo) {
+        Map<String, Object> params = bo.getParams();
+        QueryWrapper<UserCheckRecord> wrapper = new QueryWrapper<>();
+
+        // 排序:id ASC
+        wrapper.orderByAsc("a.id");
+
+
+        if (StringUtils.isNotBlank(bo.getUserIds())) {
+            wrapper.and(wrapper1 ->
+                wrapper1.like("b.phone", bo.getUserIds())
+                    .or()
+                    .like("b.nick_name", bo.getUserIds())
+            );
+        }
+
+        // a.user_id
+        if (bo.getUserId() != null) {
+            wrapper.eq("a.user_id", bo.getUserId());
+        }
+
+        // a.num
+        if (bo.getNum() != null) {
+            wrapper.eq("a.num", bo.getNum());
+        }
+
+        // a.item_id
+        if (bo.getItemId() != null) {
+            wrapper.eq("a.item_id", bo.getItemId());
+        }
+
+        // a.created_at
+        if (bo.getCreatedAt() != null) {
+            wrapper.eq("a.created_at", bo.getCreatedAt());
+        }
+
+        // a.updated_at
+        if (bo.getUpdatedAt() != null) {
+            wrapper.eq("a.updated_at", bo.getUpdatedAt());
+        }
+
+        // a.create_user_id
+        if (bo.getCreateUserId() != null) {
+            wrapper.eq("a.create_user_id", bo.getCreateUserId());
+        }
+
+        // a.create_user_name (模糊匹配)
+        if (StringUtils.isNotBlank(bo.getCreateUserName())) {
+            wrapper.like("a.create_user_name", bo.getCreateUserName());
+        }
+
+        return wrapper;
+    }
+
+    /**
+     * 新增用户核销记录
+     *
+     * @param bo 用户核销记录
+     * @return 是否新增成功
+     */
+    @Override
+    public Boolean insertByBo(UserCheckRecordBo bo) {
+        //核销的时候判断数量是否足够,不够的话,提示用户
+        Long userId = bo.getUserId();
+        Long num = bo.getNum();
+
+        PlayerItemsVo playerItemsVo = playerItemsMapper.selectPlayerItemsInfo(userId, 1001L);
+        if(playerItemsVo.getQuantity()<0 || playerItemsVo.getQuantity()<num){
+            throw new RuntimeException("数量不足!!!");
+        }
+
+        //todo 需要继续做扣减相关操作
+        UserCheckRecord add = MapstructUtils.convert(bo, UserCheckRecord.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insertCheckRecord(add) > 0;
+        if (flag) {
+            //核销完成之后 记录道具流水日志  扣减用户道具表数量
+
+
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改用户核销记录
+     *
+     * @param bo 用户核销记录
+     * @return 是否修改成功
+     */
+    @Override
+    public Boolean updateByBo(UserCheckRecordBo bo) {
+        UserCheckRecord update = MapstructUtils.convert(bo, UserCheckRecord.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateCheckRecordById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(UserCheckRecord entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 校验并批量删除用户核销记录信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteCheckRecordById(ids) > 0;
+    }
+
+    @Override
+    public List<PlayerItemsVo> selectPlayerItemsListByUser(String userIds) {
+
+        return playerItemsMapper.selectPlayerItemsListByUser(userIds);
+    }
+
+}

+ 1 - 0
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/business/service/impl/UserServiceImpl.java

@@ -297,6 +297,7 @@ public class UserServiceImpl implements IUserService {
                 logRewardDistribution(bo);
 
                 // 4. 发放道具
+                //根据类型 判断发放 还是 扣减  type 1 新增  2 扣除 3 其他
                 List<PlayerItems> playerItemsList = buildPlayerItems(bo);
                 int updateCount = playerItemsMapper.batchInsertOrUpdatePlayerItems(playerItemsList);
                 if (updateCount <= 0) {

+ 9 - 0
ruoyi-modules/ruoyi-system/src/main/resources/mapper/business/PlayerItemsMapper.xml

@@ -64,5 +64,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         WHERE  player_id=#{playerId} and item_id in (1,2)
     </select>
 
+
+    <select id="selectPlayerItemsListByUser" resultType="org.dromara.business.domain.vo.PlayerItemsVo">
+        SELECT  a.*,c.name as itemName, b.phone,b.nick_name, b.id as userId FROM player_items a left join  user  b  on a.player_id=b.id
+        left join items c on a.item_id=c.id
+        WHERE  1=1    and  (b.phone = #{userIds} or b.nick_name = #{userIds})
+   </select>
+
+
+
 </mapper>
 

+ 91 - 0
ruoyi-modules/ruoyi-system/src/main/resources/mapper/business/UserCheckRecordMapper.xml

@@ -0,0 +1,91 @@
+<?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.business.mapper.UserCheckRecordMapper">
+
+    <!-- 查询条件片段(可复用) -->
+    <sql id="Base_Select_Columns">
+        id, user_id, num, item_id, created_at, updated_at, create_user_id, create_user_name
+    </sql>
+
+    <!-- 插入 -->
+    <insert id="insertCheckRecord"   useGeneratedKeys="true" keyProperty="id">
+        INSERT INTO user_check_record
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="userId != null">user_id,</if>
+            <if test="num != null">num,</if>
+            <if test="itemId != null">item_id,</if>
+            <if test="createUserId != null">create_user_id,</if>
+            <if test="createUserName != null and createUserName != ''">create_user_name,</if>
+            created_at,
+            updated_at
+        </trim>
+        <trim prefix="VALUES (" suffix=")" suffixOverrides=",">
+            <if test="userId != null">#{userId},</if>
+            <if test="num != null">#{num},</if>
+            <if test="itemId != null">#{itemId},</if>
+            <if test="createUserId != null">#{createUserId},</if>
+            <if test="createUserName != null and createUserName != ''">#{createUserName},</if>
+            CURRENT_TIMESTAMP,
+            CURRENT_TIMESTAMP
+        </trim>
+    </insert>
+
+    <!-- 更新 -->
+    <update id="updateCheckRecordById" >
+        UPDATE user_check_record
+        <set>
+            <if test="userId != null">user_id = #{userId},</if>
+            <if test="num != null">num = #{num},</if>
+            <if test="itemId != null">item_id = #{itemId},</if>
+            <if test="createUserId != null">create_user_id = #{createUserId},</if>
+            <if test="createUserName != null and createUserName != ''">create_user_name = #{createUserName},</if>
+            updated_at = CURRENT_TIMESTAMP
+        </set>
+        WHERE id = #{id}
+    </update>
+
+    <!-- 查询 by id -->
+    <select id="selectCheckRecordById" parameterType="long" resultType="org.dromara.business.domain.vo.UserCheckRecordVo">
+        SELECT
+        <include refid="Base_Select_Columns"/>
+        FROM user_check_record
+        WHERE id = #{id}
+    </select>
+
+    <!-- 删除 by id -->
+   <delete id="deleteCheckRecordById">
+        DELETE FROM user_check_record
+        <where>
+            id IN
+            <foreach item="id" collection="ids" open="(" separator="," close=")">
+                <if test="id > 0">
+                    #{id}
+                </if>
+            </foreach>
+        </where>
+    </delete>
+
+
+    <!-- 查询列表(可加条件) -->
+    <select id="selectCheckRecordList" parameterType="map" resultType="org.dromara.business.domain.vo.UserCheckRecordVo">
+        select  a.id, a.user_id, a.num, a.item_id, a.created_at, a.updated_at, a.create_user_id, a.create_user_name,
+                b.nick_name,b.phone,c.name as itemsName
+        from user_check_record a
+                 left join user b on a.user_id=b.id
+                 left join items c on a.item_id=c.id
+        ${ew.customSqlSegment}
+    </select>
+
+
+    <select id="selectCheckRecordAllList" parameterType="map" resultType="org.dromara.business.domain.vo.UserCheckRecordVo">
+        select  a.id, a.user_id, a.num, a.item_id, a.created_at, a.updated_at, a.create_user_id, a.create_user_name,
+                b.nick_name,b.phone,c.name as itemsName
+        from user_check_record a
+                 left join user b on a.user_id=b.id
+                 left join items c on a.item_id=c.id
+    </select>
+
+
+</mapper>