From a074effa1eda939f1032ca87259bc25a5f15cba9 Mon Sep 17 00:00:00 2001
From: songyunpeng <syp2850@163.com>
Date: Tue, 27 Jul 2021 15:06:01 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BF=97=E6=84=BF=E8=80=85=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ActUserClockLogServiceImpl.java      | 11 ++++++-----
 .../service/impl/ActUserRelationServiceImpl.java      |  9 +++++----
 .../epdc/dto/epdc/result/EpdcUserInfoResultDTO.java   |  4 ++++
 .../src/main/resources/mapper/UserDao.xml             |  1 +
 4 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserClockLogServiceImpl.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserClockLogServiceImpl.java
index ce191c97..54d98a44 100644
--- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserClockLogServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserClockLogServiceImpl.java
@@ -48,6 +48,7 @@ import com.elink.esua.epdc.dto.VolunteerInfoDTO;
 import com.elink.esua.epdc.dto.epdc.form.EpdcInformationFormDTO;
 import com.elink.esua.epdc.dto.epdc.form.EpdcUserPointsFormDTO;
 import com.elink.esua.epdc.dto.epdc.form.EpdcVolunteerKindnessTimeFormDTO;
+import com.elink.esua.epdc.dto.epdc.form.EpdcVolunteerPointsFormDTO;
 import com.elink.esua.epdc.dto.result.BehaviorResultDto;
 import com.elink.esua.epdc.modules.activity.dao.ActUserClockLogDao;
 import com.elink.esua.epdc.modules.activity.entity.ActInfoEntity;
@@ -278,16 +279,16 @@ public class ActUserClockLogServiceImpl extends BaseServiceImpl<ActUserClockLogD
             }
         }
         pointsFeignClient.addPointsLog(pointsLogsDTO);
-       /* //直接调用fegin，返回剩余积分值
+        //直接调用fegin，返回剩余积分值
         EpdcVolunteerPointsFormDTO volunteerPointsFormDTO = new EpdcVolunteerPointsFormDTO();
         volunteerPointsFormDTO.setVolunteerId(volunteerInfoDTOResult.getData().getId());
         volunteerPointsFormDTO.setPoints(actInfoDTO.getReward());
         volunteerPointsFormDTO.setOperationType(PointsOperationEnum.OPERATION_TYPE_ADD.getOperationType());
-        //2021-07-14 更新为不增加用户积分 增加志愿者公益积分
-         Result result = userInfoFeignClient.handleVolunteerPoints(volunteerPointsFormDTO);
-        if (!result.success()) {
+        //2021-07-14  增加志愿者公益积分
+        Result volunteerResult = userInfoFeignClient.handleVolunteerPoints(volunteerPointsFormDTO);
+        if (!volunteerResult.success()) {
             throw new RenException("更新志愿者公益积分异常");
-        }*/
+        }
         //直接调用fegin，返回剩余积分值
         EpdcUserPointsFormDTO userPointsFormDTO = new EpdcUserPointsFormDTO();
         userPointsFormDTO.setUserId(actUserRelationDTO.getUserId());
diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserRelationServiceImpl.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserRelationServiceImpl.java
index dc632685..c784e183 100644
--- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserRelationServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserRelationServiceImpl.java
@@ -45,6 +45,7 @@ import com.elink.esua.epdc.dto.UserDTO;
 import com.elink.esua.epdc.dto.VolunteerInfoDTO;
 import com.elink.esua.epdc.dto.epdc.form.EpdcInformationFormDTO;
 import com.elink.esua.epdc.dto.epdc.form.EpdcUserPointsFormDTO;
+import com.elink.esua.epdc.dto.epdc.form.EpdcVolunteerPointsFormDTO;
 import com.elink.esua.epdc.dto.form.EpdcClockListV2FormDTO;
 import com.elink.esua.epdc.dto.result.BehaviorResultDto;
 import com.elink.esua.epdc.modules.activity.dao.ActInfoDao;
@@ -390,15 +391,15 @@ public class ActUserRelationServiceImpl extends BaseServiceImpl<ActUserRelationD
         if (!result.success()) {
             throw new RenException("更新用户积分异常");
         }
-        /*EpdcVolunteerPointsFormDTO volunteerPointsFormDTO = new EpdcVolunteerPointsFormDTO();
+        EpdcVolunteerPointsFormDTO volunteerPointsFormDTO = new EpdcVolunteerPointsFormDTO();
         volunteerPointsFormDTO.setVolunteerId(volunteerInfoDTOResult.getData().getId());
         volunteerPointsFormDTO.setPoints(actInfoDTO.getReward());
         volunteerPointsFormDTO.setOperationType(PointsOperationEnum.OPERATION_TYPE_ADD.getOperationType());
         //2021-07-14 更新为不增加用户积分 增加志愿者公益积分
-        Result result = userInfoFeignClient.handleVolunteerPoints(volunteerPointsFormDTO);
-        if (!result.success()) {
+        Result volunteerResult = userInfoFeignClient.handleVolunteerPoints(volunteerPointsFormDTO);
+        if (!volunteerResult.success()) {
             throw new RenException("更新志愿者公益积分异常");
-        }*/
+        }
         //发送消息通知
         this.sendUserInformation(actUserRelationDTO, actInfoDTO, HeartNoticeConstant.NOTICE__BUSINESS_TYPE_POINTS_SIGN_OUT);
     }
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcUserInfoResultDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcUserInfoResultDTO.java
index fd4011bd..1484f27f 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcUserInfoResultDTO.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcUserInfoResultDTO.java
@@ -25,6 +25,10 @@ public class EpdcUserInfoResultDTO implements Serializable {
      * 用户积分
      */
     private Integer points;
+    /**
+     * 用户累计积分
+     */
+    private Integer pointsTotle;
 
     /**
      * 用户积分等级
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml
index 5d236b13..b9ba645d 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml
@@ -55,6 +55,7 @@
             eu.DWELLING_PLACE AS dwellingPlace,
             eu.PARTY_FLAG AS partyFlag,
             eu.POINTS as points,
+            eu.POINTS_TOTLE as pointsTotle,
             CASE
             WHEN IFNULL(eu.POINTS_TOTLE,0) &lt;= 0 THEN 0
             ELSE