From a5c7752f6334eb652ae2374078efaa55dd799475 Mon Sep 17 00:00:00 2001 From: 777 <123@qwe.com> Date: Wed, 14 Jan 2026 19:23:08 +0800 Subject: [PATCH] 123 --- doc/20251211.sql | 2 +- .../com/ruoyi/cai/domain/PrizeWinningRecord.java | 12 +++++------- .../vo/winningRecord/PrizeWinningRecordAdminVO.java | 3 +++ .../cai/dto/app/draw/resp/UserWinningRecordResp.java | 5 +++-- .../java/com/ruoyi/cai/lottery/LotteryService.java | 2 +- 5 files changed, 13 insertions(+), 11 deletions(-) diff --git a/doc/20251211.sql b/doc/20251211.sql index e96372a3..0cae1b0b 100644 --- a/doc/20251211.sql +++ b/doc/20251211.sql @@ -80,7 +80,7 @@ CREATE TABLE `cai_prize_winning_record` `prize_price` bigint(20) not null default 0 comment '奖品价值估算', `auto_give` tinyint not null default 0 comment '是否自动兑奖', `give_status` tinyint not null default 0 comment '奖品兑换情况 0-未兑换 1-已兑换', - `give_remark` varchar(100) not null default 0 comment '兑奖备注说明', + `give_remark` varchar(100) not null comment '兑奖备注说明', `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', PRIMARY KEY (`id`) diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/PrizeWinningRecord.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/PrizeWinningRecord.java index e7ff2357..a99fcccc 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/PrizeWinningRecord.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/PrizeWinningRecord.java @@ -1,15 +1,13 @@ package com.ruoyi.cai.domain; -import com.baomidou.mybatisplus.annotation.*; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; -import lombok.EqualsAndHashCode; -import java.io.Serializable; -import java.util.Date; -import java.math.BigDecimal; +import java.io.Serializable; import java.math.BigDecimal; -import com.ruoyi.common.core.domain.BaseEntity; -import org.joda.time.LocalDateTime; +import java.time.LocalDateTime; /** * 中奖记录对象 cai_prize_winning_record diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/winningRecord/PrizeWinningRecordAdminVO.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/winningRecord/PrizeWinningRecordAdminVO.java index 8a805750..c34cdf3a 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/winningRecord/PrizeWinningRecordAdminVO.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/winningRecord/PrizeWinningRecordAdminVO.java @@ -1,11 +1,14 @@ package com.ruoyi.cai.dto.admin.vo.winningRecord; import com.ruoyi.cai.domain.PrizeWinningRecord; +import com.ruoyi.common.annotation.Sensitive; +import com.ruoyi.common.enums.SensitiveStrategy; import lombok.Data; @Data public class PrizeWinningRecordAdminVO extends PrizeWinningRecord { private String usercode; private String nickname; + @Sensitive(strategy = SensitiveStrategy.PHONE) private String mobile; } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/draw/resp/UserWinningRecordResp.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/draw/resp/UserWinningRecordResp.java index 6ed20705..afdc6724 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/draw/resp/UserWinningRecordResp.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/draw/resp/UserWinningRecordResp.java @@ -1,7 +1,8 @@ package com.ruoyi.cai.dto.app.draw.resp; import lombok.Data; -import org.joda.time.LocalDateTime; + +import java.time.LocalDateTime; @Data public class UserWinningRecordResp { @@ -16,7 +17,7 @@ public class UserWinningRecordResp { /** * 抽奖消耗 */ - private Long usePoint; + private Integer usePoint; /** * 奖品名称 */ diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/lottery/LotteryService.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/lottery/LotteryService.java index e71d2921..016ffaf3 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/lottery/LotteryService.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/lottery/LotteryService.java @@ -69,7 +69,7 @@ public class LotteryService { throw new ServiceException("用户不存在"); } boolean select = GenderEnum.isSelect(user.getGender()); - if(select){ + if(!select){ throw new ServiceException("请选择性别后在抽奖"); } boolean openDraw = drawService.getOpenDraw(user.getGender());