From 79e82d188a24ad92395ac4b39c1a49266a647c3f Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 04 十二月 2024 15:44:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/UserPointServiceImpl.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/UserPointServiceImpl.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/UserPointServiceImpl.java
index c94835c..1cedad4 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/UserPointServiceImpl.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/UserPointServiceImpl.java
@@ -40,10 +40,10 @@
         List<UserPoint> userPointList = list(new LambdaQueryWrapper<UserPoint>()
                 .eq(UserPoint::getAppUserId, userId));
 
-        Map<Integer, BigDecimal> userBalanceMap = userPointList.stream()
+        Map<Integer, Integer> userBalanceMap = userPointList.stream()
                 .collect(Collectors.toMap(UserPoint::getType, UserPoint::getBalance));
 
-        BigDecimal lavePoint = appUser.getLavePoint();
+        Integer lavePoint = appUser.getLavePoint();
         UserPointVO userPointVO = new UserPointVO();
         userPointVO.setTotalPoint(lavePoint);
         userPointVO.setShopPoint(userBalanceMap.get(PointChangeType.CONSUME.getCode()));

--
Gitblit v1.7.1