Merge remote-tracking branch 'origin/feature/syp_volunteerAdjust'

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());

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);
     }

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;
 
     /**
      * 用户积分等级

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) <= 0 THEN 0
             ELSE