From 3f155876604a597f801bc7f12066ee6987ae21bb Mon Sep 17 00:00:00 2001
From: 13405411873 <1994398261@qq.com>
Date: Thu, 29 May 2025 15:30:45 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ruoyi/busi/service/impl/BusiNoticeServiceImpl.java    | 8 +++++---
 .../busi/service/impl/BusiNoticeSignServiceImpl.java      | 2 ++
 .../src/main/java/com/ruoyi/busi/utils/WeChatUtils.java   | 3 +--
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/busi/service/impl/BusiNoticeServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/busi/service/impl/BusiNoticeServiceImpl.java
index 74c2c2b..e921c55 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/busi/service/impl/BusiNoticeServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/busi/service/impl/BusiNoticeServiceImpl.java
@@ -397,10 +397,12 @@ public class BusiNoticeServiceImpl extends ServiceImpl<BusiNoticeMapper,BusiNoti
 
         }
         IPage<BusiNoticeVo> pageList = busiNoticeMapper.queryAppListPage(query,page);
+        if (StringUtils.isEmpty(query.getSortBy())||!query.getSortBy().equals("new")){
+            List<BusiNoticeVo> records = pageList.getRecords();
+            Collections.shuffle(records);
+            pageList.setRecords(records);
+        }
         //打乱records的排列顺序
-        List<BusiNoticeVo> records = pageList.getRecords();
-        Collections.shuffle(records);
-        pageList.setRecords(records);
         List<String> idList = pageList.getRecords().stream().map(BusiNotice::getId).collect(Collectors.toList());
         if(!idList.isEmpty()){
             //查博主类型字典
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/busi/service/impl/BusiNoticeSignServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/busi/service/impl/BusiNoticeSignServiceImpl.java
index 6c58fb8..8f22bdd 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/busi/service/impl/BusiNoticeSignServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/busi/service/impl/BusiNoticeSignServiceImpl.java
@@ -2,6 +2,7 @@ package com.ruoyi.busi.service.impl;
 
 import java.util.List;
 
+import cn.hutool.core.collection.CollectionUtil;
 import com.alibaba.fastjson2.JSONArray;
 import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -75,6 +76,7 @@ public class BusiNoticeSignServiceImpl extends ServiceImpl<BusiNoticeSignMapper,
             throw new Exception("报名人数已满！");
         }
         SysUser sysUser = userService.selectUserById(loginUser.getUserId());
+        //处理报名是用的信息
         //先使用赠送次数
         MemberUserVO memberUserVO = memberUserService.queryByUserId(loginUser.getUserId(), "02");
         if(memberUserVO.getSendReportNum()>=appNoticeSign.getCardList().size()){
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/busi/utils/WeChatUtils.java b/ruoyi-admin/src/main/java/com/ruoyi/busi/utils/WeChatUtils.java
index 268f332..7ac876e 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/busi/utils/WeChatUtils.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/busi/utils/WeChatUtils.java
@@ -112,10 +112,9 @@ public class WeChatUtils {
         String response = HttpUtil.get(requestUrl);
         JSONObject jsonObject = JSONUtil.parseObj(response);
         accessToken = jsonObject.getStr("access_token");
-        int expiresIn = jsonObject.getInt("expires_in", 7200); // 默认有效期为7200秒
         if (accessToken != null) {
             // 将access_token存入Redis，并设置有效期
-            redisCache.setCacheObject(redisKey, accessToken,expiresIn - 60,TimeUnit.SECONDS);
+            redisCache.setCacheObject(redisKey, accessToken,60,TimeUnit.SECONDS);
             log.debug("从微信获取access_token并存入Redis: {}", accessToken);
         }
         return accessToken;