From beb311b835f093ad6975004f18a1277ca15ba5b5 Mon Sep 17 00:00:00 2001
From: yujt <work@yujt.net.cn>
Date: Wed, 9 Sep 2020 15:01:22 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=AF=E5=88=86=E8=AE=B0=E5=BD=95=E5=AF=B9?=
 =?UTF-8?q?=E8=B1=A1=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../activity/service/impl/ActUserClockLogServiceImpl.java      | 3 +--
 .../activity/service/impl/ActUserRelationServiceImpl.java      | 3 +--
 .../com/elink/esua/epdc/modules/feign/PointsFeignClient.java   | 2 +-
 .../epdc/modules/feign/fallback/PointsFeignClientFallback.java | 2 +-
 4 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserClockLogServiceImpl.java b/epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserClockLogServiceImpl.java
index 41bbe86..191e691 100644
--- a/epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserClockLogServiceImpl.java
+++ b/epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserClockLogServiceImpl.java
@@ -38,12 +38,12 @@ import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.constant.ActStateConstant;
 import com.elink.esua.epdc.constant.ActUserRelationStatusConstant;
 import com.elink.esua.epdc.constant.HeartNoticeConstant;
+import com.elink.esua.epdc.dto.PointsLogsDTO;
 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.EpdcVolunteerKindnessTimeFormDTO;
-import com.elink.esua.epdc.dto.logs.PointsLogsDTO;
 import com.elink.esua.epdc.modules.activity.dao.ActUserClockLogDao;
 import com.elink.esua.epdc.modules.activity.entity.ActUserClockLogEntity;
 import com.elink.esua.epdc.modules.activity.entity.ActUserPointsLogEntity;
@@ -231,7 +231,6 @@ public class ActUserClockLogServiceImpl extends BaseServiceImpl<ActUserClockLogD
         pointsLogsDTO.setRuleCode(PointsRuleCodeEnum.CONFIRM_JOIN_ACT.getRuleCode());
         pointsLogsDTO.setLavePoints(result.getData().getPoints());//剩余积分值
         pointsLogsDTO.setBehaviorCode(PointsBehaviorCodeEnum.JOIN_ACT.getBehaviorCode());
-        pointsLogsDTO.setStatus(YesOrNoEnum.YES.value());
         pointsLogsDTO.setReferenceId(actUserPointsLogEntity.getId());
         pointsLogsDTO.setOperationDesc(actPointCheckFormDTO.getFailureReason());
         return pointsFeignClient.addPointsLog(pointsLogsDTO);
diff --git a/epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserRelationServiceImpl.java b/epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserRelationServiceImpl.java
index f11a0e1..6fbd749 100644
--- a/epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserRelationServiceImpl.java
+++ b/epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserRelationServiceImpl.java
@@ -40,11 +40,11 @@ import com.elink.esua.epdc.constant.ActStateConstant;
 import com.elink.esua.epdc.constant.ActUserPointsOperationTypeConstant;
 import com.elink.esua.epdc.constant.ActUserRelationStatusConstant;
 import com.elink.esua.epdc.constant.HeartNoticeConstant;
+import com.elink.esua.epdc.dto.PointsLogsDTO;
 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.logs.PointsLogsDTO;
 import com.elink.esua.epdc.modules.activity.dao.ActInfoDao;
 import com.elink.esua.epdc.modules.activity.dao.ActUserLogDao;
 import com.elink.esua.epdc.modules.activity.dao.ActUserRelationDao;
@@ -350,7 +350,6 @@ public class ActUserRelationServiceImpl extends BaseServiceImpl<ActUserRelationD
         pointsLogsDTO.setRuleCode(PointsRuleCodeEnum.CANCEL_ACT.getRuleCode());//积分规则编码
         pointsLogsDTO.setLavePoints(result.getData().getPoints());//剩余积分值
         pointsLogsDTO.setBehaviorCode(PointsBehaviorCodeEnum.BREAK_PROMISE.getBehaviorCode());//积分行为编码
-        pointsLogsDTO.setStatus(YesOrNoEnum.YES.value());
         pointsLogsDTO.setReferenceId(actUserPointsLog.getId());
         pointsFeignClient.addPointsLog(pointsLogsDTO);
         //发送消息通知
diff --git a/epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/feign/PointsFeignClient.java b/epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/feign/PointsFeignClient.java
index 077ec11..14e8633 100644
--- a/epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/feign/PointsFeignClient.java
+++ b/epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/feign/PointsFeignClient.java
@@ -3,7 +3,7 @@ package com.elink.esua.epdc.modules.feign;
 import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
 
 import com.elink.esua.epdc.commons.tools.utils.Result;
-import com.elink.esua.epdc.dto.logs.PointsLogsDTO;
+import com.elink.esua.epdc.dto.PointsLogsDTO;
 import com.elink.esua.epdc.modules.feign.fallback.PointsFeignClientFallback;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
diff --git a/epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/feign/fallback/PointsFeignClientFallback.java b/epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/feign/fallback/PointsFeignClientFallback.java
index 01597dd..5842383 100644
--- a/epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/feign/fallback/PointsFeignClientFallback.java
+++ b/epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/feign/fallback/PointsFeignClientFallback.java
@@ -3,7 +3,7 @@ package com.elink.esua.epdc.modules.feign.fallback;
 import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
 import com.elink.esua.epdc.commons.tools.utils.ModuleUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
-import com.elink.esua.epdc.dto.logs.PointsLogsDTO;
+import com.elink.esua.epdc.dto.PointsLogsDTO;
 import com.elink.esua.epdc.modules.feign.PointsFeignClient;
 import org.springframework.stereotype.Component;