java/PlayPai.git

			@@ -291,6 +291,10 @@
			if(timeRequest.getType()!=null){
			eq.eq(TCourseInfoRecord::getType,timeRequest.getType());
			}
			if (timeRequest.getLessionId()!=null){
			eq.eq(TCourseInfoRecord::getCourseId,timeRequest.getLessionId());

			}
			// 2.0其他记录
			List<TCourseInfoRecord> list = courseInfoRecordService.list(eq);
			List<PurchaseRecordVo> list1=new ArrayList<>();
			@@ -313,15 +317,15 @@
			String fieldValue = record.getPurchaseAmount();
			if (ToolUtil.isNotEmpty(timeRequest.getType())){
			switch (timeRequest.getType()){
			case 1:
			return fieldValue != null && !fieldValue.isEmpty() && fieldValue.charAt(0) == '-';
			case 2:
			return fieldValue != null && !fieldValue.isEmpty() && fieldValue.charAt(0) == '-';
			case 1:
			return fieldValue != null && !fieldValue.isEmpty() && fieldValue.charAt(0) == '+';
			default:
			break;
			}
			}
			return false;
			return true;
			})
			.collect(Collectors.toList());
			}
			@@ -651,10 +655,11 @@
			* @return
			*/
			@Override
			public List<RecordAppoint> getAppointmentRecords(Integer stuId, Integer appUserId,Integer appointStatus,Integer timeType,String search) {
			public List<RecordAppoint> getAppointmentRecords(Integer stuId, Integer appUserId,Integer appointStatus,Integer timeType,String search,Integer pageNum) {
			WeeksOfCourseRest courseRest = new WeeksOfCourseRest();
			courseRest.setAppUserId(appUserId);
			courseRest.setStuId(stuId);
			courseRest.setPageNum(pageNum);
			List<RecordAppoint> recordAppoints = couPayClient.obtainStudentClassDetailsData(courseRest);
			if (recordAppoints.size() > 0) {
			if (ToolUtil.isNotEmpty(appointStatus) && appointStatus != 0) {
			@@ -787,7 +792,7 @@
			detailsVo.setLon(store.getLon());
			detailsVo.setLat(store.getLat());
			detailsVo.setPhone(store.getPhone());
			detailsVo.setVenueList(steClient.getAppUserSiteList());
			detailsVo.setVenueList(steClient.getAppUserSiteList(storeId));
			List<StoreOfCourseVo> storeOfCourseList = culisClient.getStoreOfCourseList(storeId);
			System.out.println(storeOfCourseList);
			detailsVo.setCourseVoList(storeOfCourseList);
			@@ -844,7 +849,10 @@
			return this.baseMapper.getGiftSelect(giftSearchDto);
			}


			@Override
			public List<Map<String, Object>> queryCom(Integer id) {
			return this.baseMapper.queryCom(id);
			}


			}