diff --git a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/enums/pointsenum/PointsBehaviorCodeEnum.java b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/enums/pointsenum/PointsBehaviorCodeEnum.java new file mode 100644 index 000000000..2f92d2140 --- /dev/null +++ b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/enums/pointsenum/PointsBehaviorCodeEnum.java @@ -0,0 +1,39 @@ +package com.elink.esua.epdc.commons.tools.enums.pointsenum; + +/** + * @Auther: yinzuomei + * @Date: 2020/2/6 14:01 + * @Description: 积分行为编码 + */ +public enum PointsBehaviorCodeEnum { + LIKE("like","赞"), + DISLIKE("dislike","踩"), + SHARE("share","分享"), + CLOCK("clock","打卡"), + COMMENT("comment","评论"), + BREAK_PROMISE("break_promise","爽约"); + + private String behaviorCode; + private String name; + + PointsBehaviorCodeEnum(String behaviorCode,String name){ + this.behaviorCode=behaviorCode; + this.name=name; + } + + public String getBehaviorCode() { + return behaviorCode; + } + + public void setBehaviorCode(String behaviorCode) { + this.behaviorCode = behaviorCode; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } +} diff --git a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/enums/pointsenum/PointsRuleCodeEnum.java b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/enums/pointsenum/PointsRuleCodeEnum.java new file mode 100644 index 000000000..44d8a5ef8 --- /dev/null +++ b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/enums/pointsenum/PointsRuleCodeEnum.java @@ -0,0 +1,35 @@ +package com.elink.esua.epdc.commons.tools.enums.pointsenum; + +/** + * @Auther: yinzuomei + * @Date: 2020/2/6 14:00 + * @Description: 积分规则编码 + */ +public enum PointsRuleCodeEnum { + CANCEL_ACT("cancel_act","取消报名系统扣减积分"); + + private String ruleCode; + private String name; + + PointsRuleCodeEnum(String ruleCode,String name){ + this.ruleCode=ruleCode; + this.name=name; + } + + public String getRuleCode() { + return ruleCode; + } + + public void setRuleCode(String ruleCode) { + this.ruleCode = ruleCode; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } +} + diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/constant/ActUserPointsOperationTypeConstant.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/constant/ActUserPointsOperationTypeConstant.java new file mode 100644 index 000000000..cfd1f7329 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/constant/ActUserPointsOperationTypeConstant.java @@ -0,0 +1,31 @@ +package com.elink.esua.epdc.constant; + +/** + * @Description 操作类型 0-系统确认积分,2-管理员确认积分,4-取消报名扣减积分,6-管理员扣减积分,8-拒绝积分 + * @Author yinzuomei + * @Date 2020/2/6 12:03 + */ +public interface ActUserPointsOperationTypeConstant { + /** + * 系统确认积分 + */ + String SYS_CONFIRM_ADD = "0"; + + /** + * 管理员确认积分 + */ + String ADMIN_CONFIRM="2"; + /** + * 取消报名扣减积分 + */ + String CANCEL_ACT_SUBTRACT="4"; + + /** + * 管理员扣减积分 + */ + String ADMIN_OPERATE_POINTS="6"; + /** + * 拒绝积分 + */ + String REFUSE_POINTS="8"; +} diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/dao/ActUserRelationDao.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/dao/ActUserRelationDao.java index b6805e9c9..b9cfa10c1 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/dao/ActUserRelationDao.java +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/dao/ActUserRelationDao.java @@ -49,11 +49,15 @@ public interface ActUserRelationDao extends BaseDao { /** * 获取用户活动关系表主键ID + * * @param userId * @param actId + * @param statusList * @return */ - List selectOneActUserRelationInfo(@Param("userId")String userId, @Param("actId")String actId); + List selectOneActUserRelationInfo(@Param("userId") String userId, + @Param("actId") String actId, + @Param("statusList") List statusList); /** * 通过活动ID查询人员活动关系信息 diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/ActUserRelationService.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/ActUserRelationService.java index d7441d34f..85b287273 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/ActUserRelationService.java +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/ActUserRelationService.java @@ -131,11 +131,12 @@ public interface ActUserRelationService extends BaseService statusList); /** * 活动打卡,更新活动人员关系表当前状态 diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActInfoServiceImpl.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActInfoServiceImpl.java index 71ba404a5..256ce5cbf 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActInfoServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActInfoServiceImpl.java @@ -226,8 +226,6 @@ public class ActInfoServiceImpl extends BaseServiceImpl().ok(resultDTO); } @@ -246,6 +244,8 @@ public class ActInfoServiceImpl extends BaseServiceImpl userVolunteerFlagResult = userInfoFeignClient.queryUserVolunteerFlag(formDto.getUserId()); detailResultDTO.setUserVolunteerFlag(userVolunteerFlagResult.getData()); ActInfoDetailAppResultDTO resultDTO = ConvertUtils.sourceToTarget(detailResultDTO, ActInfoDetailAppResultDTO.class); + //获取活动详情 活动信息表 浏览数+1 banner表 浏览数+1 + this.addActBrowseNumber(resultDTO); return new Result().ok(resultDTO); } 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 849d1c01a..75581ffce 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 @@ -31,9 +31,11 @@ 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.utils.Result; import com.elink.esua.epdc.constant.ActStateConstant; +import com.elink.esua.epdc.constant.ActUserRelationStatusConstant; import com.elink.esua.epdc.dto.UserDTO; import com.elink.esua.epdc.dto.logs.PointsLogsDTO; import com.elink.esua.epdc.modules.activity.dao.ActUserClockLogDao; +import com.elink.esua.epdc.modules.activity.dao.ActUserRelationDao; import com.elink.esua.epdc.modules.activity.entity.ActUserClockLogEntity; import com.elink.esua.epdc.modules.activity.redis.ActUserClockLogRedis; import com.elink.esua.epdc.modules.activity.service.*; @@ -45,10 +47,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.interceptor.TransactionAspectSupport; -import java.util.Arrays; -import java.util.Date; -import java.util.List; -import java.util.Map; +import java.util.*; /** * 用户打卡日志表 用户打卡日志表 @@ -80,7 +79,8 @@ public class ActUserClockLogServiceImpl extends BaseServiceImpl statusList = new ArrayList<>(); + statusList.add(ActUserRelationStatusConstant.APPROVED); + statusList.add(ActUserRelationStatusConstant.CLOCK); + ActUserRelationDTO actUserRelationDTO = actUserRelationService.getActUserRelationId(appActUserClockLogDTO.getUserId(), appActUserClockLogDTO.getActId(), statusList); ActUserClockLogDTO actUserClockLogDTO = ConvertUtils.sourceToTarget(appActUserClockLogDTO, ActUserClockLogDTO.class); - if(actUserRelationDTO.getId() == null){ + if (actUserRelationDTO.getId() == null) { return new Result().error("打卡失败"); } actUserClockLogDTO.setActUserId(actUserRelationDTO.getId()); @@ -249,11 +252,11 @@ public class ActUserClockLogServiceImpl extends BaseServiceImpl imgList = appActUserClockLogDTO.getImages(); 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 af9a180c1..ba6866b1d 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 @@ -26,19 +26,36 @@ import com.elink.esua.epdc.activity.result.ActUserClockResultDTO; import com.elink.esua.epdc.activity.result.ActUserRelationResultDTO; 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.enums.YesOrNoEnum; +import com.elink.esua.epdc.commons.tools.enums.pointsenum.PointsBehaviorCodeEnum; +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.enums.pointsenum.PointsRuleCodeEnum; +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.utils.Result; 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.dto.UserDTO; +import com.elink.esua.epdc.dto.VolunteerInfoDTO; +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.ActUserPointsLogDao; import com.elink.esua.epdc.modules.activity.dao.ActUserRelationDao; +import com.elink.esua.epdc.modules.activity.entity.ActUserPointsLogEntity; import com.elink.esua.epdc.modules.activity.entity.ActUserRelationEntity; import com.elink.esua.epdc.modules.activity.redis.ActUserRelationRedis; import com.elink.esua.epdc.modules.activity.service.ActInfoService; import com.elink.esua.epdc.modules.activity.service.ActUserLogService; import com.elink.esua.epdc.modules.activity.service.ActUserRelationService; +import com.elink.esua.epdc.modules.feign.PointsFeignClient; +import com.elink.esua.epdc.modules.feign.UserInfoFeignClient; import org.apache.commons.lang3.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -53,7 +70,7 @@ import java.util.*; */ @Service public class ActUserRelationServiceImpl extends BaseServiceImpl implements ActUserRelationService { - + protected Logger logger = LoggerFactory.getLogger(getClass()); @Autowired private ActUserRelationRedis actUserRelationRedis; @@ -64,7 +81,16 @@ public class ActUserRelationServiceImpl extends BaseServiceImpl page(Map params) { @@ -74,6 +100,7 @@ public class ActUserRelationServiceImpl extends BaseServiceImpl getActUserRelationPageFromPC(Map params) { IPage page = getPage(params); @@ -196,37 +223,97 @@ public class ActUserRelationServiceImpl extends BaseServiceImpl data = baseDao.selectOneActUserRelationInfo(appActUserCancelsignupDTO.getUserId(), appActUserCancelsignupDTO.getActId()); + List statusList = new ArrayList<>(); + statusList.add(ActUserRelationStatusConstant.SIGN_UP); + statusList.add(ActUserRelationStatusConstant.APPROVED); + List data = baseDao.selectOneActUserRelationInfo(appActUserCancelsignupDTO.getUserId(), appActUserCancelsignupDTO.getActId(), statusList); if (data != null && data.size() > 0) { ActUserRelationDTO actUserRelationDTO = data.get(0); actUserRelationDTO.setStatus(ActUserRelationStatusConstant.CANCEL_SIGN_UP);//取消报名 actUserRelationDTO.setFailureReason(appActUserCancelsignupDTO.getFailureReason());//取消报名原因 //已报名该活动,进行取消报名 - //更新活动人员关系表 + //1、更新活动人员关系表 ActUserRelationEntity entity = ConvertUtils.sourceToTarget(actUserRelationDTO, ActUserRelationEntity.class); updateById(entity); - //存储活动日志表 + //2、存储活动日志表 + Date currentTime = new Date(); ActUserLogDTO actUserLogDTO = new ActUserLogDTO(); actUserLogDTO.setActUserRelationId(actUserRelationDTO.getId()); actUserLogDTO.setOperationType(ActUserRelationStatusConstant.CANCEL_SIGN_UP);//取消报名 - actUserLogDTO.setOperationTime(new Date()); + actUserLogDTO.setOperationTime(currentTime); actUserLogDTO.setFailureReason(appActUserCancelsignupDTO.getFailureReason()); actUserLogService.save(actUserLogDTO); - //更新epdc_act_info的已报名名额 - ActInfoDTO actInfoDTO = actInfoDao.queryActSignupNum(actUserRelationDTO.getActId()); + //3、更新epdc_act_info的已报名名额 + //ActInfoDTO actInfoDTO = actInfoDao.queryActSignupNum(actUserRelationDTO.getActId()); + ActInfoDTO actInfoDTO = actInfoService.get(actUserRelationDTO.getActId()); actInfoDTO.setSignupNum(actInfoDTO.getSignupNum() - 1); actInfoService.update(actInfoDTO); - }else{ + //4、判断是否扣除用户积分 + if (currentTime.after(actInfoDTO.getSignupEndTime()) && currentTime.before(actInfoDTO.getActStartTime())) { + this.cancelActSubtractPoint(actUserRelationDTO, actInfoDTO); + } + + } else { return new Result().error("未报名"); } return new Result().ok("取消报名成功"); } + /** + * @param actUserRelationDTO + * @param actInfoDTO + * @return void + * @Author yinzuomei + * @Description 活动报名结束到活动开始时间段内取消报名要扣除用户积分,扣除积分值为当前活动的惩罚积分 + * @Date 2020/2/6 12:00 + **/ + private void cancelActSubtractPoint(ActUserRelationDTO actUserRelationDTO, ActInfoDTO actInfoDTO) { + if (null == actInfoDTO.getPunishmentPoints() || actInfoDTO.getPunishmentPoints() == 0) { + return; + } + Result volunteerInfoDTOResult = userInfoFeignClient.getVolunteerInfoDTOByUserId(actUserRelationDTO.getUserId()); + if (!volunteerInfoDTOResult.success()) { + throw new RenException("查询志愿者信息异常"); + } + //4、更新epdc_user表积分 + //直接调用fegin,返回剩余积分值 + EpdcUserPointsFormDTO userPointsFormDTO = new EpdcUserPointsFormDTO(); + userPointsFormDTO.setUserId(actUserRelationDTO.getUserId()); + userPointsFormDTO.setPoints(actInfoDTO.getPunishmentPoints()); + userPointsFormDTO.setOperationType(PointsOperationEnum.OPERATION_TYPE_SUBSTRACT.getOperationType()); + Result result = userInfoFeignClient.handleUserPoints(userPointsFormDTO); + if (!result.success()) { + throw new RenException("更新用户积分异常"); + } + //5、插入epdc_act_user_points_log记录 + ActUserPointsLogDTO actUserPointsLogDTO = new ActUserPointsLogDTO(); + actUserPointsLogDTO.setActUserId(actUserRelationDTO.getId()); + actUserPointsLogDTO.setOperationType(ActUserPointsOperationTypeConstant.CANCEL_ACT_SUBTRACT); + actUserPointsLogDTO.setOperationPointsType(PointsOperationEnum.OPERATION_TYPE_SUBSTRACT.getOperationType()); + actUserPointsLogDTO.setPoints(actInfoDTO.getPunishmentPoints()); + ActUserPointsLogEntity entity = ConvertUtils.sourceToTarget(actUserPointsLogDTO, ActUserPointsLogEntity.class); + actUserPointsLogDao.insert(entity); + //6、插入points记录 + PointsLogsDTO pointsLogsDTO = new PointsLogsDTO(); + pointsLogsDTO.setVolunteerId(volunteerInfoDTOResult.getData().getId()); + pointsLogsDTO.setUserId(actUserRelationDTO.getUserId()); + pointsLogsDTO.setOperationType(PointsOperationEnum.OPERATION_TYPE_SUBSTRACT.getOperationType()); + pointsLogsDTO.setPoints(actInfoDTO.getPunishmentPoints()); + pointsLogsDTO.setOperationTime(new Date()); + pointsLogsDTO.setOperationMode(PointsOperationModeEnum.OPERATION_MODE_USER.getOperationMode()); + pointsLogsDTO.setRuleCode(PointsRuleCodeEnum.CANCEL_ACT.getRuleCode());//积分规则编码 + pointsLogsDTO.setLavePoints(result.getData().getPoints());//剩余积分值 + pointsLogsDTO.setBehaviorCode(PointsBehaviorCodeEnum.BREAK_PROMISE.getBehaviorCode());//积分行为编码 + pointsLogsDTO.setStatus(YesOrNoEnum.YES.value()); + pointsLogsDTO.setReferenceId(entity.getId()); + pointsFeignClient.addPointsLog(pointsLogsDTO); + } + @Override - public ActUserRelationDTO getActUserRelationId(String userId,String actId) { - List data = baseDao.selectOneActUserRelationInfo(userId,actId); + public ActUserRelationDTO getActUserRelationId(String userId, String actId, List statusList) { + List data = baseDao.selectOneActUserRelationInfo(userId, actId, statusList); ActUserRelationDTO actUserRelationDTO = new ActUserRelationDTO(); - if(data != null && data.size() > 0){ + if (data != null && data.size() > 0) { actUserRelationDTO = data.get(0); } diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/feign/UserInfoFeignClient.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/feign/UserInfoFeignClient.java index 246f0cfb9..045ab88e7 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/feign/UserInfoFeignClient.java +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/feign/UserInfoFeignClient.java @@ -3,8 +3,11 @@ 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.UserDTO; +import com.elink.esua.epdc.dto.VolunteerInfoDTO; +import com.elink.esua.epdc.dto.epdc.form.EpdcUserPointsFormDTO; import com.elink.esua.epdc.modules.feign.fallback.UserInfoFeignClientFallback; import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.http.MediaType; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; @@ -43,4 +46,24 @@ public interface UserInfoFeignClient { **/ @GetMapping("app-user/volunteerinfo/queryUserVolunteerFlag/{userId}") Result queryUserVolunteerFlag(@PathVariable("userId") String userId); + + /** + * @param userId 用户id + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @Author yinzuomei 根据用户id查询志愿者信息 + * @Description 根据用户id + * @Date 2020/2/6 12:20 + **/ + @GetMapping("app-user/volunteerinfo/getVolunteerInfoDTOByUserId/{userId}") + Result getVolunteerInfoDTOByUserId(@PathVariable("userId") String userId); + + /** + * @param formDTO + * @return com.elink.esua.epdc.dto.UserDTO + * @Author yinzuomei + * @Description 根据操作类型更新用户积分 + * @Date 2019/12/13 15:12 + **/ + @PostMapping(value = "app-user/user/handleUserPoints", consumes = MediaType.APPLICATION_JSON_VALUE) + Result handleUserPoints(EpdcUserPointsFormDTO formDTO); } diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/feign/fallback/UserInfoFeignClientFallback.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/feign/fallback/UserInfoFeignClientFallback.java index 3af5c4c8c..694bb17e8 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/feign/fallback/UserInfoFeignClientFallback.java +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/feign/fallback/UserInfoFeignClientFallback.java @@ -4,6 +4,8 @@ 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.UserDTO; +import com.elink.esua.epdc.dto.VolunteerInfoDTO; +import com.elink.esua.epdc.dto.epdc.form.EpdcUserPointsFormDTO; import com.elink.esua.epdc.modules.feign.UserInfoFeignClient; import org.springframework.stereotype.Component; @@ -26,4 +28,15 @@ public class UserInfoFeignClientFallback implements UserInfoFeignClient { public Result queryUserVolunteerFlag(String userId) { return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "queryUserVolunteerFlag", userId); } + + @Override + public Result getVolunteerInfoDTOByUserId(String userId) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "getVolunteerInfoDTOByUserId", userId); + } + + @Override + public Result handleUserPoints(EpdcUserPointsFormDTO formDTO) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "handleUserPoints", formDTO); + } + } diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActUserRelationDao.xml b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActUserRelationDao.xml index 8896136d4..a723342eb 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActUserRelationDao.xml +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActUserRelationDao.xml @@ -50,13 +50,20 @@ and DEL_FLAG = 0 - select ID,ACT_ID,USER_ID,FACE_IMG,NICKNAME,REAL_NAME,PARTY_FLAG from epdc_act_user_relation where USER_ID = #{userId} and ACT_ID = #{actId} - and status in ('0' ,'1') + + and status in + + #{status} + + + - + +