From 5cf8494a6da08dfcdc5fdb4c5e55aefd8b27d684 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 26 十一月 2024 18:34:28 +0800
Subject: [PATCH] 代码提交
---
xinquan-modules/xinquan-user/src/main/java/com/xinquan/user/controller/client/ClientAppUserTreeController.java | 33 ++++++++++++++++++++++++++-------
1 files changed, 26 insertions(+), 7 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 6a688dc..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
@@ -161,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();
@@ -170,6 +172,7 @@
appUserEnergyRecord.setReason("完成【每日疗愈60分钟】任务");
appUserEnergyRecordService.save(appUserEnergyRecord);
byId.setTotalEnergyValue(byId.getTotalEnergyValue() + 20);
+ byId.setEnergyValue(byId.getEnergyValue() + 20);
}
appUserTree.setTaskOne(1);
@@ -183,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);
@@ -205,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();
@@ -214,10 +221,11 @@
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 >= 1800) {
if (one.getTaskOne() == 2) {
AppUserEnergyRecord appUserEnergyRecord = new AppUserEnergyRecord();
@@ -227,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);
@@ -282,6 +290,7 @@
one.setEnergyValue(byId.getEnergyValue());
appUserTreeService.updateById(one);
one.setTotalEnergyValue(byId.getTotalEnergyValue());
+ appUserService.updateById(byId);
return R.ok(one);
}
}else{
@@ -347,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());
@@ -400,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();
--
Gitblit v1.7.1