From 40ff51856a11151ab3f0154a1ae3530e00dafff7 Mon Sep 17 00:00:00 2001
From: puhanshu <a9236326>
Date: 星期四, 23 十二月 2021 13:52:31 +0800
Subject: [PATCH] 修改活动bug

---
 springcloud_k8s_panzhihuazhihuishequ/timejob/src/main/java/com/panzhihua/timejob/jobhandler/CommunityJobHandler.java |   19 +++++++++----------
 1 files changed, 9 insertions(+), 10 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 8ba0e72..bf2c965 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
@@ -130,7 +130,7 @@
             // 获取待结束的活动列表
             List<Long> activityList = JSONArray.parseArray(JSONArray.toJSONString(r.getData()), Long.class);
             if (!activityList.isEmpty()) {
-                log.info("社区活动结束时计算积分");
+                log.info("社区活动结束时扣减未参与用户积分");
                 activityList.forEach(activityId -> {
                     R r1 = communityService.getTaskActivityPeopleList(activityId);
                     if (R.isOk(r1)) {
@@ -138,15 +138,14 @@
                             JSONArray.parseArray(JSONArray.toJSONString(r1.getData()), ComActActivityPeopleVO.class);
                         if (!peopleList.isEmpty()) {
                             peopleList.forEach(people -> {
-                                if (people.getIsVolunteer().equals(1)) {
-                                    communityService.addIntegralTradeAdmin(new AddComActIntegralUserDTO(
-                                        people.getActivityId(), AddComActIntegralUserDTO.integralType.cyzyzhd,
-                                        people.getCommunityId(), people.getUserId()));
-                                } else {
-                                    communityService.addIntegralTradeAdmin(new AddComActIntegralUserDTO(
-                                        people.getActivityId(), AddComActIntegralUserDTO.integralType.cysqhd,
-                                        people.getCommunityId(), people.getUserId()));
-                                }
+                                AddComActIntegralUserDTO addComActIntegralUserDTO = new AddComActIntegralUserDTO();
+                                addComActIntegralUserDTO.setUserId(people.getUserId());
+                                addComActIntegralUserDTO.setIntegralType(AddComActIntegralUserDTO.integralType.qxhd);
+                                addComActIntegralUserDTO.setActivityType(1);
+                                addComActIntegralUserDTO.setIsVolunteer(people.getIsVolunteer());
+                                addComActIntegralUserDTO.setCommunityId(people.getCommunityId());
+                                addComActIntegralUserDTO.setServiceId(activityId);
+                                communityService.addIntegralTradeAdmin(addComActIntegralUserDTO);
                             });
                         }
                     }

--
Gitblit v1.7.1