From 06dad2095dbe4c465025e5bc6e0220521636e2c2 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 15 十一月 2024 18:20:59 +0800
Subject: [PATCH] 代码提交
---
xinquan-modules/xinquan-user/src/main/java/com/xinquan/user/controller/client/ClientAppUserTreeController.java | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/xinquan-modules/xinquan-user/src/main/java/com/xinquan/user/controller/client/ClientAppUserTreeController.java b/xinquan-modules/xinquan-user/src/main/java/com/xinquan/user/controller/client/ClientAppUserTreeController.java
index ad56549..6a688dc 100644
--- a/xinquan-modules/xinquan-user/src/main/java/com/xinquan/user/controller/client/ClientAppUserTreeController.java
+++ b/xinquan-modules/xinquan-user/src/main/java/com/xinquan/user/controller/client/ClientAppUserTreeController.java
@@ -32,6 +32,7 @@
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.LocalTime;
import java.time.temporal.ChronoUnit;
@@ -151,7 +152,7 @@
} else {
appUserTree.setIsSign(2);
}
- if (temp >= 120) {
+ if (temp >= 3600) {
if (appUserTree.getTaskOne() == 2) {
AppUserEnergyRecord appUserEnergyRecord = new AppUserEnergyRecord();
appUserEnergyRecord.setAppUserId(userId);
@@ -173,7 +174,7 @@
}
appUserTree.setTaskOne(1);
appUserTree.setTaskTwo(1);
- } else if (temp >= 60) {
+ } else if (temp >= 1800) {
if (appUserTree.getTaskOne() == 2) {
AppUserEnergyRecord appUserEnergyRecord = new AppUserEnergyRecord();
appUserEnergyRecord.setAppUserId(userId);
@@ -195,7 +196,7 @@
appUserTree.setTotalEnergyValue(byId.getTotalEnergyValue());
return R.ok(appUserTree);
} else {
- if (temp >= 120) {
+ if (temp >= 3600) {
if (one.getTaskOne() == 2) {
AppUserEnergyRecord appUserEnergyRecord = new AppUserEnergyRecord();
appUserEnergyRecord.setAppUserId(userId);
@@ -217,7 +218,7 @@
}
one.setTaskOne(1);
one.setTaskTwo(1);
- } else if (temp >= 60) {
+ } else if (temp >= 1800) {
if (one.getTaskOne() == 2) {
AppUserEnergyRecord appUserEnergyRecord = new AppUserEnergyRecord();
appUserEnergyRecord.setAppUserId(userId);
@@ -409,7 +410,7 @@
noticeRecord.setReadStatus(1);
noticeRecord.setNoticeType(1);
noticeRecord.setTitle("树苗升级通知");
- noticeRecord.setContent("恭喜,您的树苗已升至"+y+"级,"+"继续加油哦");
+ noticeRecord.setContent("恭喜,您的树苗已升至"+x+"级,"+"继续加油哦");
noticeRecordService.save(noticeRecord);
}
return R.ok(wateringVO);
@@ -424,6 +425,10 @@
Long userId = loginUser.getUserid();
// 给用户加10能量
AppUser byId = appUserService.getById(userId);
+ if (byId.getSignTime()!=null
+ && byId.getSignTime().toLocalDate().equals(LocalDate.now())){
+ return R.fail("您今日已签到");
+ }
byId.setEnergyValue(byId.getEnergyValue()+10);
byId.setSignTime(LocalDateTime.now());
byId.setTotalEnergyValue(byId.getTotalEnergyValue()+10);
--
Gitblit v1.7.1