新增优化

mitao

2024-09-04 ecca9ab70a9a87bcb60977c92fbf81053b8fc1bb

 ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/EvaluateController.java

@@ -2,11 +2,18 @@


import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.admin.entity.User;
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 +24,9 @@
import org.springframework.web.bind.annotation.RestController;

import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;

/**
 * <p>
@@ -33,6 +43,10 @@

    @Resource
    private EvaluateClient evaluateClient;
    @Resource
    private TokenService tokenService;
    @Resource
    private UserService userService;

    /**
     * 订单评价分页列表
@@ -40,7 +54,7 @@
     * @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 +67,44 @@
    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);
        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 +112,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 +127,7 @@
     *
     * @param ids 订单评价多条id拼接
     */
    @RequiresPermissions("order_evaluate")
    @RequiresPermissions(value = {"user_detail", "evaluate_delete"}, logical = Logical.OR)
    @ApiOperation(value = "批量删除订单评价", tags = {"后台-系统设置-订单评价管理"})
    @GetMapping(value = "/batchDelete")
    @ApiImplicitParams({