From aa2142491a31758ebe56db7eebb6690bf639d1b5 Mon Sep 17 00:00:00 2001
From: HAHA <HAHA@etoak.com>
Date: Wed, 1 Jun 2022 09:46:35 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BF=AE=E6=94=B9=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/IcPartyMemberPointServiceImpl.java   | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberPointServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberPointServiceImpl.java
index 7a98e0f328..77e92a2eb7 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberPointServiceImpl.java
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberPointServiceImpl.java
@@ -112,11 +112,24 @@ public class IcPartyMemberPointServiceImpl extends BaseServiceImpl<IcPartyMember
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void update(IcPartyMemberPointDTO dto) {
+        if(dto.getBasePoint() == null){
+            dto.setBasePoint(NumConstant.ZERO);
+        }
+        if(dto.getReviewPoint() == null){
+            dto.setReviewPoint(NumConstant.ZERO);
+        }
+        if(dto.getInspirePoint() == null){
+            dto.setInspirePoint(NumConstant.ZERO);
+        }
         dto.setTotalScore(dto.getBasePoint() + dto.getInspirePoint() + dto.getReviewPoint());
-        if (dto.getWarnPoint() > 0) {
-            dto.setTotalScore(dto.getTotalScore() - dto.getWarnPoint());
+        if(dto.getWarnPoint() != null) {
+            if (dto.getWarnPoint() > 0) {
+                dto.setTotalScore(dto.getTotalScore() - dto.getWarnPoint());
+            } else {
+                dto.setTotalScore(dto.getTotalScore() + dto.getWarnPoint());
+            }
         } else {
-            dto.setTotalScore(dto.getTotalScore() + dto.getWarnPoint());
+            dto.setWarnPoint(NumConstant.ZERO);
         }
         IcPartyMemberPointEntity entity = ConvertUtils.sourceToTarget(dto, IcPartyMemberPointEntity.class);
         if(dto.getYear().equals(Year.now().toString())){