From c90a8ac772937f8f084356ea1f04c5dba1d9e5d5 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期五, 24 一月 2025 11:15:33 +0800
Subject: [PATCH] 12.18
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShareController.java | 35 +++++++++++++++++++++--------------
1 files changed, 21 insertions(+), 14 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 b7ca926..5afd78e 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
@@ -76,7 +76,7 @@
.eq(Share::getObjectId, objectId)
.eq(Share::getDelFlag, 0).or()
.eq(Share::getAddType, 1)
- .eq(Share::getDelFlag, 0));
+ .eq(Share::getDelFlag, 0).orderByDesc(Share::getCreateTime));
return R.ok(list);
}
@@ -86,7 +86,8 @@
public R<List<Share>> recommandlist() {
Long userid = tokenService.getLoginUserApplet().getUserid();
return R.ok(shareService.list(new LambdaQueryWrapper<Share>().eq(Share::getAddType, 2)
- .eq(Share::getObjectId, userid).or().eq(Share::getAddType, 1).eq(Share::getAuditStatus, 1).eq(Share::getDelFlag, 0)));
+ .eq(Share::getObjectId, userid).or().eq(Share::getAddType, 1).eq(Share::getAuditStatus, 1)
+ .eq(Share::getDelFlag, 0).orderByDesc(Share::getCreateTime)));
}
@@ -104,7 +105,6 @@
share.setObjectId(userid);
}
share.setDelFlag(0);
- share.setAppletShare(1);
share.setCreateTime(LocalDateTime.now());
shareService.save(share);
return R.ok();
@@ -149,9 +149,13 @@
SysUser sysUser = sysUserClient.getSysUser(userid).getData();
share.setAddType(sysUser.getRoleType() == 1 ? 1 : 3);
share.setAppletShare(0);
- share.setAuditStatus(ShareAuditStatus.SUCCESS.getCode());
if(sysUser.getRoleType() == 2){
share.setObjectId(sysUser.getObjectId().longValue());
+ }
+ if (sysUser.getRoleType() == 1){
+ share.setAuditStatus(ShareAuditStatus.SUCCESS.getCode());
+ }else{
+ share.setAuditStatus(ShareAuditStatus.WAIT.getCode());
}
share.setDelFlag(0);
shareService.save(share);
@@ -302,7 +306,8 @@
@ApiOperation(value = "获取小程序分享数据", tags = {"小程序-分享"})
@GetMapping("/auth/getAppletShare")
public R<Share> getAppletShare(){
- Share one = shareService.getOne(new LambdaQueryWrapper<Share>().eq(Share::getDelFlag, 0).eq(Share::getAppletShare, 1).eq(Share::getAuditStatus, 1).last(" limit 0, 1"));
+ Share one = shareService.getOne(new LambdaQueryWrapper<Share>().eq(Share::getDelFlag, 0).eq(Share::getAppletShare, 1)
+ .eq(Share::getAuditStatus, 1).last(" limit 0, 1"));
//添加每日分享积分
String token = SecurityUtils.getToken(ServletUtils.getRequest());
if(StringUtils.isNotEmpty(token)){
@@ -322,15 +327,17 @@
appUser.setTotalPoint(appUser.getTotalPoint() + everySharePoint);
appUserClient.editAppUserById(appUser);
//添加积分流水
- 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);
+ 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);
+ }
}
}
--
Gitblit v1.7.1