From ae9bfd2d66f68a553786ac78b12f4390e65e4e09 Mon Sep 17 00:00:00 2001 From: 44323 <443237572@qq.com> Date: 星期五, 24 十一月 2023 18:30:18 +0800 Subject: [PATCH] 后台bug修改 --- cloud-server-account/src/main/java/com/dsh/account/service/impl/UserIntegralChangesServiceImpl.java | 17 ++++++++++++++++- 1 files changed, 16 insertions(+), 1 deletions(-) diff --git a/cloud-server-account/src/main/java/com/dsh/account/service/impl/UserIntegralChangesServiceImpl.java b/cloud-server-account/src/main/java/com/dsh/account/service/impl/UserIntegralChangesServiceImpl.java index 5d076e5..4869ee0 100644 --- a/cloud-server-account/src/main/java/com/dsh/account/service/impl/UserIntegralChangesServiceImpl.java +++ b/cloud-server-account/src/main/java/com/dsh/account/service/impl/UserIntegralChangesServiceImpl.java @@ -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,11 +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); } @@ -175,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)){ @@ -189,6 +198,9 @@ } } + + + int totalItems = detailsResponses.size(); int startIndex = (page - 1) * size; int endIndex = Math.min(startIndex + size, totalItems); @@ -199,6 +211,9 @@ detailsResponses.clear(); } + + + return detailsResponses; } } -- Gitblit v1.7.1