java/PlayPai.git

			@@ -140,12 +140,30 @@
			List<SiteBooking> siteBookings = stClient.wanpaiGoldSiteBookingList(appUserId);
			if (siteBookings.size() > 0 ){
			for (SiteBooking booking : siteBookings) {
			if (booking.getStatus() != 5) {
			RechargesDetail consumeDetail = new RechargesDetail();
			consumeDetail.setConsumeName(RechargeRecordEnum.VENUE_RESERVATION.getMsg());
			consumeDetail.setConsumeTime(simpleDateFormat.format(booking.getInsertTime()));
			consumeDetail.setConsumeAmount("-" + booking.getPayMoney());
			consumeDetail.setRecordId(2);
			details.add(consumeDetail);
			} else {
			RechargesDetail consumeDetail1 = new RechargesDetail();
			consumeDetail1.setConsumeName(RechargeRecordEnum.CANCEL_VENUE_RESERVATION.getMsg());
			consumeDetail1.setConsumeTime(simpleDateFormat.format(booking.getCancelTime()));
			consumeDetail1.setConsumeAmount("+" + booking.getPayMoney());
			consumeDetail1.setRecordId(1);
			details.add(consumeDetail1);

			RechargesDetail consumeDetail = new RechargesDetail();
			consumeDetail.setConsumeName(RechargeRecordEnum.VENUE_RESERVATION.getMsg());
			consumeDetail.setConsumeTime(simpleDateFormat.format(booking.getInsertTime()));
			consumeDetail.setConsumeAmount("-" + booking.getPayMoney());
			consumeDetail.setRecordId(2);
			details.add(consumeDetail);


			}
			}
			}
			// 4.智慧球场
			@@ -219,7 +237,6 @@
			}



			//分页
			filteredList = filteredList.stream().skip((pageNo - 1) * size).limit(size).
			collect(Collectors.toList());
			@@ -270,7 +287,6 @@
			}
			return ResultUtil.success();
			}



			private ResultUtil AlipayPayment(String code,BigDecimal amount) {
			@@ -329,8 +345,6 @@
			tappMapper.updateById(tAppUser);
			break;
			}




			break;
			@@ -450,6 +464,7 @@
			}
			return rechargeRecordsMapper.listAll(query,STime,ETime,query.getAmount(),query.getInsertType());
			}

			public static <T> List<T> pageList(List<T> list, int pageNum, int pageSize) {
			//计算总页数
			int page = list.size() % pageSize == 0 ? list.size() / pageSize : list.size() / pageSize + 1;