From dd663d0ac783755d889e270eee57ee58630c88c8 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 28 二月 2025 17:46:52 +0800
Subject: [PATCH] 冥想2.0新增代码
---
xinquan-modules/xinquan-user/src/main/java/com/xinquan/user/controller/client/ClientAppUserTreeController.java | 54 +++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 41 insertions(+), 13 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 7d0f5c2..118f705 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;
@@ -130,7 +131,10 @@
.between(AppUserViewingHistory::getCreateTime, startOfDay, endOfDay).list();
int temp = 0;
for (AppUserViewingHistory appUserViewingHistory : list) {
- temp += appUserViewingHistory.getTimeLook();
+ if (appUserViewingHistory.getTimeLook()!=null){
+ temp += appUserViewingHistory.getTimeLook();
+
+ }
}
AppUserTree one = appUserTreeService.lambdaQuery().eq(AppUserTree::getAppUserId, userId)
.eq(AppUserTree::getSowAgain, 2).one();
@@ -148,7 +152,7 @@
} else {
appUserTree.setIsSign(2);
}
- if (temp >= 120) {
+ if (temp >= 3600) {
if (appUserTree.getTaskOne() == 2) {
AppUserEnergyRecord appUserEnergyRecord = new AppUserEnergyRecord();
appUserEnergyRecord.setAppUserId(userId);
@@ -157,6 +161,8 @@
appUserEnergyRecord.setReason("完成【每日疗愈30分钟】任务");
appUserEnergyRecordService.save(appUserEnergyRecord);
byId.setTotalEnergyValue(byId.getTotalEnergyValue() + 10);
+ byId.setEnergyValue(byId.getEnergyValue() + 10);
+
}
if (appUserTree.getTaskTwo() == 2) {
AppUserEnergyRecord appUserEnergyRecord = new AppUserEnergyRecord();
@@ -166,11 +172,12 @@
appUserEnergyRecord.setReason("完成【每日疗愈60分钟】任务");
appUserEnergyRecordService.save(appUserEnergyRecord);
byId.setTotalEnergyValue(byId.getTotalEnergyValue() + 20);
+ byId.setEnergyValue(byId.getEnergyValue() + 20);
}
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);
@@ -179,9 +186,10 @@
appUserEnergyRecord.setReason("完成【每日疗愈30分钟】任务");
appUserEnergyRecordService.save(appUserEnergyRecord);
byId.setTotalEnergyValue(byId.getTotalEnergyValue() + 10);
+ byId.setEnergyValue(byId.getEnergyValue() + 10);
}
- appUserTree.setTaskOne(1);
- appUserTree.setTaskTwo(2);
+ appUserTree.setTaskOne(2);
+ appUserTree.setTaskTwo(1);
} else {
appUserTree.setTaskOne(2);
appUserTree.setTaskTwo(2);
@@ -192,7 +200,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);
@@ -201,6 +209,9 @@
appUserEnergyRecord.setReason("完成【每日疗愈30分钟】任务");
appUserEnergyRecordService.save(appUserEnergyRecord);
byId.setTotalEnergyValue(byId.getTotalEnergyValue() + 10);
+ one.setTaskOne(1);
+ byId.setEnergyValue(byId.getEnergyValue() + 10);
+
}
if (one.getTaskTwo() == 2) {
AppUserEnergyRecord appUserEnergyRecord = new AppUserEnergyRecord();
@@ -210,11 +221,12 @@
appUserEnergyRecord.setReason("完成【每日疗愈60分钟】任务");
appUserEnergyRecordService.save(appUserEnergyRecord);
byId.setTotalEnergyValue(byId.getTotalEnergyValue() + 20);
+ one.setTaskTwo(1);
+ byId.setEnergyValue(byId.getEnergyValue() + 20);
}
- 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);
@@ -223,9 +235,9 @@
appUserEnergyRecord.setReason("完成【每日疗愈30分钟】任务");
appUserEnergyRecordService.save(appUserEnergyRecord);
byId.setTotalEnergyValue(byId.getTotalEnergyValue() + 10);
+ one.setTaskOne(1);
+ byId.setEnergyValue(byId.getEnergyValue() + 10);
}
- one.setTaskOne(1);
- one.setTaskTwo(2);
} else {
one.setTaskOne(2);
one.setTaskTwo(2);
@@ -278,6 +290,7 @@
one.setEnergyValue(byId.getEnergyValue());
appUserTreeService.updateById(one);
one.setTotalEnergyValue(byId.getTotalEnergyValue());
+ appUserService.updateById(byId);
return R.ok(one);
}
}else{
@@ -343,12 +356,14 @@
AppUser byId = appUserService.getById(userId);
if (byId.getEnergyValue() == 0){
return R.energyValueError("能量值不足");
-
}
WateringVO wateringVO = new WateringVO();
AppUserTree one = appUserTreeService.lambdaQuery().eq(AppUserTree::getAppUserId, userId)
.eq(AppUserTree::getSowAgain,2).one();
+ if (one.getTreeLevelType() == 10){
+ return R.fail("成长值已满,请重新播种");
+ }
one.setStatus(2);
one.setTotal(one.getTotal()+byId.getEnergyValue());
one.setTime(LocalDateTime.now());
@@ -396,9 +411,17 @@
one.setGrowthValue(total1);
one.setEnergyValue(byId.getEnergyValue());
appUserTreeService.updateById(one);
+ if (one.getTotal()>=data.get(9).getGrowthValue()){
+ // 本次浇水量
+ byId.setEnergyValue(one.getTotal()-data.get(9).getGrowthValue());
+ appUserService.updateById(byId);
+ one.setTotal(data.get(9).getGrowthValue());
+ appUserTreeService.updateById(one);
+ }
wateringVO.setNextLevel(tem);
wateringVO.setTreeLevelType(x);
wateringVO.setGrowthValue(total1);
+ wateringVO.setEnergyValue(byId.getEnergyValue());
if (x>y){
wateringVO.setIsNext(true);
NoticeRecord noticeRecord = new NoticeRecord();
@@ -406,7 +429,7 @@
noticeRecord.setReadStatus(1);
noticeRecord.setNoticeType(1);
noticeRecord.setTitle("树苗升级通知");
- noticeRecord.setContent("恭喜,您的树苗已升至"+y+"级,"+"继续加油哦");
+ noticeRecord.setContent("恭喜,您的树苗已升至"+x+"级,"+"继续加油哦");
noticeRecordService.save(noticeRecord);
}
return R.ok(wateringVO);
@@ -421,6 +444,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);
@@ -445,6 +472,7 @@
Long userId = loginUser.getUserid();
if(userId ==null || userId == 0)return R.tokenError("登录失效");
AppUser byId = appUserService.getById(userId);
+ System.err.println("调用是否弹窗"+byId.getIsFirst());
if (byId.getIsFirst() == 1){
byId.setIsFirst(2);
appUserService.updateById(byId);
--
Gitblit v1.7.1