From 63b224f484539f7df68d90700596dbd4a8d18734 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期一, 08 八月 2022 10:15:58 +0800
Subject: [PATCH] Merge branch 'huacheng_test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/timejob/src/main/java/com/panzhihua/timejob/jobhandler/CommunityJobHandler.java | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/timejob/src/main/java/com/panzhihua/timejob/jobhandler/CommunityJobHandler.java b/springcloud_k8s_panzhihuazhihuishequ/timejob/src/main/java/com/panzhihua/timejob/jobhandler/CommunityJobHandler.java
index b4855de..658f039 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/timejob/src/main/java/com/panzhihua/timejob/jobhandler/CommunityJobHandler.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/timejob/src/main/java/com/panzhihua/timejob/jobhandler/CommunityJobHandler.java
@@ -100,7 +100,7 @@
sysUserNoticeVO.setBusinessContent("报名人数不足活动自动取消");
sysUserNoticeVO.setBusinessStatus(1);
sysUserNoticeVO
- .setActivityType(activitySignVO.getIsVolunteer().intValue() == 1 ? 1 : 2);
+ .setActivityType(activitySignVO.getSignIdentity().intValue() == 1 ? 1 : 2);
R r2 = userService.addNotice(sysUserNoticeVO);
if (R.isOk(r2)) {
log.info("新增社区活动取消通知成功【{}】", JSONObject.toJSONString(sysUserNoticeVO));
@@ -141,8 +141,7 @@
AddComActIntegralUserDTO addComActIntegralUserDTO = new AddComActIntegralUserDTO();
addComActIntegralUserDTO.setUserId(people.getUserId());
addComActIntegralUserDTO.setIntegralType(AddComActIntegralUserDTO.integralType.qxhd);
- addComActIntegralUserDTO.setActivityType(1);
- addComActIntegralUserDTO.setIsVolunteer(people.getIsVolunteer());
+ addComActIntegralUserDTO.setSignIdentity(people.getSignIdentity());
addComActIntegralUserDTO.setCommunityId(people.getCommunityId());
addComActIntegralUserDTO.setServiceId(activityId);
communityService.addIntegralTradeAdmin(addComActIntegralUserDTO);
--
Gitblit v1.7.1