From 07b70a81dd94f638d31108c2029b44c26f6dde69 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期三, 15 一月 2025 09:58:42 +0800
Subject: [PATCH] 12.18
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShareController.java | 79 +++++++++++++++++++++++++++++++++++----
1 files changed, 70 insertions(+), 9 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 e33754c..5097827 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
@@ -25,11 +25,14 @@
import com.ruoyi.system.api.feignClient.SysUserClient;
import com.ruoyi.system.api.model.LoginUser;
import io.swagger.annotations.*;
+import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.time.LocalDateTime;
+import java.util.ArrayList;
import java.util.List;
+import java.util.stream.Collectors;
/**
* <p>
@@ -70,7 +73,10 @@
@GetMapping("/list")
public R<List<Share>> list(@RequestParam Integer objectId) {
List<Share> list = shareService.list(new LambdaQueryWrapper<Share>()
- .eq(Share::getObjectId, objectId).eq(Share::getDelFlag, 0).or().eq(Share::getAddType, 1).eq(Share::getDelFlag, 0));
+ .eq(Share::getObjectId, objectId)
+ .eq(Share::getDelFlag, 0).or()
+ .eq(Share::getAddType, 1)
+ .eq(Share::getDelFlag, 0));
return R.ok(list);
}
@@ -99,6 +105,7 @@
}
share.setDelFlag(0);
share.setAppletShare(1);
+ share.setCreateTime(LocalDateTime.now());
shareService.save(share);
return R.ok();
}
@@ -142,11 +149,15 @@
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.setAuditStatus(ShareAuditStatus.WAIT.getCode());
share.setDelFlag(0);
shareService.save(share);
return R.ok();
@@ -155,6 +166,9 @@
@ApiOperation(value = "广告管理-分享管理-编辑", tags = {"管理后台"})
@PostMapping("/manage/edit")
public R<Void> manageedit(@RequestBody Share share) {
+ if (null == share.getAuditStatus() || share.getAuditStatus()==2){
+ share.setAuditStatus(0);
+ }
shareService.updateById(share);
return R.ok();
}
@@ -168,16 +182,27 @@
@ApiOperation(value = "广告管理-分享管理-列表", tags = {"管理后台"})
@GetMapping("/manage/list")
- public R<Page<Share>> managelist(String name, Integer addType, @RequestParam Integer pageNum, Integer pageSize) {
+ public R<Page<Share>> managelist(String name,
+ Integer addType,
+ Integer auditStatus,
+ @RequestParam Integer pageNum, Integer pageSize) {
//判断当前登陆人是平台还是门店
Long userid = tokenService.getLoginUser().getUserid();
SysUser sysUser = sysUserClient.getSysUser(userid).getData();
if (sysUser.getRoleType()==1) {
- Page<Share> page = shareService.lambdaQuery().eq(Share::getAuditStatus, 1).eq(Share::getDelFlag, 0).like(name != null, Share::getName, name)
+ Page<Share> page = shareService.lambdaQuery()
+ .eq(Share::getAuditStatus, 1)
+ .eq(Share::getDelFlag, 0)
+ .like(name != null, Share::getName, name)
+ .eq(addType != null , Share::getAddType, addType)
.page(Page.of(pageNum, pageSize));
return R.ok(page);
}else {
- Page<Share> page = shareService.lambdaQuery().eq(Share::getAddType,3).eq(Share::getDelFlag, 0).eq(Share::getObjectId, sysUser.getObjectId())
+ Page<Share> page = shareService.lambdaQuery()
+ .eq(auditStatus!= null, Share::getAuditStatus, auditStatus)
+ .eq(Share::getAddType,3)
+ .eq(Share::getDelFlag, 0)
+ .eq(Share::getObjectId, sysUser.getObjectId())
.like(name != null, Share::getName, name).page(Page.of(pageNum, pageSize));
return R.ok(page);
}
@@ -204,9 +229,45 @@
@ApiOperation(value = "广告管理-分享管理-审核列表", tags = {"管理后台"})
@GetMapping("/manage/auth/list")
- public R<Page<Share>> authmanagelist(String name, Integer addType, @RequestParam Integer pageNum, Integer pageSize) {
- Page<Share> page = shareService.lambdaQuery().ne(Share::getAuditStatus, 1).like(name != null, Share::getName, name)
- .eq(addType != null, Share::getAddType, addType).eq(Share::getDelFlag, 0).orderByAsc(Share::getAuditStatus).page(Page.of(pageNum, pageSize));
+ public R<Page<Share>> authmanagelist(String name,
+ Integer addType,
+ String authName,
+ String authPhone,
+ Integer auditStatus,
+ @RequestParam Integer pageNum,
+ Integer pageSize) {
+
+ List<Long> userIds = new ArrayList<>();
+ if (StringUtils.isNotEmpty(authName)){
+ R<List<AppUser>> uR = appUserClient.getAppUserByName(authName);
+ List<AppUser> userList = uR.getData();
+ if (CollectionUtils.isEmpty(userList)){
+ return R.ok(Page.of(pageNum, pageSize));
+ }
+ userIds.addAll(userList.stream().map(AppUser::getId).collect(Collectors.toList()));
+
+ }
+ if (StringUtils.isNotEmpty(authPhone)){
+ R<List<AppUser>> uR = appUserClient.getAppUserByPhone(authPhone);
+ List<AppUser> userList = uR.getData();
+ if (CollectionUtils.isEmpty(userList)){
+ return R.ok(Page.of(pageNum, pageSize));
+ }
+ userIds.addAll(userList.stream().map(AppUser::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));
for (Share record : page.getRecords()) {
if (record.getAddType() == 2) {
AppUser appUserById = appUserClient.getAppUserById(Long.valueOf(record.getObjectId()));
--
Gitblit v1.7.1