From 85384328c12fcc689e1f66f4deca77168859882d Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 10 一月 2025 19:12:39 +0800
Subject: [PATCH] 修改bug
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShareController.java | 122 +++++++++++++++++++++++++++-------------
1 files changed, 81 insertions(+), 41 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 befed00..66a2b62 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,11 +15,10 @@
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.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.*;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@@ -27,7 +26,7 @@
/**
* <p>
- * 前端控制器
+ * 前端控制器
* </p>
*
* @author luodangjia
@@ -45,6 +44,10 @@
private AppUserClient appUserClient;
@Resource
private ShopClient shopClient;
+ @Resource
+ private SysUserClient sysUserClient;
+
+
/**
* 分享列表
@@ -54,20 +57,20 @@
@ApiImplicitParam(value = "对象id(addType=1:平台添加，addType=2:推广人添加，addType=3:门店添加)", name = "objectId", required = true, dataType = "int"),
})
@GetMapping("/list")
- public R<List<Share>> list(@RequestParam Integer objectId){
- return R.ok(shareService.list(new LambdaQueryWrapper<Share>()
- .eq(Share::getObjectId, objectId)));
+ 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));
+ return R.ok(list);
}
@ApiOperation(value = "分享页列表", tags = {"小程序-推广中心"})
@GetMapping("/recommand/list")
- public R<List<Share>> recommandlist(){
+ 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)));
+ 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)));
}
-
/**
@@ -75,13 +78,13 @@
*/
@ApiOperation(value = "分享添加", tags = {"小程序-个人中心-门店管理"})
@PostMapping
- public R<Void> add(@RequestBody Share share){
+ public R<Void> add(@RequestBody Share share) {
Long userid = tokenService.getLoginUserApplet().getUserid();
- if (share.getAddType()==1) {
+ if (share.getAddType() == 1) {
share.setAuditStatus(ShareAuditStatus.WAIT.getCode());
- }else if (share.getAddType()==2){
+ } else if (share.getAddType() == 2) {
share.setAuditStatus(ShareAuditStatus.WAIT.getCode());
- share.setObjectId(userid.toString());
+ share.setObjectId(userid);
}
share.setDelFlag(0);
share.setAppletShare(1);
@@ -94,7 +97,7 @@
*/
@ApiOperation(value = "分享删除", tags = {"小程序-个人中心-门店管理"})
@DeleteMapping
- public R<Void> delete(@RequestBody Share share){
+ public R<Void> delete(@RequestBody Share share) {
shareService.removeById(share);
return R.ok();
}
@@ -104,7 +107,7 @@
*/
@ApiOperation(value = "分享编辑", tags = {"小程序-个人中心-门店管理"})
@PutMapping
- public R<Void> edit(@RequestBody Share share){
+ public R<Void> edit(@RequestBody Share share) {
share.setAuditStatus(ShareAuditStatus.WAIT.getCode());
shareService.updateById(share);
return R.ok();
@@ -115,19 +118,23 @@
*/
@ApiOperation(value = "分享详情", tags = {"小程序-个人中心-门店管理"})
@GetMapping("/detail/{id}")
- public R<Share> detail(@PathVariable("id") Integer id){
+ public R<Share> detail(@PathVariable("id") Integer id) {
return R.ok(shareService.getById(id));
}
@ApiOperation(value = "广告管理-分享管理-添加", tags = {"管理后台"})
@PostMapping("/manage/add")
- public R<Void> manage(@RequestBody Share share){
+ public R<Void> manage(@RequestBody Share share) {
LoginUser loginUser = SecurityUtils.getLoginUser();
Long userid = loginUser.getSysUser().getUserId();
- share.setAddType(1);
- share.setAuditStatus(ShareAuditStatus.SUCCESS.getCode());
- share.setObjectId(userid.toString());
+ 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.setDelFlag(0);
shareService.save(share);
return R.ok();
@@ -135,33 +142,41 @@
@ApiOperation(value = "广告管理-分享管理-编辑", tags = {"管理后台"})
@PostMapping("/manage/edit")
- public R<Void> manageedit(@RequestBody Share share){
-
+ public R<Void> manageedit(@RequestBody Share share) {
shareService.updateById(share);
return R.ok();
}
@ApiOperation(value = "广告管理-分享管理-删除", tags = {"管理后台"})
@GetMapping("/manage/delete")
- public R<Void> managedelete(@RequestParam Integer id){
-
+ public R<Void> managedelete(@RequestParam Integer id) {
shareService.removeById(id);
return R.ok();
}
@ApiOperation(value = "广告管理-分享管理-列表", tags = {"管理后台"})
@GetMapping("/manage/list")
- public R<Page<Share>> managelist(String name,Integer addType,@RequestParam Integer PageNum,Integer pageSize){
- Page<Share> page = shareService.lambdaQuery().eq(Share::getAuditStatus,1).like(name != null, Share::getName, name).eq(addType != null, Share::getAddType, addType).page(Page.of(pageSize, pageSize));
- return R.ok(page);
+ public R<Page<Share>> managelist(String name, Integer addType, @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)
+ .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::getDelFlag, 0).eq(Share::getObjectId, sysUser.getObjectId())
+ .like(name != null, Share::getName, name).page(Page.of(pageNum, pageSize));
+ return R.ok(page);
+ }
}
@ApiOperation(value = "广告管理-分享管理-设为小程序分享", tags = {"管理后台"})
@GetMapping("/manage/set")
- public R<Void> set(@RequestParam Integer id){
+ public R<Void> set(@RequestParam Integer id) {
//将所有分享设为不是小程序分享
List<Share> list = shareService.lambdaQuery().list();
- if (!list.isEmpty()){
+ if (!list.isEmpty()) {
for (Share share : list) {
share.setAppletShare(0);
}
@@ -177,17 +192,20 @@
@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));
+ 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));
for (Share record : page.getRecords()) {
- if (record.getAddType()==2) {
+ if (record.getAddType() == 2) {
AppUser appUserById = appUserClient.getAppUserById(Long.valueOf(record.getObjectId()));
- record.setAuthName(appUserById.getName());
- record.setAuthPhone(appUserById.getPhone());
+ if (appUserById!=null) {
+ record.setAuthName(appUserById.getName());
+ record.setAuthPhone(appUserById.getPhone());
+ }
}
- if (record.getAddType()==3) {
- R<Shop> shopById = shopClient.getShopById(Integer.valueOf(record.getObjectId()));
- if (shopById.getData()!=null){
+ if (record.getAddType() == 3) {
+ R<Shop> shopById = shopClient.getShopById(record.getObjectId().intValue());
+ if (shopById.getData() != null) {
record.setAuthName(shopById.getData().getName());
}
}
@@ -195,8 +213,30 @@
return R.ok(page);
}
+ @ApiOperation(value = "广告管理-分享管理-详情", tags = {"管理后台"})
+ @GetMapping("/manage/auth/detail")
+ public R<Share> authmanagelist(Integer id) {
+ Share byId = shareService.getById(id);
+ return R.ok(byId);
+ }
+
+ @ApiOperation(value = "广告管理-分享管理-审核", tags = {"管理后台"})
+ @GetMapping("/manage/auth/check")
+ public R<Share> authmanagecheck(Integer id, @ApiParam("1=审核通过，2=审核失败") Integer auditStatus, @ApiParam("备注") String auditMsg) {
+ Share byId = shareService.getById(id);
+ byId.setAuditStatus(auditStatus);
+ byId.setAuditMsg(auditMsg);
+ shareService.updateById(byId);
+ return R.ok(byId);
+ }
-
+ @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