From dde29a93461a81940dbef9a65c60fa2690f2097e Mon Sep 17 00:00:00 2001
From: tangxiaobao <303826152@qq.com>
Date: 星期六, 31 七月 2021 10:15:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into txb
---
springcloud_k8s_panzhihuazhihuishequ/timejob/src/main/java/com/panzhihua/timejob/jobhandler/PartyBuildingJobHandler.java | 24 ++++++++++++++++++++++++
1 files changed, 24 insertions(+), 0 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/timejob/src/main/java/com/panzhihua/timejob/jobhandler/PartyBuildingJobHandler.java b/springcloud_k8s_panzhihuazhihuishequ/timejob/src/main/java/com/panzhihua/timejob/jobhandler/PartyBuildingJobHandler.java
index 6265902..9f78597 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/timejob/src/main/java/com/panzhihua/timejob/jobhandler/PartyBuildingJobHandler.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/timejob/src/main/java/com/panzhihua/timejob/jobhandler/PartyBuildingJobHandler.java
@@ -2,9 +2,12 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
+import com.panzhihua.common.model.dtos.community.integral.admin.AddComActIntegralUserDTO;
import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.integral.admin.ComActActivityPeopleVO;
import com.panzhihua.common.model.vos.partybuilding.PartyBuildingActivityVO;
import com.panzhihua.common.model.vos.user.SysUserNoticeVO;
+import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.service.partybuilding.PartyBuildingService;
import com.panzhihua.common.service.user.UserService;
import com.xxl.job.core.biz.model.ReturnT;
@@ -31,6 +34,8 @@
private PartyBuildingService partyBuildingService;
@Resource
private UserService userService;
+ @Resource
+ private CommunityService communityService;
/**
* 定时任务刷新党建动态发布状态
@@ -98,6 +103,25 @@
public ReturnT<String> timedTaskPartyBuildingActivityAllJobHandler(String param) throws Exception {
log.info("定时任务刷新党建活动的各个状态 除取消外");
R r=partyBuildingService.timedTaskPartyBuildingActivityAll();
+ if(R.isOk(r)){
+ //获取待结束的活动列表
+ List<Long> activityList = JSONArray.parseArray(JSONArray.toJSONString(r.getData()), Long.class);
+ if(!activityList.isEmpty()){
+ log.info("党员活动结束计算积分");
+ activityList.forEach(activityId -> {
+ R r1 = partyBuildingService.getTaskPbActivityPeopleList(activityId);
+ if (R.isOk(r1)){
+ List<ComActActivityPeopleVO> peopleList = JSONArray.parseArray(JSONArray.toJSONString(r1.getData()), ComActActivityPeopleVO.class);
+ if(!peopleList.isEmpty()){
+ peopleList.forEach(people -> {
+ communityService.addIntegralTradeAdmin(new AddComActIntegralUserDTO(people.getActivityId()
+ ,AddComActIntegralUserDTO.integralType.cydyhd,people.getCommunityId(),people.getUserId()));
+ });
+ }
+ }
+ });
+ }
+ }
log.info("执行结果【{}】",r.toString());
return ReturnT.SUCCESS;
}
--
Gitblit v1.7.1