From 67f416634f95c81e618123b826e18a57ae08220d Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 22 四月 2025 17:55:30 +0800
Subject: [PATCH] 11.6
---
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/EvaluateController.java | 79 +++++++++++++++++++++++++++++++++++++--
1 files changed, 74 insertions(+), 5 deletions(-)
diff --git a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/EvaluateController.java b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/EvaluateController.java
index 50b526d..5937adf 100644
--- a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/EvaluateController.java
+++ b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/EvaluateController.java
@@ -2,11 +2,20 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.admin.entity.Franchisee;
+import com.ruoyi.admin.entity.User;
+import com.ruoyi.admin.service.FranchiseeService;
+import com.ruoyi.admin.service.UserService;
import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.utils.StringUtils;
+import com.ruoyi.common.security.annotation.Logical;
import com.ruoyi.common.security.annotation.RequiresPermissions;
+import com.ruoyi.common.security.service.TokenService;
import com.ruoyi.order.api.entity.Evaluate;
import com.ruoyi.order.api.entity.EvaluatePageVO;
import com.ruoyi.order.api.feignClient.EvaluateClient;
+import com.ruoyi.order.api.request.EvaluatePageRequest;
+import com.ruoyi.system.api.model.LoginUser;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -17,6 +26,10 @@
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
/**
* <p>
@@ -33,14 +46,19 @@
@Resource
private EvaluateClient evaluateClient;
-
+ @Resource
+ private TokenService tokenService;
+ @Resource
+ private UserService userService;
+ @Resource
+ private FranchiseeService franchiseeService;
/**
* 订单评价分页列表
*
* @param pageNum 页码
* @param pageSize 每页显示条数
*/
- @RequiresPermissions("order_evaluate")
+ @RequiresPermissions(value = {"user_detail", "order_evaluate"}, logical = Logical.OR)
@ApiOperation(value = "订单评价分页查询列表", tags = {"后台-系统设置-订单评价管理"})
@GetMapping(value = "/page")
@ApiImplicitParams({
@@ -53,7 +71,58 @@
public R<Page<EvaluatePageVO>> queryPageList(String userNo, String orderNumber, String workerName,
@RequestParam(name = "pageNum", defaultValue = "1") Integer pageNum,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
- return evaluateClient.queryPageList(userNo, orderNumber, workerName, pageNum, pageSize);
+ LoginUser loginUser = tokenService.getLoginUser();
+ if (null == loginUser) {
+ return R.loginExpire("登录失效！");
+ }
+ List<String> cityList = new ArrayList<>();
+ if (loginUser.getIsFranchisee()) {
+ cityList = loginUser.getCityList();
+ }
+ List<User> userList;
+ if (StringUtils.isNotBlank(userNo)) {
+ userList = userService.lambdaQuery().like(User::getNickname, userNo).list();
+ if (userList.isEmpty()){
+ Page<EvaluatePageVO> page = new Page<>();
+ return R.ok(page);
+ }
+ } else {
+ userList = new ArrayList<>();
+ }
+ List<Integer> userIdList = userList.stream().map(User::getId).collect(Collectors.toList());
+ EvaluatePageRequest evaluatePageRequest = new EvaluatePageRequest();
+ evaluatePageRequest.setUserNo(userNo);
+ evaluatePageRequest.setOrderNumber(orderNumber);
+ evaluatePageRequest.setWorkerName(workerName);
+ evaluatePageRequest.setCityList(cityList);
+ evaluatePageRequest.setPageNum(pageNum);
+ evaluatePageRequest.setPageSize(pageSize);
+ evaluatePageRequest.setUserIdList(userIdList);
+
+ Integer franchiseeId = loginUser.getSysUser().getFranchiseeId();
+ String[] siteIds = new String[0];
+ if (franchiseeId!=null) {
+ Franchisee byId = franchiseeService.getById(franchiseeId);
+ siteIds = byId.getSiteIds().split(",");
+ evaluatePageRequest.setSiteIds(Arrays.asList(siteIds));
+ if (loginUser.getIsFranchisee() && siteIds.length == 0) {
+ return R.ok(new Page<>());
+ }
+ }
+
+
+
+ R<Page<EvaluatePageVO>> r = evaluateClient.queryPageList(evaluatePageRequest);
+ if (!r.getData().getRecords().isEmpty()) {
+ for (EvaluatePageVO record : r.getData().getRecords()) {
+ Integer userId = record.getUserId();
+ User user = userService.getById(userId);
+ if (null != user) {
+ record.setUserNo(user.getNickname());
+ }
+ }
+ }
+ return r;
}
/**
@@ -61,7 +130,7 @@
*
* @param id 订单评价id
*/
- @RequiresPermissions("order_evaluate")
+ @RequiresPermissions(value = {"user_detail", "evaluate_detail"}, logical = Logical.OR)
@ApiOperation(value = "订单评价详情", tags = {"后台-系统设置-订单评价管理"})
@GetMapping(value = "/detail")
@ApiImplicitParams({
@@ -76,7 +145,7 @@
*
* @param ids 订单评价多条id拼接
*/
- @RequiresPermissions("order_evaluate")
+ @RequiresPermissions(value = {"user_detail", "evaluate_delete"}, logical = Logical.OR)
@ApiOperation(value = "批量删除订单评价", tags = {"后台-系统设置-订单评价管理"})
@GetMapping(value = "/batchDelete")
@ApiImplicitParams({
--
Gitblit v1.7.1