From 1f09f6daaf73bc83cceb4ae22b862b7b365635cf Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 03 四月 2025 19:59:17 +0800
Subject: [PATCH] 修改反馈文档bug
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShareController.java | 91 ++++++++++++++++++++++++++-------------------
1 files changed, 53 insertions(+), 38 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..1ec67ed 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
@@ -32,6 +32,7 @@
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.List;
+import java.util.Set;
import java.util.stream.Collectors;
/**
@@ -76,7 +77,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 +87,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 +106,6 @@
share.setObjectId(userid);
}
share.setDelFlag(0);
- share.setAppletShare(1);
share.setCreateTime(LocalDateTime.now());
shareService.save(share);
return R.ok();
@@ -149,9 +150,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);
@@ -232,6 +237,7 @@
@RequestParam Integer pageNum,
Integer pageSize) {
+ List<Integer> shopIds = new ArrayList<>();
List<Long> userIds = new ArrayList<>();
if (StringUtils.isNotEmpty(authName)){
R<List<AppUser>> uR = appUserClient.getAppUserByName(authName);
@@ -240,7 +246,11 @@
return R.ok(Page.of(pageNum, pageSize));
}
userIds.addAll(userList.stream().map(AppUser::getId).collect(Collectors.toList()));
-
+ //门店名称
+ Set<Integer> integers = shopClient.getShopIdByName(authName).getData();
+ if(null != integers){
+ shopIds.addAll(integers);
+ }
}
if (StringUtils.isNotEmpty(authPhone)){
R<List<AppUser>> uR = appUserClient.getAppUserByPhone(authPhone);
@@ -249,20 +259,15 @@
return R.ok(Page.of(pageNum, pageSize));
}
userIds.addAll(userList.stream().map(AppUser::getId).collect(Collectors.toList()));
+ //获取门店
+ for (AppUser appUser : userList) {
+ List<Shop> data = shopClient.getShopByUserId(appUser.getId()).getData();
+ if(null != data && data.size() > 0){
+ shopIds.addAll(data.stream().map(Shop::getId).collect(Collectors.toList()));
+ }
+ }
}
-
-
-
- Page<Share> page = shareService.lambdaQuery()
- .ne(Share::getAuditStatus, 1)
- .like(name != null, Share::getName, name)
- .eq(addType != null, Share::getAddType, addType)
- .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));
+ Page<Share> page = shareService.authmanagelist(name, addType, auditStatus, userIds, shopIds, pageNum, pageSize);
for (Share record : page.getRecords()) {
if (record.getAddType() == 2) {
AppUser appUserById = appUserClient.getAppUserById(Long.valueOf(record.getObjectId()));
@@ -302,7 +307,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)){
@@ -310,33 +316,42 @@
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);
- //添加积分流水
- 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){
+ 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);
+ userPoint.setVariablePoint(everySharePoint);
+ userPoint.setCreateTime(LocalDateTime.now());
+ userPoint.setAppUserId(appUser.getId());
+ userPoint.setChangeDirection(1);
+ userPointClient.saveUserPoint(userPoint);
+ }
}
}
}
return R.ok(one);
}
+
+ //appUserShare/
+ @GetMapping("/saveAppUserShare")
+ public R<Share> saveAppUserShare() {
+ return getAppletShare();
+ }
+
}
--
Gitblit v1.7.1