czg_team
/
video_server
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'test' into dev

This commit is contained in:
wangw 2024-12-11 09:35:02 +08:00
parent 48311dc69e 5333c8775e
commit 35cc3a6c4d
3 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/sqx/modules/discSpinning/controller/DiscSpinningController.java
View File

@ -210,6 +210,8 @@ public class DiscSpinningController {
UserMoneyDetails userMoneyDetails = new UserMoneyDetails( UserMoneyDetails userMoneyDetails = new UserMoneyDetails(
receive.getUserId(), null, null, "[现金大转盘]", 5, 1, 2, receive.getUserId(), null, null, "[现金大转盘]", 5, 1, 2,
receive.getNumber(), "现金红包奖励" + receive.getNumber() + "元"); receive.getNumber(), "现金红包奖励" + receive.getNumber() + "元");
//上一秒
userMoneyDetails.setCreateTime(DateUtil.format(new Date(System.currentTimeMillis() - 1000), "yyyy-MM-dd HH:mm:ss"));
userMoneyDetailsService.save(userMoneyDetails); userMoneyDetailsService.save(userMoneyDetails);
receive.setTarget("2"); receive.setTarget("2");
receive.setTargetId(userMoneyDetails.getId()); receive.setTargetId(userMoneyDetails.getId());

2
src/main/java/com/sqx/modules/taskCenter/entity/TaskCenter.java
View File

@ -54,7 +54,7 @@ public class TaskCenter extends Model<TaskCenter> {
private Integer shows; private Integer shows;
@TableField(exist = false) @TableField(exist = false)
private Integer discNumber; private Integer discNumber = 0;
@TableField(exist = false) @TableField(exist = false)
private boolean disabled = true; private boolean disabled = true;

3
src/main/java/com/sqx/modules/taskCenter/service/impl/TaskCenterServiceImpl.java
View File

@ -61,17 +61,20 @@ public class TaskCenterServiceImpl extends ServiceImpl<TaskCenterDao, TaskCenter
if (s.getNumber().equals(1)) { if (s.getNumber().equals(1)) {
Integer dayOrderNum = ordersService.countOrderNum(userId, DateUtil.today() + " 00:00:00"); Integer dayOrderNum = ordersService.countOrderNum(userId, DateUtil.today() + " 00:00:00");
if (dayOrderNum < 3 || recordService.countTaskNum(userId, s.getId(), DateUtil.today() + " 00:00:00") > 0) { if (dayOrderNum < 3 || recordService.countTaskNum(userId, s.getId(), DateUtil.today() + " 00:00:00") > 0) {
s.setDiscNumber(dayOrderNum);
s.setDisabled(false); s.setDisabled(false);
todaySign = false; todaySign = false;
} }
} else { } else {
if (todaySign) { if (todaySign) {
if ((signRecordList.size() < (s.getNumber().intValue() - 1)) || recordService.countTaskNum(userId, s.getId(), DateUtil.beginOfMonth(new Date()).toString()) > 0) { if ((signRecordList.size() < (s.getNumber().intValue() - 1)) || recordService.countTaskNum(userId, s.getId(), DateUtil.beginOfMonth(new Date()).toString()) > 0) {
s.setDiscNumber(s.getNumber() - signRecordList.size());
s.setDisabled(false); s.setDisabled(false);
} }
} else { } else {
if ((signRecordList.size() < s.getNumber().intValue()) || recordService.countTaskNum(userId, s.getId(), DateUtil.beginOfMonth(new Date()).toString()) > 0) { if ((signRecordList.size() < s.getNumber().intValue()) || recordService.countTaskNum(userId, s.getId(), DateUtil.beginOfMonth(new Date()).toString()) > 0) {
s.setDisabled(false); s.setDisabled(false);
s.setDiscNumber(s.getNumber() - signRecordList.size());
} }
} }