From 5c6b1469792343d30781074c18880259498109b4 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 09 一月 2025 18:11:37 +0800
Subject: [PATCH] 修改bug
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/AppUserServiceImpl.java | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/AppUserServiceImpl.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/AppUserServiceImpl.java
index ed32161..44e89e9 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/AppUserServiceImpl.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/AppUserServiceImpl.java
@@ -20,6 +20,7 @@
import com.ruoyi.account.vo.*;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.StringUtils;
+import com.ruoyi.common.core.web.page.PageInfo;
import com.ruoyi.common.redis.service.RedisService;
import com.ruoyi.common.security.service.TokenService;
import com.ruoyi.other.api.domain.*;
@@ -466,7 +467,8 @@
weChatUtil.getwxacodeunlimit("pages/login/login", "id=" + appUser.getId(), EnvVersion.TRIAL, filePath + fileName);
appUser.setQrCode(accessPath + fileName);
this.updateById(appUser);
- }
+
+ }
LoginVo loginVo = new LoginVo();
loginVo.setSkipPage(1);
loginVo.setFirstTime(null == appUser1);
@@ -679,7 +681,7 @@
* @return
*/
@Override
- public List<NearbyReferrerVo> getNearbyReferrer(NearbyReferrer nearbyReferrer) {
+ public PageInfo<NearbyReferrerVo> getNearbyReferrer(NearbyReferrer nearbyReferrer) {
//使用地图获取省市区数据
String citycode = TencentMapUtil.inverseGeographicalAnalysis(nearbyReferrer.getLongitude(), nearbyReferrer.getLatitude(), false);
if(StringUtils.isEmpty(citycode)){
@@ -687,8 +689,9 @@
}
if(null != citycode){
String cityCode = citycode.substring(0, 4) + "00";
- List<NearbyReferrerVo> list = this.baseMapper.getNearbyReferrer(cityCode, nearbyReferrer);
- return list;
+ PageInfo<NearbyReferrerVo> pageInfo = new PageInfo(nearbyReferrer.getPageCurr(), nearbyReferrer.getPageSize());
+ List<NearbyReferrerVo> list = this.baseMapper.getNearbyReferrer(pageInfo, cityCode, nearbyReferrer);
+ return pageInfo.setRecords(list);
}
return null;
}
@@ -750,7 +753,7 @@
//注册X天后没有升级成黄金会员则自动解绑推广人
//解绑推广人
- Set<Long> unbind_promoter = redisTemplate.opsForZSet().range("unbind_promoter", 0, LocalDateTime.now().toEpochSecond(ZoneOffset.UTC));
+ Set<Long> unbind_promoter = redisTemplate.opsForZSet().rangeByScore("unbind_promoter", 0, LocalDateTime.now().toEpochSecond(ZoneOffset.UTC));
if(unbind_promoter.size() > 0){
List<AppUser> list = this.list(new LambdaQueryWrapper<AppUser>().eq(AppUser::getVipId, 1).eq(AppUser::getDelFlag, 0).isNotNull(AppUser::getInviteUserId)
.eq(AppUser::getStatus, 1).in(AppUser::getId, unbind_promoter));
@@ -761,7 +764,7 @@
}
}
//可更换推广人
- Set<Long> replaceable = redisTemplate.opsForZSet().range("replaceable", 0, LocalDateTime.now().toEpochSecond(ZoneOffset.UTC));
+ Set<Long> replaceable = redisTemplate.opsForZSet().rangeByScore("replaceable", 0, LocalDateTime.now().toEpochSecond(ZoneOffset.UTC));
if(replaceable.size() > 0){
List<AppUser> list = this.list(new LambdaQueryWrapper<AppUser>().eq(AppUser::getDelFlag, 0).eq(AppUser::getChangePromoter, 0)
.eq(AppUser::getStatus, 1).in(AppUser::getId, unbind_promoter));
@@ -783,7 +786,7 @@
if(null == cacheObject){
redisService.setCacheObject("ONLINE_" + userid, 0, 15L, TimeUnit.MINUTES);
}else{
- Long duration = (Long) cacheObject;
+ Integer duration = (Integer) cacheObject;
duration += 10;
//满足一个小时，开始发放积分，计时归0
if(60 >= duration){
@@ -958,7 +961,7 @@
public void closeOrder() {
//订单支付数据
long second = LocalDateTime.now().toEpochSecond(ZoneOffset.UTC);
- Set<String> orderPayment = redisTemplate.opsForZSet().range("BalanceRecharge", 0, second);
+ Set<String> orderPayment = redisTemplate.opsForZSet().rangeByScore("BalanceRecharge", 0, second);
if(orderPayment.size() > 0){
List<BalancePayment> list = balancePaymentService.list(new LambdaQueryWrapper<BalancePayment>().in(BalancePayment::getId, orderPayment));
for (BalancePayment order : list) {
--
Gitblit v1.7.1