更新bug修改

puzhibing

2024-02-05 640ff18d2d7f4be02ddb7f8f75e899f05545eb98

 cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TFinanceController.java

@@ -148,6 +148,7 @@
        query.setProvince(province);
        query.setCity(city);
        query.setStoreId(storeId);
        query.setInsertType(UserExt.getUser().getObjectType());
        if(UserExt.getUser().getObjectType()==2){
            List<Integer> operatorId = storeService.list(new QueryWrapper<TStore>()
                    .eq("operatorId", UserExt.getUser().getObjectId())).stream()
@@ -247,6 +248,12 @@
        RechargeRecordsQuery rechargeRecordsQuery = new RechargeRecordsQuery();
        // 报名课程查询query
        RegisterOrderQuery query = new RegisterOrderQuery();
        query.setInsertType(UserExt.getUser().getObjectType());
        if(UserExt.getUser().getObjectType()==2){
            query.setStoresIds(storeService.list(new QueryWrapper<TStore>()
                    .eq("operatorId",UserExt.getUser().getObjectId())
            ).stream().map(TStore::getId).collect(Collectors.toList()));
        }
        // 赛事活动查询query
        CompetitionQuery competitionQuery = new CompetitionQuery();
        // 会员支付查询query
@@ -404,6 +411,9 @@
                        IncomeVO temp = new IncomeVO();
                        TAppUser tAppUser = appUserClient.queryById(competition.getAppUserId());
                        Competition competition1 = competitionClient.queryById(competition.getCompetitionId());
                        if(null == competition1){
                            continue;
                        }
                        if (!competition1.getStoreId().equals("")){
                            String[] split = competition1.getStoreId().split(",");
                            List<Integer> list = new ArrayList<>();
@@ -490,6 +500,10 @@
        RechargeRecordsQuery rechargeRecordsQuery = new RechargeRecordsQuery();
        // 报名课程查询query
        RegisterOrderQuery query = new RegisterOrderQuery();
        query.setInsertType(UserExt.getUser().getObjectType());
        query.setStoresIds(storeService.list(new QueryWrapper<TStore>()
                .eq("operatorId",UserExt.getUser().getObjectId()))
        .stream().map(TStore::getId).collect(Collectors.toList()));
        // 赛事活动查询query
        CompetitionQuery competitionQuery = new CompetitionQuery();
        // 会员支付查询query
@@ -652,6 +666,9 @@
                    IncomeVO temp = new IncomeVO();
                    TAppUser tAppUser = appUserClient.queryById(competition.getAppUserId());
                    Competition competition1 = competitionClient.queryById(competition.getCompetitionId());
                    if(null == competition1){
                        continue;
                    }
                    if (!competition1.getStoreId().equals("")){
                        String[] split = competition1.getStoreId().split(",");
                        List<Integer> list = new ArrayList<>();
@@ -758,6 +775,13 @@
        if(UserExt.getUser().getObjectType()==3){
            coachQuery.setStoreId(UserExt.getUser().getObjectId());
        }
        if(UserExt.getUser().getObjectType()==2){
            // 运营商门店ids
            List<Integer> storeIds = storeService
                    .list(new QueryWrapper<TStore>().eq("operatorId", UserExt.getUser().getObjectId()))
                    .stream().map(TStore::getId).collect(Collectors.toList());
            coachQuery.setStoreIds(storeIds);
        }
        return cancelledClassesClient.listAll(coachQuery);
    }
    /**
@@ -773,6 +797,7 @@
        query.setProvince(province);
        query.setCity(city);
        query.setStoreId(storeId);
        query.setInsertType(UserExt.getUser().getObjectType());
        if(UserExt.getUser().getObjectType()==2){
            query.setStoresIds(storeService.list(new QueryWrapper<TStore>()
                    .eq("operatorId",UserExt.getUser().getObjectId())