shayu/cai-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

11

Browse Source
This commit is contained in:
777
2025-10-14 16:18:55 +08:00
parent e3fc58af9b
commit 024cc12e56
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/RankAppController.java
View File

@@ -94,9 +94,6 @@ public class RankAppController {
@Log(title = "土豪榜单查询", businessType = BusinessType.OTHER, isPrintResponseData = true, isSaveDb = false) @Log(title = "土豪榜单查询", businessType = BusinessType.OTHER, isPrintResponseData = true, isSaveDb = false)
public R<List<RankNodeRecharge>> rechargeRank( public R<List<RankNodeRecharge>> rechargeRank(
@Parameter(description = "类型 1-上周 2-昨日 3-日榜 4-周榜 5-月榜 6-总榜") Integer type){ @Parameter(description = "类型 1-上周 2-昨日 3-日榜 4-周榜 5-月榜 6-总榜") Integer type){
if(type == null){
return R.ok(Collections.emptyList());
}
Long userId = LoginHelper.getUserId(); Long userId = LoginHelper.getUserId();
long lastLove = 0; long lastLove = 0;
List<RankNodeRecharge> rankNodeList = accountMapper.rankTotalPay(30); List<RankNodeRecharge> rankNodeList = accountMapper.rankTotalPay(30);
@@ -104,7 +101,7 @@ public class RankAppController {
RankNodeRecharge rankNodeRecharge = rankNodeList.get(i); RankNodeRecharge rankNodeRecharge = rankNodeList.get(i);
rankNodeRecharge.setValue(rankNodeRecharge.getMoney().setScale(0, RoundingMode.CEILING).longValue()); rankNodeRecharge.setValue(rankNodeRecharge.getMoney().setScale(0, RoundingMode.CEILING).longValue());
if(!rankNodeRecharge.getUserId().equals(userId)){ if(!rankNodeRecharge.getUserId().equals(userId)){
rankNodeRecharge.setAvatar(GenderEnum.WOMEN.getDefaultAvatar()); rankNodeRecharge.setAvatar(GenderEnum.MAN.getDefaultAvatar());
rankNodeRecharge.setNickname(minNickname(rankNodeRecharge.getNickname())); rankNodeRecharge.setNickname(minNickname(rankNodeRecharge.getNickname()));
rankNodeRecharge.setUserId(null); rankNodeRecharge.setUserId(null);
} }

12
ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UnionTotalServiceImpl.java
View File

@@ -11,6 +11,7 @@ import com.ruoyi.cai.mapper.UnionTotalMapper;
import com.ruoyi.cai.service.ConsumeLogService; import com.ruoyi.cai.service.ConsumeLogService;
import com.ruoyi.cai.service.UnionService; import com.ruoyi.cai.service.UnionService;
import com.ruoyi.cai.service.UnionTotalService; import com.ruoyi.cai.service.UnionTotalService;
import org.apache.ibatis.javassist.bytecode.stackmap.TypeData;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@@ -108,7 +109,9 @@ public class UnionTotalServiceImpl extends ServiceImpl<UnionTotalMapper, UnionTo
LocalDateTime maxTime = localDate.atTime(LocalTime.MAX); LocalDateTime maxTime = localDate.atTime(LocalTime.MAX);
List<UnionTotal> unionTotalList = unionTotalMapper.countUnionTotal(minTime, maxTime); List<UnionTotal> unionTotalList = unionTotalMapper.countUnionTotal(minTime, maxTime);
for (UnionTotal unionTotal : unionTotalList) { 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")); .eq(UnionTotal::getDataType, RankDataTypeEnum.DAY.getCode()).last("limit 1"));
if (one == null) { if (one == null) {
one = new UnionTotal(); one = new UnionTotal();
@@ -139,8 +142,11 @@ public class UnionTotalServiceImpl extends ServiceImpl<UnionTotalMapper, UnionTo
LocalDateTime maxTime = localDate.plusDays(6).atTime(LocalTime.MAX); LocalDateTime maxTime = localDate.plusDays(6).atTime(LocalTime.MAX);
List<UnionTotal> unionTotalList = unionTotalMapper.countUnionTotal(minTime, maxTime); List<UnionTotal> unionTotalList = unionTotalMapper.countUnionTotal(minTime, maxTime);
for (UnionTotal unionTotal : unionTotalList) { 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::getDataType, RankDataTypeEnum.WEEK.getCode()).last("limit 1")); .eq(UnionTotal::getUnionId, unionTotal.getUnionId())
.eq(UnionTotal::getCountDate, localDate)
.eq(UnionTotal::getDataType, RankDataTypeEnum.WEEK.getCode())
.last("limit 1"));
if (one == null) { if (one == null) {
one = new UnionTotal(); one = new UnionTotal();
one.setUnionId(unionTotal.getUnionId()); one.setUnionId(unionTotal.getUnionId());