From d7b3c61e01aadf99ce6a1d8ebf18c4e6dd81cc2b Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期四, 12 十二月 2024 18:05:34 +0800
Subject: [PATCH] 12.12
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShareController.java | 42 +++++++++++++++++++++++++++++++++++++-----
1 files changed, 37 insertions(+), 5 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 eb46d75..887c1c1 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;
@@ -37,6 +41,10 @@
private ShareService shareService;
@Resource
private TokenService tokenService;
+ @Resource
+ private AppUserClient appUserClient;
+ @Resource
+ private ShopClient shopClient;
/**
* 分享列表
@@ -143,10 +151,9 @@
@ApiOperation(value = "列表", tags = {"后台-分享管理"})
@GetMapping("/manage/list")
- public R<Void> managelist(String name,Integer addType,@RequestParam Integer PageNum,Integer pageSize){
-
- shareService.lambdaQuery().like(name!=null,Share::getName,name).eq(addType!=null,Share::getAddType,addType).page(Page.of(pageSize,pageSize));
- return R.ok();
+ 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 = {"后台-分享管理"})
@@ -156,14 +163,39 @@
List<Share> list = shareService.lambdaQuery().list();
if (!list.isEmpty()){
for (Share share : list) {
-
+ share.setAppletShare(0);
}
+ shareService.updateBatchById(list);
}
//设置小程序分享
+ Share byId = shareService.getById(id);
+ byId.setAppletShare(1);
+ shareService.updateById(byId);
return R.ok();
}
+ @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));
+ 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