修改bug

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";
    }
    /**
     * 获取收入管理列表
@@ -318,7 +321,7 @@
                        temp.setAmount(rechargeRecordsVO.getAmount());
                    }
                    temp.setIncomeType(2);
                    temp.setState(rechargeRecordsVO.getState());
                    temp.setState(rechargeRecordsVO.getPayStatus());
                    incomeVOS.add(temp);
                }
            }
@@ -356,7 +359,10 @@
                        }
                        TAppUser tAppUser = appUserClient.queryById(competition.getAppUserId());
                        Competition competition1 = competitionClient.queryById(competition.getCompetitionId());
                        Store store = storeClient.getStoreById(competition1.getStoreId());
                        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());
                        temp.setProvince(tAppUser.getProvince());
@@ -405,6 +411,7 @@
        }
        return incomeVOS;
    }

    /**
     * 获取收入管理列表
     */
@@ -534,7 +541,7 @@
                        }
                        TAppUser tAppUser = appUserClient.queryById(competition.getAppUserId());
                        Competition competition1 = competitionClient.queryById(competition.getCompetitionId());
                        Store store = storeClient.getStoreById(competition1.getStoreId());
                        Store store = storeClient.getStoreById(Integer.valueOf(competition1.getStoreId().split(",")[0]));
                        IncomeVO temp = new IncomeVO();
                        temp.setId(competition.getId().intValue());
                        temp.setProvince(tAppUser.getProvince());
@@ -600,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);
    }
    /**
@@ -613,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());
@@ -634,8 +647,9 @@
        if (userIds.size()==0){
            return new ArrayList<>();
        }
        List<RegisterOrderVO> registerOrderVOS = coursePackagePaymentClient.listAllRegister(query);

        return coursePackagePaymentClient.listAllRegister(query);
        return registerOrderVOS;
    }