123
This commit is contained in:
@@ -80,7 +80,7 @@ CREATE TABLE `cai_prize_winning_record`
|
|||||||
`prize_price` bigint(20) not null default 0 comment '奖品价值估算',
|
`prize_price` bigint(20) not null default 0 comment '奖品价值估算',
|
||||||
`auto_give` tinyint not null default 0 comment '是否自动兑奖',
|
`auto_give` tinyint not null default 0 comment '是否自动兑奖',
|
||||||
`give_status` tinyint not null default 0 comment '奖品兑换情况 0-未兑换 1-已兑换',
|
`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 '创建时间',
|
`create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
|
||||||
`update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
|
`update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
|
||||||
PRIMARY KEY (`id`)
|
PRIMARY KEY (`id`)
|
||||||
|
|||||||
@@ -1,15 +1,13 @@
|
|||||||
package com.ruoyi.cai.domain;
|
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.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 java.math.BigDecimal;
|
||||||
import com.ruoyi.common.core.domain.BaseEntity;
|
import java.time.LocalDateTime;
|
||||||
import org.joda.time.LocalDateTime;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 中奖记录对象 cai_prize_winning_record
|
* 中奖记录对象 cai_prize_winning_record
|
||||||
|
|||||||
@@ -1,11 +1,14 @@
|
|||||||
package com.ruoyi.cai.dto.admin.vo.winningRecord;
|
package com.ruoyi.cai.dto.admin.vo.winningRecord;
|
||||||
|
|
||||||
import com.ruoyi.cai.domain.PrizeWinningRecord;
|
import com.ruoyi.cai.domain.PrizeWinningRecord;
|
||||||
|
import com.ruoyi.common.annotation.Sensitive;
|
||||||
|
import com.ruoyi.common.enums.SensitiveStrategy;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
|
||||||
@Data
|
@Data
|
||||||
public class PrizeWinningRecordAdminVO extends PrizeWinningRecord {
|
public class PrizeWinningRecordAdminVO extends PrizeWinningRecord {
|
||||||
private String usercode;
|
private String usercode;
|
||||||
private String nickname;
|
private String nickname;
|
||||||
|
@Sensitive(strategy = SensitiveStrategy.PHONE)
|
||||||
private String mobile;
|
private String mobile;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,7 +1,8 @@
|
|||||||
package com.ruoyi.cai.dto.app.draw.resp;
|
package com.ruoyi.cai.dto.app.draw.resp;
|
||||||
|
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
import org.joda.time.LocalDateTime;
|
|
||||||
|
import java.time.LocalDateTime;
|
||||||
|
|
||||||
@Data
|
@Data
|
||||||
public class UserWinningRecordResp {
|
public class UserWinningRecordResp {
|
||||||
@@ -16,7 +17,7 @@ public class UserWinningRecordResp {
|
|||||||
/**
|
/**
|
||||||
* 抽奖消耗
|
* 抽奖消耗
|
||||||
*/
|
*/
|
||||||
private Long usePoint;
|
private Integer usePoint;
|
||||||
/**
|
/**
|
||||||
* 奖品名称
|
* 奖品名称
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -69,7 +69,7 @@ public class LotteryService {
|
|||||||
throw new ServiceException("用户不存在");
|
throw new ServiceException("用户不存在");
|
||||||
}
|
}
|
||||||
boolean select = GenderEnum.isSelect(user.getGender());
|
boolean select = GenderEnum.isSelect(user.getGender());
|
||||||
if(select){
|
if(!select){
|
||||||
throw new ServiceException("请选择性别后在抽奖");
|
throw new ServiceException("请选择性别后在抽奖");
|
||||||
}
|
}
|
||||||
boolean openDraw = drawService.getOpenDraw(user.getGender());
|
boolean openDraw = drawService.getOpenDraw(user.getGender());
|
||||||
|
|||||||
Reference in New Issue
Block a user