11.6

无关风月

2025-04-22 67f416634f95c81e618123b826e18a57ae08220d

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

@@ -3,7 +3,9 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
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.exception.GlobalException;
@@ -29,6 +31,7 @@
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;
@@ -116,6 +119,8 @@
        return userService.updateBatchById(list) ? R.ok() : R.fail();
    }

    @Resource
    private FranchiseeService franchiseeService;
    /**
     * 用户所关联订单记录分页列表
     *
@@ -139,8 +144,72 @@
        if (null == loginUser) {
            return R.loginExpire("登录失效！");
        }
        R<Page<Order>> iPageR = orderClient.orderList(userId, pageNum, pageSize);
        return R.ok(iPageR.getData());

        List<String> cityList= new ArrayList<>();
        if (loginUser.getCityList()!=null) {
            cityList = loginUser.getCityList();
        }
        Integer franchiseeId = loginUser.getSysUser().getFranchiseeId();
        String[] siteIds = new String[0];
        if (franchiseeId!=null){
        Franchisee byId = franchiseeService.getById(franchiseeId);
        siteIds = byId.getSiteIds().split(",");
        if (loginUser.getIsFranchisee()&&siteIds.length==0){
            return R.ok();
        }
        }


        R<Page<Order>> iPageR = orderClient.orderList1(userId,cityList, pageNum, pageSize, Arrays.asList(siteIds));
        Page<Order> data = iPageR.getData();

            List<Order> records = data.getRecords();
            if (!records.isEmpty()) {
                for (Order record : records) {
                    if (record.getAddress() != null) {
                        record.setReservationAddress(record.getReservationAddress() + record.getAddress());
                    }

                }
            }

        return R.ok(data);
    }


    @ApiOperation(value = "师傅订单详情", tags = {"后台-师傅管理-师傅列表管理"})
    @GetMapping(value = "/workOrderList")
    @ApiImplicitParams({
            @ApiImplicitParam(value = "用户id", name = "workId", dataType = "Integer", required = true),
            @ApiImplicitParam(value = "页码", name = "pageNum", dataType = "Integer", required = true),
            @ApiImplicitParam(value = "每页条数", name = "pageSize", dataType = "Integer", required = true)
    })
    public R<IPage<Order>> workOrderList(@RequestParam("workId") Integer workId,
                                     @RequestParam(name = "pageNum", defaultValue = "1") Integer pageNum,
                                     @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
        LoginUser loginUser = tokenService.getLoginUser();
        if (null == loginUser) {
            return R.loginExpire("登录失效！");
        }

        Integer franchiseeId = loginUser.getSysUser().getFranchiseeId();
        String [] siteIds = new String[0];
        if (franchiseeId!=null) {
            Franchisee byId = franchiseeService.getById(franchiseeId);
            siteIds = byId.getSiteIds().split(",");
            if (loginUser.getIsFranchisee() && siteIds.length == 0) {
                return R.ok(new Page<Order>());
            }
        }
        R<Page<Order>> iPageR = orderClient.workOrderList(workId, pageNum, pageSize,siteIds);
        Page<Order> data = iPageR.getData();
        List<Order> records = data.getRecords();
        for (Order record : records) {
            if (record.getAddress()!=null) {
                record.setReservationAddress(record.getReservationAddress() + record.getAddress());
            }
        }
        return R.ok(data);
    }

    /**
@@ -162,7 +231,18 @@
    public R<Page<EvaluatePageVO>> evaluateList(Integer userId,
                                                @RequestParam(name = "pageNum", defaultValue = "1") Integer pageNum,
                                                @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
        return evaluateClient.evaluateList(userId, pageNum, pageSize);
        LoginUser loginUser = tokenService.getLoginUser();
        List<String> cityList = loginUser.getCityList();
        Integer franchiseeId = loginUser.getSysUser().getFranchiseeId();
        String[] siteIds = new String[0];
        if (franchiseeId!=null) {
            Franchisee byId = franchiseeService.getById(franchiseeId);
            siteIds  = byId.getSiteIds().split(",");
            if (loginUser.getIsFranchisee() && siteIds.length == 0) {
                return R.ok(new Page<>());
            }
        }
        return evaluateClient.evaluateList1(cityList,userId, pageNum, pageSize,Arrays.asList(siteIds));
    }

    /**
@@ -176,7 +256,7 @@
    @ApiImplicitParams({
            @ApiImplicitParam(value = "评价记录id", name = "id", dataType = "Integer", required = true)
    })
    public R<String> deleteEvaluateRecord(@RequestParam Integer id) {
    public R<String> deleteEvaluateRecord(@RequestParam Long id) {
        return evaluateClient.batchDelete(String.valueOf(id));
    }

@@ -234,7 +314,22 @@
    public R<Page<UserWithdrawRecordVO>> withdrawList(@RequestParam Integer userId,
                                                      @RequestParam(name = "pageNum", defaultValue = "1") Integer pageNum,
                                                      @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
        return withdrawClient.withdrawList(userId, pageNum, pageSize);
        LoginUser loginUser = tokenService.getLoginUser();
        List<String> cityList = new ArrayList<>();
        if (loginUser.getCityList()!=null) {
          cityList = loginUser.getCityList();
        }
        Integer franchiseeId = loginUser.getSysUser().getFranchiseeId();
        String[] siteIds = new String[0];
        if (franchiseeId!=null){
            Franchisee byId = franchiseeService.getById(franchiseeId);
            siteIds = byId.getSiteIds().split(",");
            if (loginUser.getIsFranchisee()&&siteIds.length==0){
                return R.ok();
            }
        }

        return withdrawClient.withdrawList1(cityList,userId, pageNum, pageSize,Arrays.asList(siteIds));
    }

    /**
@@ -248,7 +343,7 @@
    @ApiImplicitParams({
            @ApiImplicitParam(value = "提现记录id", name = "id", dataType = "Integer", required = true)
    })
    public R<String> deleteWithdrawRecord(@RequestParam Integer id) {
    public R<String> deleteWithdrawRecord(@RequestParam Long id) {
        return withdrawClient.batchDelete(String.valueOf(id));
    }