liujie
2023-10-26 e030255c23c7ba3e2cbad1036a810d6d72fa864f
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TFinanceController.java
@@ -148,6 +148,9 @@
        query.setProvince(province);
        query.setCity(city);
        query.setStoreId(storeId);
        if(UserExt.getUser().getObjectType()==3){
            query.setStoreId(UserExt.getUser().getObjectId());
        }
        query.setRegisterTime(registerTime);
        query.setUserName(userName);
        query.setUserIds(Lists.newArrayList());
@@ -225,7 +228,7 @@
    public String income(Model model) {
        Integer objectType = UserExt.getUser().getObjectType();
        model.addAttribute("roleType",objectType);
        return PREFIX + "income.html";
        return PREFIX + "Income.html";
    }
    /**
     * 获取收入管理列表
@@ -356,6 +359,9 @@
                        }
                        TAppUser tAppUser = appUserClient.queryById(competition.getAppUserId());
                        Competition competition1 = competitionClient.queryById(competition.getCompetitionId());
                        if (!competition1.getStoreId().equals("")){
                            String[] split = competition1.getStoreId().split(",");
                        }
                        Store store = storeClient.getStoreById(Integer.valueOf(competition1.getStoreId()));
                        IncomeVO temp = new IncomeVO();
                        temp.setId(competition.getId().intValue());
@@ -601,6 +607,9 @@
        coachQuery.setCoachName(coachName);
        coachQuery.setCourseName(courseName);
        coachQuery.setTime(beginTime);
        if(UserExt.getUser().getObjectType()==3){
            coachQuery.setStoreId(UserExt.getUser().getObjectId());
        }
        return cancelledClassesClient.listAll(coachQuery);
    }
    /**
@@ -614,6 +623,9 @@
        query.setProvince(province);
        query.setCity(city);
        query.setStoreId(storeId);
        if(UserExt.getUser().getObjectType()==3){
            query.setStoreId(UserExt.getUser().getObjectId());
        }
        query.setRegisterTime(registerTime);
        query.setUserName(userName);
        query.setUserIds(Lists.newArrayList());
@@ -635,8 +647,9 @@
        if (userIds.size()==0){
            return new ArrayList<>();
        }
        List<RegisterOrderVO> registerOrderVOS = coursePackagePaymentClient.listAllRegister(query);
        return coursePackagePaymentClient.listAllRegister(query);
        return registerOrderVOS;
    }