dianliang/dl_admin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://192.168.1.26:3000/dianliang/dl_admin

Browse Source
This commit is contained in:
PQZ 2025-05-29 15:55:38 +08:00
commit aa8f289bb7
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ruoyi-admin/src/main/java/com/ruoyi/busi/service/impl/BusiNoticeServiceImpl.java
View File

@ -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()){
//查博主类型字典

2
ruoyi-admin/src/main/java/com/ruoyi/busi/service/impl/BusiNoticeSignServiceImpl.java
View File

@ -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()){

3
ruoyi-admin/src/main/java/com/ruoyi/busi/utils/WeChatUtils.java
View File

@ -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;