From 07b17771a15b7aa3287ae591011543882a8a4793 Mon Sep 17 00:00:00 2001 From: songyunpeng Date: Tue, 12 May 2020 17:55:23 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=AA=E5=BC=80=E5=A7=8B=E5=8F=96=E6=B6=88?= =?UTF-8?q?=E6=8A=A5=E5=90=8D=E5=90=8E=EF=BC=8C=E6=B2=A1=E6=9C=89=E7=A7=AF?= =?UTF-8?q?=E5=88=86=E6=8F=8F=E8=BF=B0=20=20bug=20=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../commons/tools/enums/BehaviorEnum.java | 15 ++++++++++++- .../impl/ActUserClockLogServiceImpl.java | 11 ++++++++-- .../impl/ActUserRelationServiceImpl.java | 11 +++++++++- .../epdc/modules/feign/PointsFeignClient.java | 14 ++++++++++++- .../fallback/PointsFeignClientFallback.java | 5 +++++ .../controller/PointsBehaviorController.java | 12 +++++++++++ .../esua/epdc/dao/PointsBehaviorDao.java | 8 +++++++ .../epdc/service/PointsBehaviorService.java | 9 ++++++++ .../impl/PointsBehaviorServiceImpl.java | 5 +++++ .../service/impl/PointsLogsServiceImpl.java | 21 +++++++++++++------ .../resources/mapper/PointsBehaviorDao.xml | 10 ++++++++- 11 files changed, 109 insertions(+), 12 deletions(-) diff --git a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/enums/BehaviorEnum.java b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/enums/BehaviorEnum.java index 0f3db430..d48d468b 100644 --- a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/enums/BehaviorEnum.java +++ b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/enums/BehaviorEnum.java @@ -255,7 +255,20 @@ public enum BehaviorEnum { /** * 用户进入社群 */ - GROUP_OPEN("group_open"); + GROUP_OPEN("group_open"), + /** + * 爽约 + */ + BREAK_PROMISE("break_promise"), + /** + * 手动调整志愿者积分 + */ + HAND_REGULATION_BEHAVIOR("hand_regulation_behavior"), + + /** + * 活动积分 + */ + JOIN_ACT("join_act"); private String value; 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 763ae363..eed99665 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 @@ -25,6 +25,7 @@ import com.elink.esua.epdc.activity.result.ActUserClockLogResultDTO; import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; import com.elink.esua.epdc.commons.tools.constant.FieldConstant; import com.elink.esua.epdc.commons.tools.constant.NumConstant; +import com.elink.esua.epdc.commons.tools.enums.BehaviorEnum; import com.elink.esua.epdc.commons.tools.enums.YesOrNoEnum; import com.elink.esua.epdc.commons.tools.enums.pointsenum.PointsBehaviorCodeEnum; import com.elink.esua.epdc.commons.tools.enums.pointsenum.PointsOperationEnum; @@ -44,6 +45,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.result.BehaviorResultDto; 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; @@ -222,6 +224,11 @@ public class ActUserClockLogServiceImpl extends BaseServiceImpl behaviorCodeInfo = pointsFeignClient.getBehaviorCodeInfo(BehaviorEnum.JOIN_ACT.getValue()); + if (!behaviorCodeInfo.success() || behaviorCodeInfo.getData()==null){ + throw new RenException("获取动作编码信息异常或无此动作编码"); + } pointsLogsDTO.setVolunteerId(volunteerInfoDTOResult.getData().getId()); pointsLogsDTO.setUserId(actUserRelationDTO.getUserId()); pointsLogsDTO.setNickname(actUserRelationDTO.getNickname()); @@ -232,9 +239,9 @@ public class ActUserClockLogServiceImpl extends BaseServiceImpl behaviorCodeInfo = pointsFeignClient.getBehaviorCodeInfo(BehaviorEnum.BREAK_PROMISE.getValue()); + if (!behaviorCodeInfo.success() || behaviorCodeInfo.getData()==null){ + throw new RenException("获取动作编码信息异常或无此动作编码"); + } PointsLogsDTO pointsLogsDTO = new PointsLogsDTO(); pointsLogsDTO.setVolunteerId(volunteerInfoDTOResult.getData().getId()); pointsLogsDTO.setUserId(actUserRelationDTO.getUserId()); @@ -358,8 +365,10 @@ public class ActUserRelationServiceImpl extends BaseServiceImpl + * @Description 获取动作编码信息 + * @Author songyunpeng + * @Date 2020/4/28 + * @Param [behaviorCode] + **/ + @PostMapping(value = "points/points/getBehaviorCodeInfo/{behaviorCode}", consumes = MediaType.APPLICATION_JSON_VALUE) + Result getBehaviorCodeInfo(@PathVariable String behaviorCode); } diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/feign/fallback/PointsFeignClientFallback.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/feign/fallback/PointsFeignClientFallback.java index 58423834..48d54659 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/feign/fallback/PointsFeignClientFallback.java +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/feign/fallback/PointsFeignClientFallback.java @@ -4,6 +4,7 @@ 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.PointsLogsDTO; +import com.elink.esua.epdc.dto.result.BehaviorResultDto; import com.elink.esua.epdc.modules.feign.PointsFeignClient; import org.springframework.stereotype.Component; @@ -20,4 +21,8 @@ public class PointsFeignClientFallback implements PointsFeignClient { public Result addPointsLog(PointsLogsDTO dto) { return ModuleUtils.feignConError(ServiceConstant.EPDC_POINTS_SERVER, "addPointsLog", dto); } + @Override + public Result getBehaviorCodeInfo(String behaviorCode) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_POINTS_SERVER, "getBehaviorCodeInfo", behaviorCode); + } } diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/controller/PointsBehaviorController.java b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/controller/PointsBehaviorController.java index 49c14488..cf1080e2 100644 --- a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/controller/PointsBehaviorController.java +++ b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/controller/PointsBehaviorController.java @@ -100,4 +100,16 @@ public class PointsBehaviorController { List data = pointsBehaviorService.listBehaviorDesc(); return new Result>().ok(data); } + /** + * @Description 志愿者服务使用- 获取全部动作编码 + * @Author songyunpeng + * @Date 2020/5/12 + * @Param [] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + **/ + @GetMapping("getAllBehaviorDesc") + public Result> getAllBehaviorDesc(){ + List data = pointsBehaviorService.selectAllListBehaviorDesc(); + return new Result>().ok(data); + } } diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/dao/PointsBehaviorDao.java b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/dao/PointsBehaviorDao.java index 25c4971a..6e6f77e3 100644 --- a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/dao/PointsBehaviorDao.java +++ b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/dao/PointsBehaviorDao.java @@ -57,6 +57,14 @@ public interface PointsBehaviorDao extends BaseDao { * @Param [] **/ BehaviorResultDto getBehaviorCodeInfoByBehaviorCode(String behaviorCode); + /** + * @Description 志愿者服务使用- 获取全部动作编码 + * @Author songyunpeng + * @Date 2020/5/12 + * @Param [] + * @return java.util.List + **/ + List selectAllListBehaviorDesc(); /** * 获取全部的动作编码 diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/PointsBehaviorService.java b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/PointsBehaviorService.java index 8bdb43bd..df874634 100644 --- a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/PointsBehaviorService.java +++ b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/PointsBehaviorService.java @@ -114,4 +114,13 @@ public interface PointsBehaviorService extends BaseService * @Date: 2020-04-29 */ List listBehaviorDesc(); + + /** + * @Description 志愿者服务使用- 获取全部动作编码 + * @Author songyunpeng + * @Date 2020/5/12 + * @Param [] + * @return java.util.List + **/ + List selectAllListBehaviorDesc(); } diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/impl/PointsBehaviorServiceImpl.java b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/impl/PointsBehaviorServiceImpl.java index 515d1b13..8bca665c 100644 --- a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/impl/PointsBehaviorServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/impl/PointsBehaviorServiceImpl.java @@ -185,6 +185,11 @@ public class PointsBehaviorServiceImpl extends BaseServiceImpl selectAllListBehaviorDesc() { + return baseDao.selectAllListBehaviorDesc(); + } + /** * 查询积分动作管理表 动作描述是否存在 * @param behaviorDesc 动作描述 diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/impl/PointsLogsServiceImpl.java b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/impl/PointsLogsServiceImpl.java index 263e72a0..48026cb4 100755 --- a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/impl/PointsLogsServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/impl/PointsLogsServiceImpl.java @@ -23,8 +23,10 @@ import com.elink.esua.epdc.async.NewsTask; import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; import com.elink.esua.epdc.commons.tools.constant.NumConstant; import com.elink.esua.epdc.commons.tools.constant.PointsConstant; +import com.elink.esua.epdc.commons.tools.enums.BehaviorEnum; import com.elink.esua.epdc.commons.tools.enums.pointsenum.PointsOperationEnum; import com.elink.esua.epdc.commons.tools.enums.pointsenum.PointsOperationModeEnum; +import com.elink.esua.epdc.commons.tools.exception.RenException; import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; import com.elink.esua.epdc.commons.tools.constant.FieldConstant; @@ -37,15 +39,13 @@ 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.result.EpdcAdjustVolunteerPointsDTO; import com.elink.esua.epdc.dto.form.PointsLogsFormDTO; -import com.elink.esua.epdc.dto.result.PointsLogsResultDTO; -import com.elink.esua.epdc.dto.result.PointsLogsSumResultDTO; +import com.elink.esua.epdc.dto.result.*; import com.elink.esua.epdc.dto.form.EpdcAppPointsRankingFormDTO; import com.elink.esua.epdc.dto.form.EpdcAppPointsRecordFormDTO; -import com.elink.esua.epdc.dto.result.EpdcAppPointsRankingResultDTO; -import com.elink.esua.epdc.dto.result.EpdcAppPointsRecordResultDTO; import com.elink.esua.epdc.entity.PointsLogsEntity; import com.elink.esua.epdc.feign.UsersFeignClient; import com.elink.esua.epdc.redis.PointsLogsRedis; +import com.elink.esua.epdc.service.PointsBehaviorService; import com.elink.esua.epdc.service.PointsLogsService; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -72,6 +72,9 @@ public class PointsLogsServiceImpl extends BaseServiceImpl behaviorCodeInfoByBehaviorCode = pointsBehaviorService.getBehaviorCodeInfoByBehaviorCode(formDto.getBehaviorCode()); + if (!behaviorCodeInfoByBehaviorCode.success() || behaviorCodeInfoByBehaviorCode.getData()==null){ + throw new RenException("获取动作编码信息异常或无此动作编码"); + } PointsLogsEntity pointsLogsEntity=new PointsLogsEntity(); pointsLogsEntity.setVolunteerId(formDto.getId()); pointsLogsEntity.setUserId(formDto.getUserId()); @@ -172,10 +180,11 @@ public class PointsLogsServiceImpl extends BaseServiceImpl - +