From eb428cb6839049970e67264f4eafc612e5bcaa38 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 18 三月 2025 15:14:20 +0800
Subject: [PATCH] 修改统计bug
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShareController.java | 38 ++++++++++++++++++++++++++++----------
1 files changed, 28 insertions(+), 10 deletions(-)
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShareController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShareController.java
index 4f944f3..57ba325 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShareController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShareController.java
@@ -255,6 +255,16 @@
userIds.addAll(userList.stream().map(AppUser::getId).collect(Collectors.toList()));
}
+ List<Share> list = shareService.list();
+ if (CollectionUtils.isEmpty(list)){
+ return R.ok(Page.of(pageNum, pageSize));
+ }
+ List<Long> objectIds = list.stream().map(Share::getObjectId).distinct().collect(Collectors.toList());
+ List<AppUser> appUsers = appUserClient.listByIds(objectIds);
+ List<Long> appUserIds = appUsers.stream().filter(item -> !item.getDelFlag()).map(AppUser::getId).collect(Collectors.toList());
+ if (CollectionUtils.isEmpty(userIds)){
+ userIds = appUserIds;
+ }
Page<Share> page = shareService.lambdaQuery()
@@ -314,19 +324,20 @@
Boolean data = userPointClient.judgmentDailyShare(userid).getData();
if(!data){
AppUser appUser = appUserClient.getAppUserById(userid);
- PointSetting pointSetting = pointSettingService.getOne(new LambdaQueryWrapper<PointSetting>().eq(PointSetting::getId, appUser.getVipId()).eq(PointSetting::getDelFlag, 0));
+ PointSetting pointSetting = pointSettingService.getOne(new LambdaQueryWrapper<PointSetting>()
+ .eq(PointSetting::getId, appUser.getVipId()).eq(PointSetting::getDelFlag, 0));
if(null != pointSetting){
Integer everySharePoint = pointSetting.getEverySharePoint();
- Integer lavePoint = appUser.getLavePoint();
- appUser.setTotalSharePoint(appUser.getTotalSharePoint() + everySharePoint);
- appUser.setLavePoint(appUser.getLavePoint() + everySharePoint);
- appUser.setAvailablePoint(appUser.getAvailablePoint() + everySharePoint);
- appUser.setTransferablePoint(appUser.getTransferablePoint() + everySharePoint);
- appUser.setTotalAvailablePoint(appUser.getTotalAvailablePoint() + everySharePoint);
- appUser.setTotalPoint(appUser.getTotalPoint() + everySharePoint);
- appUserClient.editAppUserById(appUser);
- //添加积分流水
if(everySharePoint > 0){
+ Integer lavePoint = appUser.getLavePoint();
+ appUser.setTotalSharePoint(appUser.getTotalSharePoint() + everySharePoint);
+ appUser.setLavePoint(appUser.getLavePoint() + everySharePoint);
+ appUser.setAvailablePoint(appUser.getAvailablePoint() + everySharePoint);
+ appUser.setTransferablePoint(appUser.getTransferablePoint() + everySharePoint);
+ appUser.setTotalAvailablePoint(appUser.getTotalAvailablePoint() + everySharePoint);
+ appUser.setTotalPoint(appUser.getTotalPoint() + everySharePoint);
+ appUserClient.editAppUserById(appUser);
+ //添加积分流水
UserPoint userPoint = new UserPoint();
userPoint.setAppUserId(userid);
userPoint.setType(4);
@@ -343,6 +354,13 @@
}
return R.ok(one);
}
+
+ //appUserShare/
+ @GetMapping("/saveAppUserShare")
+ public R<Share> saveAppUserShare() {
+ return getAppletShare();
+ }
+
}
--
Gitblit v1.7.1