From 185f5dc7c3c49f565da51cd9c2f7750f30990d4a Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 11 十一月 2024 13:28:29 +0800
Subject: [PATCH] 代码提交

---
 xinquan-modules/xinquan-user/src/main/java/com/xinquan/user/controller/client/ClientAppUserController.java |   48 +++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 47 insertions(+), 1 deletions(-)

diff --git a/xinquan-modules/xinquan-user/src/main/java/com/xinquan/user/controller/client/ClientAppUserController.java b/xinquan-modules/xinquan-user/src/main/java/com/xinquan/user/controller/client/ClientAppUserController.java
index 5d5cc93..e5f804e 100644
--- a/xinquan-modules/xinquan-user/src/main/java/com/xinquan/user/controller/client/ClientAppUserController.java
+++ b/xinquan-modules/xinquan-user/src/main/java/com/xinquan/user/controller/client/ClientAppUserController.java
@@ -58,6 +58,7 @@
 import java.time.LocalDateTime;
 import java.time.Month;
 import java.time.format.DateTimeFormatter;
+import java.time.temporal.ChronoUnit;
 import java.time.temporal.TemporalAdjusters;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -119,6 +120,45 @@
     private RemoteOrderService remoteOrderService;
     @Resource
     private RemoteUserService remoteUserService;
+    @Resource
+    private NoticeRecordService noticeRecordService;
+    @GetMapping("/testNotice")
+    @ApiOperation(value = "测试通知", tags = "测试通知")
+    public R testNotice() {
+        LocalDateTime now = LocalDateTime.now();
+        List<AppUser> list = appUserService.lambdaQuery().ne(AppUser::getUserStatus, 3).list();
+        for (AppUser appUser : list) {
+            if (appUser.getVipExpireTime()!=null && appUser.getVipExpireTime().isAfter(now)){
+                // 计算两个now和time的天数差
+                long between = Math.abs(ChronoUnit.DAYS.between(appUser.getVipExpireTime(), now));
+                if (between<=7){
+                    NoticeRecord noticeRecord = new NoticeRecord();
+                    noticeRecord.setAppUserId(appUser.getId());
+                    noticeRecord.setReadStatus(1);
+                    noticeRecord.setNoticeType(1);
+                    noticeRecord.setTitle("【会员临期通知】");
+                    noticeRecord.setContent("尊敬的心泉疗愈会员你好,你的会员即将在"
+                            +appUser.getVipExpireTime().toLocalDate()+"到期,到期后将不再享受会员权益,请及时续费");
+                    noticeRecordService.save(noticeRecord);
+                }
+            }
+            AppUserTree one = appUserTreeService.lambdaQuery().eq(AppUserTree::getAppUserId, appUser.getId())
+                    .eq(AppUserTree::getSowAgain, 2).one();
+            if(one!=null && (one.getTaskOne()==2||one.getTaskTwo()==2)){
+                NoticeRecord noticeRecord = new NoticeRecord();
+                noticeRecord.setAppUserId(appUser.getId());
+                noticeRecord.setReadStatus(1);
+                noticeRecord.setNoticeType(1);
+                noticeRecord.setTitle("【冥想通知】");
+                noticeRecord.setContent("你今天的冥想任务还未完成,完成冥想后可获得能量值奖励,快去冥想吧!");
+                noticeRecordService.save(noticeRecord);
+            }
+        }
+        return R.ok();
+    }
+
+
+
     @GetMapping("/getUserByPhone/{phone}")
     public R<AppUser> getUserByPhone(@PathVariable("phone")String phone) {
         AppUser one = appUserService.lambdaQuery().eq(AppUser::getCellPhone, phone).ne(AppUser::getUserStatus, 3)
@@ -1438,10 +1478,16 @@
             tem = a;
             total1 = Math.abs(total1-data3.get(x-1).getGrowthValue());
         }
+        if (x==10){
+            healingLevelVO.setDifferenceLevel(0);
+            healingLevelVO.setGrowthValue(tem);
+        }else{
+            healingLevelVO.setDifferenceLevel(tem-total1);
+            healingLevelVO.setGrowthValue(total1);
+        }
         healingLevelVO.setNextLevel(tem);
         healingLevelVO.setLevel(x);
         // 将当前成长值更新
-        healingLevelVO.setGrowthValue(total1);
         String data1 = remoteUserService.getCourseList(7).getData();
         healingLevelVO.setContent(data1);
         return R.ok(healingLevelVO);

--
Gitblit v1.7.1