From 024cc12e5670e330a37aaf1adff52cb1eacab89a Mon Sep 17 00:00:00 2001 From: 777 <123@qwe.com> Date: Tue, 14 Oct 2025 16:18:55 +0800 Subject: [PATCH] 11 --- .../web/controller/cai/app/RankAppController.java | 5 +---- .../cai/service/impl/UnionTotalServiceImpl.java | 12 +++++++++--- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/RankAppController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/RankAppController.java index 6ffe91b1..113565bd 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/RankAppController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/RankAppController.java @@ -94,9 +94,6 @@ public class RankAppController { @Log(title = "土豪榜单查询", businessType = BusinessType.OTHER, isPrintResponseData = true, isSaveDb = false) public R> rechargeRank( @Parameter(description = "类型 1-上周 2-昨日 3-日榜 4-周榜 5-月榜 6-总榜") Integer type){ - if(type == null){ - return R.ok(Collections.emptyList()); - } Long userId = LoginHelper.getUserId(); long lastLove = 0; List rankNodeList = accountMapper.rankTotalPay(30); @@ -104,7 +101,7 @@ public class RankAppController { RankNodeRecharge rankNodeRecharge = rankNodeList.get(i); rankNodeRecharge.setValue(rankNodeRecharge.getMoney().setScale(0, RoundingMode.CEILING).longValue()); if(!rankNodeRecharge.getUserId().equals(userId)){ - rankNodeRecharge.setAvatar(GenderEnum.WOMEN.getDefaultAvatar()); + rankNodeRecharge.setAvatar(GenderEnum.MAN.getDefaultAvatar()); rankNodeRecharge.setNickname(minNickname(rankNodeRecharge.getNickname())); rankNodeRecharge.setUserId(null); } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UnionTotalServiceImpl.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UnionTotalServiceImpl.java index 230d3fbf..d40878a1 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UnionTotalServiceImpl.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UnionTotalServiceImpl.java @@ -11,6 +11,7 @@ import com.ruoyi.cai.mapper.UnionTotalMapper; import com.ruoyi.cai.service.ConsumeLogService; import com.ruoyi.cai.service.UnionService; import com.ruoyi.cai.service.UnionTotalService; +import org.apache.ibatis.javassist.bytecode.stackmap.TypeData; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -108,7 +109,9 @@ public class UnionTotalServiceImpl extends ServiceImpl unionTotalList = unionTotalMapper.countUnionTotal(minTime, maxTime); for (UnionTotal unionTotal : unionTotalList) { - UnionTotal one = this.getOne(Wrappers.lambdaQuery(UnionTotal.class).eq(UnionTotal::getCountDate, localDate) + UnionTotal one = this.getOne(Wrappers.lambdaQuery(UnionTotal.class) + .eq(UnionTotal::getUnionId, unionTotal.getUnionId()) + .eq(UnionTotal::getCountDate, localDate) .eq(UnionTotal::getDataType, RankDataTypeEnum.DAY.getCode()).last("limit 1")); if (one == null) { one = new UnionTotal(); @@ -139,8 +142,11 @@ public class UnionTotalServiceImpl extends ServiceImpl unionTotalList = unionTotalMapper.countUnionTotal(minTime, maxTime); for (UnionTotal unionTotal : unionTotalList) { - UnionTotal one = this.getOne(Wrappers.lambdaQuery(UnionTotal.class).eq(UnionTotal::getCountDate, localDate) - .eq(UnionTotal::getDataType, RankDataTypeEnum.WEEK.getCode()).last("limit 1")); + UnionTotal one = this.getOne(Wrappers.lambdaQuery(UnionTotal.class) + .eq(UnionTotal::getUnionId, unionTotal.getUnionId()) + .eq(UnionTotal::getCountDate, localDate) + .eq(UnionTotal::getDataType, RankDataTypeEnum.WEEK.getCode()) + .last("limit 1")); if (one == null) { one = new UnionTotal(); one.setUnionId(unionTotal.getUnionId());