From f615ec5c9239327740948501627545f8e78e2a9e Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 18 三月 2025 09:07:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShareController.java | 41 ++++++++++++++++++++++++++++-------------
1 files changed, 28 insertions(+), 13 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 5afd78e..231e8f9 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()
@@ -264,7 +274,6 @@
.eq(auditStatus != null, Share::getAuditStatus, auditStatus)
.in(!CollectionUtils.isEmpty(userIds),Share::getObjectId, userIds)
.eq(Share::getDelFlag, 0)
- .orderByAsc(Share::getAuditStatus)
.orderByDesc(Share::getCreateTime)
.page(Page.of(pageNum, pageSize));
for (Share record : page.getRecords()) {
@@ -315,7 +324,8 @@
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();
@@ -327,23 +337,28 @@
appUser.setTotalPoint(appUser.getTotalPoint() + everySharePoint);
appUserClient.editAppUserById(appUser);
//添加积分流水
- if(everySharePoint > 0){
- UserPoint userPoint = new UserPoint();
- userPoint.setAppUserId(userid);
- userPoint.setType(4);
- userPoint.setHistoricalPoint(lavePoint);
- userPoint.setVariablePoint(everySharePoint);
- userPoint.setBalance(appUser.getLavePoint());
- userPoint.setCreateTime(LocalDateTime.now());
- userPoint.setAppUserId(appUser.getId());
- userPointClient.saveUserPoint(userPoint);
- }
+ UserPoint userPoint = new UserPoint();
+ userPoint.setAppUserId(userid);
+ userPoint.setType(4);
+ userPoint.setHistoricalPoint(lavePoint);
+ userPoint.setVariablePoint(everySharePoint);
+ userPoint.setBalance(appUser.getLavePoint());
+ userPoint.setCreateTime(LocalDateTime.now());
+ userPoint.setAppUserId(appUser.getId());
+ userPointClient.saveUserPoint(userPoint);
}
}
}
return R.ok(one);
}
+
+ //appUserShare/
+ @GetMapping("/saveAppUserShare")
+ public R<Share> saveAppUserShare() {
+ return getAppletShare();
+ }
+
}
--
Gitblit v1.7.1