From ff811ae8df41273d7ab0011b6b7f1f278f03bbd2 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期四, 12 十二月 2024 18:06:05 +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, 30 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 8457f06..befed00 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
@@ -3,11 +3,15 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.account.api.feignClient.AppUserClient;
+import com.ruoyi.account.api.model.AppUser;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.web.controller.BaseController;
import com.ruoyi.common.security.service.TokenService;
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.other.api.domain.Share;
+import com.ruoyi.other.api.domain.Shop;
+import com.ruoyi.other.api.feignClient.ShopClient;
import com.ruoyi.other.enums.ShareAddType;
import com.ruoyi.other.enums.ShareAuditStatus;
import com.ruoyi.other.service.ShareService;
@@ -29,7 +33,7 @@
* @author luodangjia
* @since 2024-11-20
*/
-@Api(tags = "分享")
+@Api("分享")
@RestController
@RequestMapping("/share")
public class ShareController extends BaseController {
@@ -37,6 +41,10 @@
private ShareService shareService;
@Resource
private TokenService tokenService;
+ @Resource
+ private AppUserClient appUserClient;
+ @Resource
+ private ShopClient shopClient;
/**
* 分享列表
@@ -112,7 +120,7 @@
}
- @ApiOperation(value = "添加", tags = {"后台管理-分享管理"})
+ @ApiOperation(value = "广告管理-分享管理-添加", tags = {"管理后台"})
@PostMapping("/manage/add")
public R<Void> manage(@RequestBody Share share){
LoginUser loginUser = SecurityUtils.getLoginUser();
@@ -125,7 +133,7 @@
return R.ok();
}
- @ApiOperation(value = "编辑", tags = {"后台管理-分享管理"})
+ @ApiOperation(value = "广告管理-分享管理-编辑", tags = {"管理后台"})
@PostMapping("/manage/edit")
public R<Void> manageedit(@RequestBody Share share){
@@ -133,7 +141,7 @@
return R.ok();
}
- @ApiOperation(value = "删除", tags = {"后台管理-分享管理"})
+ @ApiOperation(value = "广告管理-分享管理-删除", tags = {"管理后台"})
@GetMapping("/manage/delete")
public R<Void> managedelete(@RequestParam Integer id){
@@ -141,14 +149,14 @@
return R.ok();
}
- @ApiOperation(value = "列表", tags = {"后台管理-分享管理"})
+ @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);
}
- @ApiOperation(value = "设为小程序分享", tags = {"后台管理-分享管理"})
+ @ApiOperation(value = "广告管理-分享管理-设为小程序分享", tags = {"管理后台"})
@GetMapping("/manage/set")
public R<Void> set(@RequestParam Integer id){
//将所有分享设为不是小程序分享
@@ -167,10 +175,23 @@
}
- @ApiOperation(value = "列表", tags = {"后台管理-分享管理-审核"})
+ @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(pageSize, 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).page(Page.of(pageNum, pageSize));
+ for (Share record : page.getRecords()) {
+ if (record.getAddType()==2) {
+ AppUser appUserById = appUserClient.getAppUserById(Long.valueOf(record.getObjectId()));
+ 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){
+ record.setAuthName(shopById.getData().getName());
+ }
+ }
+ }
return R.ok(page);
}
--
Gitblit v1.7.1