diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java index 1492b37e..79cd6cd7 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java @@ -1170,6 +1170,7 @@ public class AppUserServiceImpl implements AppUserService { formDto.setSex(IdentityNoUtils.getSex(identityNo)); formDto.setBirthday(DateUtils.parse(IdentityNoUtils.getBirthday(identityNo), DateUtils.DATE_PATTERN)); formDto.setUserId(tokenDto.getUserId()); + formDto.setGridId(tokenDto.getGridId()); // 新增志愿者 Result insertCountResult = userFeignClient.insertVolunteerInfo(formDto); if (!insertCountResult.success()) { diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/constant/HeartNoticeConstant.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/constant/HeartNoticeConstant.java index 4f3850b8..f39a31e2 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/constant/HeartNoticeConstant.java +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/constant/HeartNoticeConstant.java @@ -16,6 +16,12 @@ public interface HeartNoticeConstant { */ String NOTICE_SIGN_UP_PASSED = "您报名的活动【审核通过】"; + /** + * 活动报名自动审核 + */ + String AUTH_NOTICE_SIGN_UP= "自动审核"; + + /** * 活动取消 */ 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 08ede80e..60393345 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 @@ -349,7 +349,7 @@ public class ActUserRelationServiceImpl extends BaseServiceImpl behaviorCodeInfo = pointsFeignClient.getBehaviorCodeInfo(BehaviorEnum.BREAK_PROMISE.getValue()); - if (!behaviorCodeInfo.success() || behaviorCodeInfo.getData()==null){ + if (!behaviorCodeInfo.success() || behaviorCodeInfo.getData() == null) { throw new RenException("获取动作编码信息异常或无此动作编码"); } PointsLogsDTO pointsLogsDTO = new PointsLogsDTO(); @@ -480,6 +480,8 @@ public class ActUserRelationServiceImpl extends BaseServiceImpl