加盟商设置是否隐藏

xuhy

3 天以前 d0c0c232e4f1c5551619cae25a8c3a75fd232f4b

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

@@ -544,8 +544,10 @@
        }
        orderQueryRequest.setServIds(servIds);
        Integer franchiseeId = loginUser.getSysUser().getFranchiseeId();
        Integer isDisplay = 0;
        if (franchiseeId!=null) {
            Franchisee byId = franchiseeService.getById(franchiseeId);
            isDisplay = byId.getIsDisplay();
            String[] siteIds = byId.getSiteIds().split(",");
            orderQueryRequest.setSiteIds(siteIds);
            if (loginUser.getIsFranchisee() && siteIds.length == 0) {
@@ -562,8 +564,22 @@


        R<List<Order>> result = orderClient.excelExport(orderQueryRequest);
        if(franchiseeId!=null){
            if(isDisplay == 0){
                for (Order datum : result.getData()) {
                    if(StringUtils.hasLength(datum.getServerName())){
                        datum.setServerName(datum.getServerName().charAt(0)+"***");
                    }
                    if(StringUtils.hasLength(datum.getServerPhone())){
                        datum.setServerPhone(around(datum.getServerPhone(), 3, 4));
                    }
                }
                return orderService.excelExport(result.getData(), response);
            }
            return orderService.excelExport(result.getData(), response);
        }
        for (Order datum : result.getData()) {
            if(StringUtils.hasLength(datum.getServerName())){
            if(StringUtils.hasLength(datum.getServerName()) && !"admin".equals(loginUser.getSysUser().getAccount())){
                datum.setServerName(datum.getServerName().charAt(0)+"***");
            }
            if(StringUtils.hasLength(datum.getServerPhone())){
@@ -612,13 +628,7 @@
     */
    @RequiresPermissions("order_count")
    @ApiOperation(value = "订单统计", tags = {"后台-订单管理"})
    @GetMapping(value = "/orderCount")
    @ApiImplicitParams({
            @ApiImplicitParam(value = "师傅姓名", name = "name", dataType = "String"),
            @ApiImplicitParam(value = "师傅电话", name = "phone", dataType = "String"),
            @ApiImplicitParam(value = "页码", name = "pageNum", dataType = "Integer", required = true),
            @ApiImplicitParam(value = "每页条数", name = "pageSize", dataType = "Integer", required = true)
    })
    @PostMapping(value = "/orderCount")
    public R<Page<OrderCountVO>> orderCount(@RequestBody OrderCountDataRequest orderCountDataRequest) {
        LoginUser loginUser = tokenService.getLoginUser();
        if (null == loginUser) {