java/PlayPai.git

			@@ -148,6 +148,16 @@
			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()
			.map(TStore::getId).collect(Collectors.toList());
			query.setStoresIds(operatorId);
			}
			if(UserExt.getUser().getObjectType()==3){
			query.setStoreId(UserExt.getUser().getObjectId());
			}
			query.setRegisterTime(registerTime);
			query.setUserName(userName);
			query.setUserIds(Lists.newArrayList());
			@@ -225,7 +235,7 @@
			public String income(Model model) {
			Integer objectType = UserExt.getUser().getObjectType();
			model.addAttribute("roleType",objectType);
			return PREFIX + "income.html";
			return PREFIX + "Income.html";
			}
			/**
			* 获取收入管理列表
			@@ -233,10 +243,17 @@
			@RequestMapping(value = "/incomeListAll")
			@ResponseBody
			public List<IncomeVO> incomeListAll(String time,Integer incomeType,String userName,String amount) {

			// 充值记录查询query
			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
			@@ -270,6 +287,15 @@
			competitionQuery.setAmount(new BigDecimal(amount));
			incomeQuery.setAmount(new BigDecimal(amount));
			}
			if (UserExt.getUser().getObjectType()==2){
			// 拿到门店集合id
			List<Integer> operatorId = storeService.list(new QueryWrapper<TStore>()
			.eq("operatorId", UserExt.getUser().getObjectId())).stream()
			.map(TStore::getId).collect(Collectors.toList());
			query.setStoresIds(operatorId);
			competitionQuery.setOperatorId(UserExt.getUser().getObjectId());
			siteBookingQuery.setStoreIds(operatorId);
			}

			siteBookingQuery.setTime(time);
			query.setRegisterTime(time);
			@@ -280,24 +306,34 @@
			IncomeVO incomeVO = new IncomeVO();
			List<IncomeVO> incomeVOS = new ArrayList<>();

			if (roleType == 1){
			if ( incomeType==null \|\| incomeType == 1){
			// 会员支付记录
			List<VipPayment> vipPayments = vipPaymentClient.registrationList(incomeQuery);
			for (VipPayment vipPayment : vipPayments) {

			if (UserExt.getUser().getObjectType()!=1){
			break;
			}
			TAppUser tAppUser = appUserClient.queryById(vipPayment.getAppUserId());
			IncomeVO temp = new IncomeVO();
			temp.setId(vipPayment.getId());
			temp.setProvince(tAppUser.getProvince());
			temp.setCity(tAppUser.getCity());
			if (tAppUser!=null){
			if (tAppUser.getProvince()!=null){
			temp.setProvince(tAppUser.getProvince());
			}
			if (tAppUser.getCity()!=null){
			temp.setCity(tAppUser.getCity());
			}
			temp.setPayUser(tAppUser.getName());
			temp.setPhone(tAppUser.getPhone());
			}
			temp.setStoreName("");
			temp.setPayUser(tAppUser.getName());
			temp.setPhone(tAppUser.getPhone());
			temp.setAmount(new BigDecimal(vipPayment.getAmount().toString()));
			temp.setIncomeType(1);
			temp.setState(vipPayment.getState());
			temp.setInsertTime(vipPayment.getInsertTime());
			if (UserExt.getUser().getObjectType()!=1){
			break;
			}
			incomeVOS.add(temp);
			}
			}
			@@ -305,20 +341,30 @@
			// 充值记录
			List<RechargeRecordsVO> rechargeRecordsVOS = financeClient.rechargeList(rechargeRecordsQuery);
			for (RechargeRecordsVO rechargeRecordsVO : rechargeRecordsVOS) {
			if (UserExt.getUser().getObjectType()!=1){
			break;
			}
			TAppUser tAppUser = appUserClient.queryById(rechargeRecordsVO.getAppUserId());
			IncomeVO temp = new IncomeVO();
			temp.setId(rechargeRecordsVO.getId().intValue());
			temp.setProvince(tAppUser.getProvince());
			temp.setCity(tAppUser.getCity());
			if (tAppUser!=null){
			if (tAppUser.getProvince()!=null){
			temp.setProvince(tAppUser.getProvince());
			}
			if (tAppUser.getCity()!=null){
			temp.setCity(tAppUser.getCity());
			}
			temp.setPayUser(tAppUser.getName());
			temp.setPhone(tAppUser.getPhone());
			}
			temp.setStoreName("");
			temp.setPayUser(tAppUser.getName());
			temp.setPhone(tAppUser.getPhone());
			temp.setInsertTime(rechargeRecordsVO.getInsertTime());
			if (rechargeRecordsVO.getAmount() != null) {
			temp.setAmount(rechargeRecordsVO.getAmount());
			}
			temp.setIncomeType(2);
			temp.setState(rechargeRecordsVO.getPayStatus());

			incomeVOS.add(temp);
			}
			}
			@@ -332,11 +378,19 @@
			TAppUser tAppUser = appUserClient.queryById(registerOrderVO.getAppUserId());
			IncomeVO temp = new IncomeVO();
			temp.setId(registerOrderVO.getId().intValue());
			temp.setProvince(tAppUser.getProvince());
			temp.setCity(tAppUser.getCity());
			if (tAppUser!=null){
			if (tAppUser.getProvince()!=null){
			temp.setProvince(tAppUser.getProvince());
			}
			if (tAppUser.getCity()!=null){
			temp.setCity(tAppUser.getCity());
			}
			temp.setPayUser(tAppUser.getName());
			temp.setPhone(tAppUser.getPhone());
			}

			temp.setStoreName(registerOrderVO.getStoreName());
			temp.setPayUser(tAppUser.getName());
			temp.setPhone(tAppUser.getPhone());

			temp.setInsertTime(registerOrderVO.getInsertTime());
			if (registerOrderVO.getMoney() != null) {
			temp.setAmount(registerOrderVO.getMoney());
			@@ -354,18 +408,40 @@
			if (competition.getPayStatus() == 3) {
			continue;
			}
			IncomeVO temp = new IncomeVO();
			TAppUser tAppUser = appUserClient.queryById(competition.getAppUserId());
			Competition competition1 = competitionClient.queryById(competition.getCompetitionId());
			Store store = storeClient.getStoreById(Integer.valueOf(competition1.getStoreId()));
			IncomeVO temp = new IncomeVO();
			temp.setId(competition.getId().intValue());
			temp.setProvince(tAppUser.getProvince());
			temp.setCity(tAppUser.getCity());
			temp.setStoreName(store.getName());
			temp.setPayUser(tAppUser.getName());
			temp.setPhone(tAppUser.getPhone());
			temp.setInsertTime(competition.getInsertTime());
			if(null == competition1){
			continue;
			}
			if (!competition1.getStoreId().equals("")){
			String[] split = competition1.getStoreId().split(",");
			List<Integer> list = new ArrayList<>();
			for (String s : split) {
			list.add(Integer.valueOf(s));
			}
			List<TStore> id = storeService.list(new QueryWrapper<TStore>().in("id", list));
			StringBuilder storeNames = new StringBuilder("");
			for (TStore store : id) {
			// 赛事举办门店 (可能会有多个门店举办需要拼接门店名称)
			storeNames.append(store.getName() + ",");
			}
			String substring = storeNames.toString().substring(0, storeNames.toString().length() - 1);

			temp.setStoreName(substring);
			}
			temp.setId(competition.getId().intValue());
			if (tAppUser!=null){
			if (tAppUser.getProvince()!=null){
			temp.setProvince(tAppUser.getProvince());
			}
			if (tAppUser.getCity()!=null){
			temp.setCity(tAppUser.getCity());
			}
			temp.setPayUser(tAppUser.getName());
			temp.setPhone(tAppUser.getPhone());
			}
			temp.setInsertTime(competition.getInsertTime());
			if (competition.getAmount() != null) {
			temp.setAmount(new BigDecimal(competition.getAmount().toString()));
			}
			@@ -385,15 +461,24 @@
			} else {
			temp.setState(2);
			}
			TAppUser tAppUser = appUserClient.queryById(siteBooking.getAppUserId());
			TAppUser tAppUser = appUserClient.queryAppUser1(siteBooking.getAppUserId());
			Store store = storeClient.getStoreById(siteBooking.getStoreId());

			temp.setId(siteBooking.getId());
			temp.setProvince(siteBooking.getProvince());
			temp.setCity(siteBooking.getCity());
			temp.setStoreName(store.getName());
			temp.setPayUser(tAppUser.getName());
			temp.setPhone(tAppUser.getPhone());
			if (tAppUser!=null){
			if (tAppUser.getProvince()!=null){
			temp.setProvince(tAppUser.getProvince());
			}
			if (tAppUser.getCity()!=null){
			temp.setCity(tAppUser.getCity());
			}
			temp.setPayUser(tAppUser.getName());
			temp.setPhone(tAppUser.getPhone());
			}

			temp.setInsertTime(siteBooking.getInsertTime());
			if (siteBooking.getPayMoney() != null) {
			temp.setAmount(new BigDecimal(siteBooking.getPayMoney().toString()));
			@@ -402,7 +487,6 @@
			incomeVOS.add(temp);
			}
			}
			}
			return incomeVOS;
			}

			@@ -416,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
			@@ -449,6 +537,15 @@
			competitionQuery.setAmount(new BigDecimal(amount));
			incomeQuery.setAmount(new BigDecimal(amount));
			}
			if (UserExt.getUser().getObjectType()==2){
			// 拿到门店集合id
			List<Integer> operatorId = storeService.list(new QueryWrapper<TStore>()
			.eq("operatorId", UserExt.getUser().getObjectId())).stream()
			.map(TStore::getId).collect(Collectors.toList());
			query.setStoresIds(operatorId);
			competitionQuery.setOperatorId(UserExt.getUser().getObjectId());
			siteBookingQuery.setStoreIds(operatorId);
			}

			siteBookingQuery.setTime(time);
			query.setRegisterTime(time);
			@@ -459,134 +556,208 @@
			IncomeVO incomeVO = new IncomeVO();
			List<IncomeVO> incomeVOS = new ArrayList<>();

			if (roleType == 1){
			if ( incomeType==null \|\| incomeType == 1){
			// 会员支付记录
			List<VipPayment> vipPayments = vipPaymentClient.registrationList(incomeQuery);
			for (VipPayment vipPayment : vipPayments) {

			TAppUser tAppUser = appUserClient.queryById(vipPayment.getAppUserId());
			IncomeVO temp = new IncomeVO();
			temp.setId(vipPayment.getId());
			temp.setProvince(tAppUser.getProvince());
			temp.setCity(tAppUser.getCity());
			temp.setStoreName("");
			temp.setPayUser(tAppUser.getName());
			temp.setPhone(tAppUser.getPhone());
			temp.setAmount(new BigDecimal(vipPayment.getAmount().toString()));
			temp.setIncomeType(1);
			temp.setState(vipPayment.getState());
			temp.setInsertTime(vipPayment.getInsertTime());
			incomeVOS.add(temp);
			if ( incomeType==null \|\| incomeType == 1){
			// 会员支付记录
			List<VipPayment> vipPayments = vipPaymentClient.registrationList(incomeQuery);
			for (VipPayment vipPayment : vipPayments) {
			if (UserExt.getUser().getObjectType()!=1){
			break;
			}
			}
			if ( incomeType==null \|\| incomeType == 2) {
			// 充值记录
			List<RechargeRecordsVO> rechargeRecordsVOS = financeClient.rechargeList(rechargeRecordsQuery);
			for (RechargeRecordsVO rechargeRecordsVO : rechargeRecordsVOS) {
			TAppUser tAppUser = appUserClient.queryById(rechargeRecordsVO.getAppUserId());
			IncomeVO temp = new IncomeVO();
			temp.setId(rechargeRecordsVO.getId().intValue());
			temp.setProvince(tAppUser.getProvince());
			temp.setCity(tAppUser.getCity());
			temp.setStoreName("");
			temp.setPayUser(tAppUser.getName());
			temp.setPhone(tAppUser.getPhone());
			temp.setInsertTime(rechargeRecordsVO.getInsertTime());
			if (rechargeRecordsVO.getAmount() != null) {
			temp.setAmount(rechargeRecordsVO.getAmount());
			TAppUser tAppUser = appUserClient.queryById(vipPayment.getAppUserId());
			IncomeVO temp = new IncomeVO();
			temp.setId(vipPayment.getId());
			if (tAppUser!=null){
			if (tAppUser.getProvince()!=null){
			temp.setProvince(tAppUser.getProvince());
			}
			temp.setIncomeType(2);
			temp.setState(rechargeRecordsVO.getState());
			incomeVOS.add(temp);
			if (tAppUser.getCity()!=null){
			temp.setCity(tAppUser.getCity());
			}
			temp.setPayUser(tAppUser.getName());
			temp.setPhone(tAppUser.getPhone());
			}
			temp.setStoreName("");
			temp.setAmount(new BigDecimal(vipPayment.getAmount().toString()));
			temp.setIncomeType(1);
			temp.setState(vipPayment.getState());
			temp.setInsertTime(vipPayment.getInsertTime());
			if (UserExt.getUser().getObjectType()!=1){
			break;
			}
			incomeVOS.add(temp);
			}
			if ( incomeType==null \|\| incomeType == 3) {
			// 报名课程记录
			List<RegisterOrderVO> registerOrderVOS = coursePackagePaymentClient.listAllRegister(query);
			for (RegisterOrderVO registerOrderVO : registerOrderVOS) {
			if (registerOrderVO.getMoney() == null) {
			}
			if ( incomeType==null \|\| incomeType == 2) {
			// 充值记录
			List<RechargeRecordsVO> rechargeRecordsVOS = financeClient.rechargeList(rechargeRecordsQuery);
			for (RechargeRecordsVO rechargeRecordsVO : rechargeRecordsVOS) {
			if (UserExt.getUser().getObjectType()!=1){
			break;
			}
			TAppUser tAppUser = appUserClient.queryById(rechargeRecordsVO.getAppUserId());
			IncomeVO temp = new IncomeVO();
			temp.setId(rechargeRecordsVO.getId().intValue());
			if (tAppUser!=null){
			if (tAppUser.getProvince()!=null){
			temp.setProvince(tAppUser.getProvince());
			}
			if (tAppUser.getCity()!=null){
			temp.setCity(tAppUser.getCity());
			}
			temp.setPayUser(tAppUser.getName());
			temp.setPhone(tAppUser.getPhone());
			}
			temp.setStoreName("");
			temp.setInsertTime(rechargeRecordsVO.getInsertTime());
			if (rechargeRecordsVO.getAmount() != null) {
			temp.setAmount(rechargeRecordsVO.getAmount());
			}
			temp.setIncomeType(2);
			temp.setState(rechargeRecordsVO.getPayStatus());

			incomeVOS.add(temp);
			}
			}
			if ( incomeType==null \|\| incomeType == 3) {
			// 报名课程记录
			List<RegisterOrderVO> registerOrderVOS = coursePackagePaymentClient.listAllRegister(query);
			for (RegisterOrderVO registerOrderVO : registerOrderVOS) {
			if (registerOrderVO.getMoney() == null) {
			continue;
			}
			TAppUser tAppUser = appUserClient.queryById(registerOrderVO.getAppUserId());
			IncomeVO temp = new IncomeVO();
			temp.setId(registerOrderVO.getId().intValue());
			if (registerOrderVO.getPayStatus()==2) {
			temp.setState(2);
			} else {
			temp.setState(1);
			}
			if (tAppUser!=null){
			if (tAppUser.getProvince()!=null){
			temp.setProvince(tAppUser.getProvince());
			}
			if (tAppUser.getCity()!=null){
			temp.setCity(tAppUser.getCity());
			}
			temp.setPayUser(tAppUser.getName());
			temp.setPhone(tAppUser.getPhone());
			}

			temp.setStoreName(registerOrderVO.getStoreName());

			temp.setInsertTime(registerOrderVO.getInsertTime());
			if (registerOrderVO.getMoney() != null) {
			temp.setAmount(registerOrderVO.getMoney());
			}
			temp.setIncomeType(3);
			temp.setState(registerOrderVO.getPayStatus());
			incomeVOS.add(temp);
			}
			}
			if(roleType !=3) {
			if (incomeType == null \|\| incomeType == 4) {
			// 报名活动
			List<PaymentCompetition> competitions = competitionClient.listAllPayment(competitionQuery);
			for (PaymentCompetition competition : competitions) {
			if (competition.getPayStatus() == 3) {
			continue;
			}
			TAppUser tAppUser = appUserClient.queryById(registerOrderVO.getAppUserId());
			IncomeVO temp = new IncomeVO();
			temp.setId(registerOrderVO.getId().intValue());
			temp.setProvince(tAppUser.getProvince());
			temp.setCity(tAppUser.getCity());
			temp.setStoreName(registerOrderVO.getStoreName());
			temp.setPayUser(tAppUser.getName());
			temp.setPhone(tAppUser.getPhone());
			temp.setInsertTime(registerOrderVO.getInsertTime());
			if (registerOrderVO.getMoney() != null) {
			temp.setAmount(registerOrderVO.getMoney());
			TAppUser tAppUser = appUserClient.queryById(competition.getAppUserId());
			Competition competition1 = competitionClient.queryById(competition.getCompetitionId());
			if(null == competition1){
			continue;
			}
			temp.setIncomeType(3);
			temp.setState(registerOrderVO.getPayStatus());
			incomeVOS.add(temp);
			}
			}
			if(roleType !=3) {
			if (incomeType == null \|\| incomeType == 4) {
			// 报名活动
			List<PaymentCompetition> competitions = competitionClient.listAllPayment(competitionQuery);
			for (PaymentCompetition competition : competitions) {
			if (competition.getPayStatus() == 3) {
			continue;
			if (!competition1.getStoreId().equals("")){
			String[] split = competition1.getStoreId().split(",");
			List<Integer> list = new ArrayList<>();
			for (String s : split) {
			list.add(Integer.valueOf(s));
			}
			TAppUser tAppUser = appUserClient.queryById(competition.getAppUserId());
			Competition competition1 = competitionClient.queryById(competition.getCompetitionId());
			Store store = storeClient.getStoreById(Integer.valueOf(competition1.getStoreId().split(",")[0]));
			IncomeVO temp = new IncomeVO();
			temp.setId(competition.getId().intValue());
			temp.setProvince(tAppUser.getProvince());
			temp.setCity(tAppUser.getCity());
			temp.setStoreName(store.getName());
			List<TStore> id = storeService.list(new QueryWrapper<TStore>().in("id", list));
			StringBuilder storeNames = new StringBuilder("");
			for (TStore store : id) {
			// 赛事举办门店 (可能会有多个门店举办需要拼接门店名称)
			storeNames.append(store.getName() + ",");
			}
			String substring = storeNames.toString().substring(0, storeNames.toString().length() - 1);

			temp.setStoreName(substring);
			}
			if (competition.getPayStatus()==2) {
			temp.setState(2);
			} else {
			temp.setState(1);
			}
			temp.setId(competition.getId().intValue());
			if (tAppUser!=null){
			if (tAppUser.getProvince()!=null){
			temp.setProvince(tAppUser.getProvince());
			}
			if (tAppUser.getCity()!=null){
			temp.setCity(tAppUser.getCity());
			}
			temp.setPayUser(tAppUser.getName());
			temp.setPhone(tAppUser.getPhone());
			temp.setInsertTime(competition.getInsertTime());

			if (competition.getAmount() != null) {
			temp.setAmount(new BigDecimal(competition.getAmount().toString()));
			}
			temp.setIncomeType(4);
			temp.setState(competition.getPayStatus());
			incomeVOS.add(temp);
			}
			}
			}
			if (incomeType == null \|\| incomeType == 5) {
			// 预约场地
			List<SiteBooking> siteBookings = siteClient.listAll(siteBookingQuery);
			for (SiteBooking siteBooking : siteBookings) {
			IncomeVO temp = new IncomeVO();
			if (siteBooking.getStatus() == 0 \|\| siteBooking.getStatus() == 5 \|\| siteBooking.getStatus() == 4) {
			temp.setState(1);
			} else {
			temp.setState(2);
			temp.setInsertTime(competition.getInsertTime());
			if (competition.getAmount() != null) {
			temp.setAmount(new BigDecimal(competition.getAmount().toString()));
			}
			TAppUser tAppUser = appUserClient.queryById(siteBooking.getAppUserId());
			Store store = storeClient.getStoreById(siteBooking.getStoreId());

			temp.setId(siteBooking.getId());
			temp.setProvince(siteBooking.getProvince());
			temp.setCity(siteBooking.getCity());
			temp.setStoreName(store.getName());
			temp.setPayUser(tAppUser.getName());
			temp.setPhone(tAppUser.getPhone());
			temp.setInsertTime(siteBooking.getInsertTime());
			if (siteBooking.getPayMoney() != null) {
			temp.setAmount(new BigDecimal(siteBooking.getPayMoney().toString()));
			}
			temp.setIncomeType(5);
			temp.setIncomeType(4);
			temp.setState(competition.getPayStatus());
			incomeVOS.add(temp);
			}
			}
			}
			if (incomeType == null \|\| incomeType == 5) {
			// 预约场地
			List<SiteBooking> siteBookings = siteClient.listAll(siteBookingQuery);
			for (SiteBooking siteBooking : siteBookings) {
			IncomeVO temp = new IncomeVO();
			if (siteBooking.getStatus() == 0 \|\| siteBooking.getStatus() == 5 \|\| siteBooking.getStatus() == 4) {
			temp.setState(1);
			} else {
			temp.setState(2);
			}
			TAppUser tAppUser = appUserClient.queryAppUser1(siteBooking.getAppUserId());
			Store store = storeClient.getStoreById(siteBooking.getStoreId());

			temp.setId(siteBooking.getId());
			temp.setProvince(siteBooking.getProvince());
			temp.setCity(siteBooking.getCity());
			temp.setStoreName(store.getName());
			if (tAppUser!=null){
			if (tAppUser.getProvince()!=null){
			temp.setProvince(tAppUser.getProvince());
			}
			if (tAppUser.getCity()!=null){
			temp.setCity(tAppUser.getCity());
			}
			temp.setPayUser(tAppUser.getName());
			temp.setPhone(tAppUser.getPhone());
			}

			temp.setInsertTime(siteBooking.getInsertTime());
			if (siteBooking.getPayMoney() != null) {
			temp.setAmount(new BigDecimal(siteBooking.getPayMoney().toString()));
			}
			temp.setIncomeType(5);
			incomeVOS.add(temp);
			}
			}

			BigDecimal totalAmount = BigDecimal.ZERO; // 初始化累加变量为0

			for (IncomeVO vo : incomeVOS) {
			BigDecimal totalMoney = vo.getAmount();
			totalAmount = totalAmount.add(totalMoney); // 累加每个IncomeVO对象的amount
			if (vo.getAmount() == null ){
			BigDecimal temp = BigDecimal.ZERO;
			totalAmount = totalAmount.add(temp);
			}else{
			BigDecimal totalMoney = vo.getAmount();
			totalAmount = totalAmount.add(totalMoney); // 累加每个IncomeVO对象的amount
			}
			}
			return totalAmount;
			}
			@@ -601,11 +772,23 @@
			coachQuery.setCoachName(coachName);
			coachQuery.setCourseName(courseName);
			coachQuery.setTime(beginTime);
			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);
			}
			/**
			* 获取报名订单记录
			*/
			@Autowired
			private IStoreService storeService;
			@RequestMapping(value = "/registerListAll")
			@ResponseBody
			public List<RegisterOrderVO> registerListAll(String province,String city,Integer storeId,String registerTime
			@@ -614,6 +797,15 @@
			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())
			).stream().map(TStore::getId).collect(Collectors.toList()));
			}
			if(UserExt.getUser().getObjectType()==3){
			query.setStoreId(UserExt.getUser().getObjectId());
			}
			query.setRegisterTime(registerTime);
			query.setUserName(userName);
			query.setUserIds(Lists.newArrayList());
			@@ -636,6 +828,7 @@
			return new ArrayList<>();
			}


			return coursePackagePaymentClient.listAllRegister(query);
			}