bug

src/main/java/com/izouma/nineth/service/RiceService.java

@@ -83,6 +83,9 @@ public class RiceService {
 
         rice.setAvatar(avatar);
         rice.setPhone(phone);
+        rice.setInviteCount(riceInviteRepo.countRiceInviteBy(rice.getUserId(), getTodayStartTime(), getTodayEndTime()));
+        rice.setHelpCount(Long.valueOf(riceInviteRepo.countRiceInviteByHelperId(SecurityUtils.getAuthenticatedUser().getId(), getTodayStartTime(), getTodayEndTime())));
+
         return riceRepo.save(rice);
     }
 
@@ -160,15 +163,16 @@ public class RiceService {
             return R.error("查询失败");
         }
 
+
         Rice rice = byUserId.get();
-        int i = riceInviteRepo.countRiceInviteBy(rice.getUserId(), getTodayStartTime(), getTodayEndTime());
+        int isInvitedCounts = riceInviteRepo.countRiceInviteBy(rice.getUserId(), getTodayStartTime(), getTodayEndTime());
         int InviteHelpOthersCounts = riceInviteRepo.countRiceInviteByHelperId(SecurityUtils.getAuthenticatedUser().getId(), getTodayStartTime(), getTodayEndTime());
 
         Long lastSignInTime = rice.getLastSignInTime();
         Long currentTime = System.currentTimeMillis();
 
         boolean isCanExchangeActivityScoreForWater = rice.getSelfActivityScore() >= 2;
-        boolean isInvited = rice.getInviteCount() > 1;
+        boolean isInvited = isInvitedCounts > 1;
         boolean isCanExchangeScore = rice.getExchangeCount() < 10 && rice.getSelfScore() >= 10;
         boolean isSignedIn = lastSignInTime != null && DateUtils.isSameDay(new Date(lastSignInTime), new Date(currentTime));
 
@@ -756,6 +760,7 @@ public class RiceService {
         List<Rice> riceList = riceRepo.findAll();
         for (Rice rice : riceList) {
             rice.setExchangeCount(0);
+            //邀请次数已经修改好了
             rice.setInviteCount(0);
             rice.setHelpCount(0L);
             rice.setEarnPointsEveryDay(0L);
@@ -765,31 +770,6 @@ public class RiceService {
 
 
 
-//
-//    @Scheduled(cron = "0 0 12 * * ?")
-//    public void updateAllRiceLevel() {
-//        String jsonString = sysConfigService.getString("rice_level");
-//        JsonReader jsonReader = Json.createReader(new StringReader(jsonString));
-//        JsonArray jsonArray = jsonReader.readArray();
-//
-//        List<Rice> allRices = riceRepo.findAll();
-//        allRices.forEach(rice -> {
-//            Long currentLevel = null;
-//            for (int j = 0; j < jsonArray.size(); j++) {
-//                JsonObject jsonObject = jsonArray.getJsonObject(j);
-//                Long start = Long.valueOf(jsonObject.getInt("start"));
-//                if (rice.getEmpiricalValue() >= start && rice.getEmpiricalValue() < (j < jsonArray.size() - 1 ? Long.valueOf(jsonArray.getJsonObject(j + 1).getInt("start")) : Long.MAX_VALUE)) {
-//                    String currentLevelStr = jsonObject.getString("name").replace("Lv", "");
-//                    currentLevel = Long.parseLong(currentLevelStr);
-//                    rice.setLevel(currentLevel);
-//                    break;
-//                }
-//            }
-//        });
-//        riceRepo.saveAll(allRices);
-//    }
-
-
 
 
 }

src/main/java/com/izouma/nineth/web/RiceController.java

@@ -133,14 +133,6 @@ public class RiceController extends BaseController {
     }
 
 
-//    //获取今日已浇水次数和还需浇水次数升级的接口
-//    @GetMapping("/watering/count")
-//    public R<?> getWateringCount() {
-//        Long todayWateringCount = riceService.getTodayWateringCount(SecurityUtils.getAuthenticatedUser().getId());
-//        Rice rice = riceRepo.findByUserId(SecurityUtils.getAuthenticatedUser().getId()).orElseThrow(new BusinessException("没找到记录"));
-//            Long waterDropNeededForLevelUp = riceService.getWaterDropNeededForLevelUp(rice);
-//            return R.success(Map.of("todayWateringCount", todayWateringCount, "waterDropNeededForLevelUp", waterDropNeededForLevelUp));
-//    }
 
     //签到
     @GetMapping("/signin")

src/main/java/com/izouma/nineth/web/RiceInviteController.java

@@ -112,21 +112,6 @@ public class RiceInviteController extends BaseController {
             return R.error("您今天已经助力过该用户，请勿重复助力").add("avatar", avatar).add("nickname", nickname);
         }
 
-        // 检查被助力者是否已经被别人助力
-//        Optional<RiceInvite> helpeeRice = riceInviteRepo.findByHelpeeIdAndDelIsFalseAndCreateTimeBetween(helpeeId, getTodayStartTime(), getTodayEndTime());
-//        if (helpeeRice.isPresent()) {
-//            Optional<Rice> byUserId = riceRepo.findByUserId(helpeeId);
-//            String avatar = null;
-//            String nickname = null;
-//            if (byUserId.isPresent()) {
-//                Rice rice = byUserId.get();
-//                avatar = rice.getAvatar();
-//                nickname = rice.getNickname();
-//
-//            }
-//            return R.error("该用户今天已经获得了助力，请勿重复助力").add("avatar", avatar).add("nickname", nickname);
-//        }
-
 
         // 检查被助力者是否已经被别人助力
         int i = riceInviteRepo.countRiceInviteBy(helpeeId, getTodayStartTime(), getTodayEndTime());
@@ -138,10 +123,7 @@ public class RiceInviteController extends BaseController {
 
         //助力者助力次数加一
         Rice rice1 = riceRepo.findByUserId(helperId).orElseThrow(new BusinessException("没有找到记录"));
-//        if(rice1.getHelpCount()>=2){
-//            return R.error("您今日已助力两位好友,已达助力上限。").add("avatar", rice1.getAvatar()).add("nickname", rice1.getNickname());
-//
-//        }
+
         rice1.setHelpCount(rice1.getHelpCount() + 1);
         riceRepo.save(rice1);
         if (rice1.getHelpCount() <= 3) {