java/PlayPai.git

			@@ -74,7 +74,7 @@
			detail.setDetailsType(2);
			break;
			case 2:
			detail.setConsumeAmount("-"+(userIntegralChange.getNewIntegral() - userIntegralChange.getOldIntegral()));
			detail.setConsumeAmount(""+(userIntegralChange.getNewIntegral() - userIntegralChange.getOldIntegral()));
			detail.setConsumeName("兑换商品");
			detail.setDetailsType(1);
			break;
			@@ -89,6 +89,11 @@
			detail.setConsumeName("观看教学视频");
			detail.setDetailsType(2);
			break;
			case 5:
			detail.setConsumeAmount(""+(userIntegralChange.getNewIntegral() - userIntegralChange.getOldIntegral()));
			detail.setConsumeName("智慧球场开始游戏");
			detail.setDetailsType(1);
			break;
			default:
			break;
			}
			@@ -98,7 +103,7 @@
			if (null != recordId){
			details = details.stream()
			.filter(obj -> obj instanceof IntegralsData)
			.filter(obj -> Objects.equals(obj.getDetailsType(), recordId))
			.filter(obj -> !Objects.equals(obj.getDetailsType(), recordId))
			.collect(Collectors.toList());
			}
			}
			@@ -118,10 +123,13 @@
			userIntegralChanges.setAppUserId(vo.getAppUserId());
			userIntegralChanges.setOldIntegral(appUser.getIntegral());
			userIntegralChanges.setType(vo.getType());

			appUser.setIntegral(appUser.getIntegral() + vo.getIntegral());
			tauMapper.updateById(appUser);
			userIntegralChanges.setNewIntegral(appUser.getIntegral());
			userIntegralChanges.setInsertTime(new Date());
			userIntegralChanges.setCategory(1);
			userIntegralChanges.setRemark(vo.getRemark());
			this.save(userIntegralChanges);
			}

			@@ -174,6 +182,8 @@
			public List<ExchangeDetailsResponse> queryExchangeGoodsdetails1(Integer userIdFormRedis, Integer useType, Integer goodType, Integer page, Integer size) {
			List<ExchangeDetailsResponse> detailsResponses = new ArrayList<>();
			ExchangeDetailsVo integralExchangeDetails = mcClient.getIntegralExchangeDetails(userIdFormRedis);


			if (ToolUtil.isNotEmpty(integralExchangeDetails.getDetailsResponses())){
			detailsResponses = integralExchangeDetails.getDetailsResponses();
			if (ToolUtil.isNotEmpty(useType)){
			@@ -188,6 +198,9 @@
			}
			}




			int totalItems = detailsResponses.size();
			int startIndex = (page - 1) * size;
			int endIndex = Math.min(startIndex + size, totalItems);
			@@ -198,6 +211,9 @@
			detailsResponses.clear();
			}




			return detailsResponses;
			}
			}