From a139a36a5566965a65cf66b6a95ae01be24ee0cb Mon Sep 17 00:00:00 2001
From: HAHA <HAHA@etoak.com>
Date: Wed, 1 Jun 2022 10:18:11 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=87=8F=E5=8C=96=E7=A7=AF?=
 =?UTF-8?q?=E5=88=86=E7=BB=9F=E8=AE=A1=E7=9A=84=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dao/IcPartyMemberPointDao.java            |  5 ++
 .../impl/IcPartyMemberPointServiceImpl.java   | 55 ++++++++++---------
 .../partymember/IcPartyMemberPointDao.xml     | 11 ++++
 3 files changed, 46 insertions(+), 25 deletions(-)

diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/dao/IcPartyMemberPointDao.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/dao/IcPartyMemberPointDao.java
index f7a36ea435..12e8ea95dc 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/dao/IcPartyMemberPointDao.java
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/dao/IcPartyMemberPointDao.java
@@ -42,4 +42,9 @@ public interface IcPartyMemberPointDao extends BaseDao<IcPartyMemberPointEntity>
                                                     @Param("customerId") String customerId);
 
     void updateMember(@Param("partyMemberId") String partyMemberId, @Param("totalScore") Integer totalScore);
+
+    boolean getPoint(@Param("year") String year,
+                     @Param("quarter") String quarter,
+                     @Param("customerId") String customerId,
+                     @Param("partyMemberId") String partyMemberId);
 }
\ No newline at end of file
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 77e92a2eb7..b28ef1727e 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
@@ -83,17 +83,17 @@ public class IcPartyMemberPointServiceImpl extends BaseServiceImpl<IcPartyMember
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void save(IcPartyMemberPointDTO dto) {
-        if(dto.getBasePoint() == null){
+        if (dto.getBasePoint() == null) {
             dto.setBasePoint(NumConstant.ZERO);
         }
-        if(dto.getReviewPoint() == null){
+        if (dto.getReviewPoint() == null) {
             dto.setReviewPoint(NumConstant.ZERO);
         }
-        if(dto.getInspirePoint() == null){
+        if (dto.getInspirePoint() == null) {
             dto.setInspirePoint(NumConstant.ZERO);
         }
         dto.setTotalScore(dto.getBasePoint() + dto.getInspirePoint() + dto.getReviewPoint());
-        if(dto.getWarnPoint() != null) {
+        if (dto.getWarnPoint() != null) {
             if (dto.getWarnPoint() > 0) {
                 dto.setTotalScore(dto.getTotalScore() - dto.getWarnPoint());
             } else {
@@ -103,7 +103,7 @@ public class IcPartyMemberPointServiceImpl extends BaseServiceImpl<IcPartyMember
             dto.setWarnPoint(NumConstant.ZERO);
         }
         IcPartyMemberPointEntity entity = ConvertUtils.sourceToTarget(dto, IcPartyMemberPointEntity.class);
-        if(dto.getYear().equals(Year.now().toString())){
+        if (dto.getYear().equals(Year.now().toString())) {
             baseDao.updateMember(dto.getPartyMemberId(), dto.getTotalScore());
         }
         insert(entity);
@@ -112,30 +112,35 @@ 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() != null) {
-            if (dto.getWarnPoint() > 0) {
-                dto.setTotalScore(dto.getTotalScore() - dto.getWarnPoint());
+        if (baseDao.getPoint(dto.getYear(), dto.getQuarter(), dto.getCustomerId(), dto.getPartyMemberId())) {
+            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() != 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())) {
+                baseDao.updateMember(dto.getPartyMemberId(), dto.getTotalScore());
+            }
+            updateById(entity);
         } else {
-            dto.setWarnPoint(NumConstant.ZERO);
+            save(dto);
         }
-        IcPartyMemberPointEntity entity = ConvertUtils.sourceToTarget(dto, IcPartyMemberPointEntity.class);
-        if(dto.getYear().equals(Year.now().toString())){
-            baseDao.updateMember(dto.getPartyMemberId(), dto.getTotalScore());
-        }
-        updateById(entity);
+
     }
 
     @Override
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/IcPartyMemberPointDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/IcPartyMemberPointDao.xml
index 3876ddf432..12ffe7a854 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/IcPartyMemberPointDao.xml
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/IcPartyMemberPointDao.xml
@@ -154,6 +154,17 @@
         a.total_score ASC,
         a.CREATED_TIME
     </select>
+    <select id="getPoint" resultType="java.lang.Boolean">
+        SELECT
+            id
+        FROM
+            ic_party_member_point
+        WHERE
+            PARTY_MEMBER_ID = #{partyMemberId}
+            AND CUSTOMER_ID = #{customerId}
+            AND YEAR = #{year}
+            AND QUARTER = #{quarter}
+    </select>
 
 
 </mapper>
\ No newline at end of file