Merge remote-tracking branch 'origin/test' into txb

tangxiaobao

2021-07-31 dde29a93461a81940dbef9a65c60fa2690f2097e

 springcloud_k8s_panzhihuazhihuishequ/timejob/src/main/java/com/panzhihua/timejob/jobhandler/CommunityJobHandler.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.ActivitySignVO;
import com.panzhihua.common.model.vos.community.ComActActivityVO;
import com.panzhihua.common.model.vos.community.ComMngCarExcelVO;
import com.panzhihua.common.model.vos.community.integral.admin.ComActActivityPeopleVO;
import com.panzhihua.common.model.vos.user.SysUserNoticeVO;
import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.service.user.UserService;
@@ -112,6 +115,30 @@
    public ReturnT<String> timedTaskActActivityAllJobHandler(String param) throws Exception {
        log.info("定时任务刷新社区活动的各个状态 除取消外");
        R r=communityService.timedTaskActActivityAll();
        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 = communityService.getTaskActivityPeopleList(activityId);
                    if (R.isOk(r1)){
                        List<ComActActivityPeopleVO> peopleList = 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()));
                                }
                            });
                        }
                    }
                });
            }
        }
        log.info("执行结果【{}】",r.toString());
        return ReturnT.SUCCESS;
    }