From 8093bf217b5dbe59a5703b013f3fc79ed0d4fc36 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期六, 11 一月 2025 18:06:03 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/qijisheng
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShareController.java | 47 ++++++++++++++++++++++++++++++++++-------------
1 files changed, 34 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 b26b0fa..3c4c9bf 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
@@ -15,6 +15,8 @@
import com.ruoyi.other.enums.ShareAddType;
import com.ruoyi.other.enums.ShareAuditStatus;
import com.ruoyi.other.service.ShareService;
+import com.ruoyi.system.api.domain.SysUser;
+import com.ruoyi.system.api.feignClient.SysUserClient;
import com.ruoyi.system.api.model.LoginUser;
import io.swagger.annotations.*;
import org.springframework.web.bind.annotation.*;
@@ -42,6 +44,10 @@
private AppUserClient appUserClient;
@Resource
private ShopClient shopClient;
+ @Resource
+ private SysUserClient sysUserClient;
+
+
/**
* 分享列表
@@ -52,8 +58,9 @@
})
@GetMapping("/list")
public R<List<Share>> list(@RequestParam Integer objectId) {
- return R.ok(shareService.list(new LambdaQueryWrapper<Share>()
- .eq(Share::getObjectId, 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));
+ return R.ok(list);
}
@@ -62,7 +69,7 @@
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)));
+ .eq(Share::getObjectId, userid).or().eq(Share::getAddType, 1).eq(Share::getAuditStatus, 1).eq(Share::getDelFlag, 0)));
}
@@ -77,7 +84,7 @@
share.setAuditStatus(ShareAuditStatus.WAIT.getCode());
} else if (share.getAddType() == 2) {
share.setAuditStatus(ShareAuditStatus.WAIT.getCode());
- share.setObjectId(userid.toString());
+ share.setObjectId(userid);
}
share.setDelFlag(0);
share.setAppletShare(1);
@@ -121,10 +128,14 @@
public R<Void> manage(@RequestBody Share share) {
LoginUser loginUser = SecurityUtils.getLoginUser();
Long userid = loginUser.getSysUser().getUserId();
- share.setAddType(1);
+ SysUser sysUser = sysUserClient.getSysUser(userid).getData();
+ share.setAddType(sysUser.getRoleType() == 1 ? 1 : 3);
share.setAppletShare(0);
share.setAuditStatus(ShareAuditStatus.SUCCESS.getCode());
- share.setObjectId(userid.toString());
+ if(sysUser.getRoleType() == 2){
+ share.setObjectId(sysUser.getObjectId().longValue());
+ }
+ share.setAuditStatus(0);
share.setDelFlag(0);
shareService.save(share);
return R.ok();
@@ -133,7 +144,6 @@
@ApiOperation(value = "广告管理-分享管理-编辑", tags = {"管理后台"})
@PostMapping("/manage/edit")
public R<Void> manageedit(@RequestBody Share share) {
-
shareService.updateById(share);
return R.ok();
}
@@ -141,7 +151,6 @@
@ApiOperation(value = "广告管理-分享管理-删除", tags = {"管理后台"})
@GetMapping("/manage/delete")
public R<Void> managedelete(@RequestParam Integer id) {
-
shareService.removeById(id);
return R.ok();
}
@@ -150,11 +159,15 @@
@GetMapping("/manage/list")
public R<Page<Share>> managelist(String name, Integer addType, @RequestParam Integer pageNum, Integer pageSize) {
//判断当前登陆人是平台还是门店
- if (tokenService.getLoginUser().getSysUser().getRoleType()==1) {
- Page<Share> page = shareService.lambdaQuery().eq(Share::getAuditStatus, 1).like(name != null, Share::getName, name).eq(addType != null, Share::getAddType, addType).page(Page.of(pageNum, 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)
+ .eq(Share::getAddType, 1).page(Page.of(pageNum, pageSize));
return R.ok(page);
}else {
- Page<Share> page = shareService.lambdaQuery().eq(Share::getAddType,3).eq(Share::getObjectId, tokenService.getLoginUser().getSysUser().getObjectId()).like(name != null, Share::getName, name).eq(addType != null, Share::getAddType, addType).page(Page.of(pageNum, pageSize));
+ Page<Share> page = shareService.lambdaQuery().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);
}
}
@@ -181,7 +194,8 @@
@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).page(Page.of(pageNum, 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));
for (Share record : page.getRecords()) {
if (record.getAddType() == 2) {
AppUser appUserById = appUserClient.getAppUserById(Long.valueOf(record.getObjectId()));
@@ -191,7 +205,7 @@
}
}
if (record.getAddType() == 3) {
- R<Shop> shopById = shopClient.getShopById(Integer.valueOf(record.getObjectId()));
+ R<Shop> shopById = shopClient.getShopById(record.getObjectId().intValue());
if (shopById.getData() != null) {
record.setAuthName(shopById.getData().getName());
}
@@ -218,5 +232,12 @@
}
+ @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"));
+ return R.ok(one);
+ }
+
}
--
Gitblit v1.7.1