From acad524bfb7f376c09ff8e6600fab207780156e1 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期四, 23 十一月 2023 18:46:05 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai

---
 cloud-server-account/src/main/java/com/dsh/account/service/impl/UserIntegralChangesServiceImpl.java |    9 ++++++++-
 1 files changed, 8 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 712488c..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);
     }
 

--
Gitblit v1.7.1