From 69f4e7bafd3d81696aa00affd6b9ddfa6b50503f Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期六, 08 二月 2025 13:36:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShareController.java | 39 ++++++++++++++++++++++-----------------
1 files changed, 22 insertions(+), 17 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 ac51e0e..4f944f3 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,11 +149,14 @@
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());
}
- share.setAuditStatus(0);
+ if (sysUser.getRoleType() == 1){
+ share.setAuditStatus(ShareAuditStatus.SUCCESS.getCode());
+ }else{
+ share.setAuditStatus(ShareAuditStatus.WAIT.getCode());
+ }
share.setDelFlag(0);
shareService.save(share);
return R.ok();
@@ -162,7 +165,7 @@
@ApiOperation(value = "广告管理-分享管理-编辑", tags = {"管理后台"})
@PostMapping("/manage/edit")
public R<Void> manageedit(@RequestBody Share share) {
- if (share.getAuditStatus()==2){
+ if (null == share.getAuditStatus() || share.getAuditStatus()==2){
share.setAuditStatus(0);
}
shareService.updateById(share);
@@ -261,7 +264,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()) {
@@ -303,7 +305,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)){
@@ -323,15 +326,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