Compare commits

...

2 Commits

Author SHA1 Message Date
yujt fdc56243d9 update test port 5 years ago
yujt beb311b835 积分记录对象修改 5 years ago
  1. 2
      epdc-cloud-heart/pom.xml
  2. 3
      epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserClockLogServiceImpl.java
  3. 3
      epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserRelationServiceImpl.java
  4. 2
      epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/feign/PointsFeignClient.java
  5. 2
      epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/feign/fallback/PointsFeignClientFallback.java

2
epdc-cloud-heart/pom.xml

@ -177,7 +177,7 @@
<spring.profiles.active>test</spring.profiles.active>
<docker.tag>test</docker.tag>
<server.port>10008</server.port>
<server.port>17032</server.port>
<spring.redis.index>9</spring.redis.index>
<spring.redis.host>114.215.125.123</spring.redis.host>

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

3
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);
//发送消息通知

2
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;

2
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;

Loading…
Cancel
Save