From 52d9711ffd153239197473744c9f1378d491bccc Mon Sep 17 00:00:00 2001
From: wangchao <crystal_jupiter@163.com>
Date: Wed, 29 Jul 2020 15:09:36 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=A7=AF=E5=88=86=20?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A4=E4=B8=BA0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/dto/result/ResiPointDetailResultDTO.java  | 4 ++--
 .../com/epmet/service/impl/UserPointTotalServiceImpl.java    | 5 ++++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/ResiPointDetailResultDTO.java b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/ResiPointDetailResultDTO.java
index 556b8471e1..79884a4842 100644
--- a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/ResiPointDetailResultDTO.java
+++ b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/ResiPointDetailResultDTO.java
@@ -17,11 +17,11 @@ public class ResiPointDetailResultDTO  implements Serializable {
     /**
      * 累计积分
      * */
-    private Integer accumulatedPoint;
+    private Integer accumulatedPoint = 0;
 
     /**
      * 可用积分
      * */
-    private Integer usablePoint;
+    private Integer usablePoint = 0;
 
 }
diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointTotalServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointTotalServiceImpl.java
index e2ab66cde8..c6a3986193 100644
--- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointTotalServiceImpl.java
+++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointTotalServiceImpl.java
@@ -118,7 +118,10 @@ public class UserPointTotalServiceImpl extends BaseServiceImpl<UserPointTotalDao
      **/
     @Override
     public ResiPointDetailResultDTO getMyPoint(ResiCommonUserIdFormDTO userId) {
-        return baseDao.selectPointByUserId(userId.getUserId());
+        ResiPointDetailResultDTO result = baseDao.selectPointByUserId(userId.getUserId());
+        if(null == result) return new ResiPointDetailResultDTO();
+        if(null == result.getUsablePoint() || null == result.getAccumulatedPoint()) return new ResiPointDetailResultDTO();
+        return result;
     }
 
     /**