三社功能,抽奖功能修改

101captain

2022-02-28 e1faffeb7e30b144de870b496c5c2d71cf721cc0

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java

@@ -20,10 +20,12 @@

import javax.annotation.Resource;

import com.panzhihua.common.model.vos.community.*;
import org.apache.commons.lang3.time.DateUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import org.springframework.util.ObjectUtils;

import com.alibaba.fastjson.JSONObject;
@@ -39,16 +41,6 @@
import com.panzhihua.common.model.vos.IndexDataVO;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ActivitySignVO;
import com.panzhihua.common.model.vos.community.ComActActEvaluateVO;
import com.panzhihua.common.model.vos.community.ComActActPictureVO;
import com.panzhihua.common.model.vos.community.ComActActRegistVO;
import com.panzhihua.common.model.vos.community.ComActActivityStatisticsVO;
import com.panzhihua.common.model.vos.community.ComActActivityTypeVO;
import com.panzhihua.common.model.vos.community.ComActActivityVO;
import com.panzhihua.common.model.vos.community.CommunityActivitiesVO;
import com.panzhihua.common.model.vos.community.CommunityGovernanceTrendsVO;
import com.panzhihua.common.model.vos.community.SignactivityVO;
import com.panzhihua.common.model.vos.community.screen.work.ActActivityListVO;
import com.panzhihua.common.service.user.UserService;
import com.panzhihua.common.utlis.WxUtil;
@@ -904,7 +896,6 @@
        if (isNull(activityId)) {
            return R.fail("签到所属活动id不能为空！");
        }
        if(comActActRegistVO.getActivityType()==1){
            ComActActivityDO comActActivityDO = comActActivityDAO.selectById(activityId);
            if (isNull(comActActivityDO)) {
                return R.fail("活动不存在！");
@@ -922,56 +913,84 @@
            if (nowDate.before(beginAt) || nowDate.after(endAt)) {
                return R.fail("不在活动时间范围内");
            }

            int signDayCount = comActActRegistDAO.selectCount(new QueryWrapper<ComActActRegistDO>()
                    .lambda().eq(ComActActRegistDO::getActivityId, activityId).eq(ComActActRegistDO::getUserId, userId).eq(ComActActRegistDO::getCodeId,comActActRegistVO.getCodeId()));
            int signAllCount = comActActRegistDAO.selectCount(new QueryWrapper<ComActActRegistDO>()
                    .lambda().eq(ComActActRegistDO::getActivityId, activityId).eq(ComActActRegistDO::getUserId, userId));
            if (signDayCount > 0) {
                return R.fail("请扫描新的签到码");
            }
            Integer haveIntegralReward = comActActivityDO.getHaveIntegralReward();
            boolean isHave = nonNull(haveIntegralReward) && haveIntegralReward.equals(1);
            if (isHave) {
                int limit = comActActivityDO.getLimit().intValue();
                if(limit != -1 && signAllCount >= limit){
                    return R.fail("签到次数上限");
                }
            }
        Integer haveIntegralReward = comActActivityDO.getHaveIntegralReward();
        boolean isHave = nonNull(haveIntegralReward) && haveIntegralReward.equals(1);

//        String activitySignInKey = String.join(DELIMITER, ACTIVITY_SIGN_IN, userId.toString(), activityId.toString());
//        if (stringRedisTemplate.hasKey(activitySignInKey)) {
//            return R.fail("你已签到，如要再次签到请三十分钟后尝试！");
//        }
            ComActActRegistDO comActActRegistDO = new ComActActRegistDO();
            comActActRegistDO.setActivityId(activityId);
            comActActRegistDO.setType(1);
            comActActRegistDO.setUserId(userId);
            comActActRegistDO.setIsVolunteer(comActActSignDO.getIsVolunteer());
            comActActRegistDO.setCreateAt(nowDate);
            comActActRegistDO.setCodeId(comActActRegistVO.getCodeId());
            comActActRegistDO.setAward(isHave ? comActActivityDO.getRewardIntegral() : 0);
            comActActRegistDO.setPosition(comActActRegistVO.getPosition());
            comActActRegistDO.setTimes(signAllCount+1);
            int result = comActActRegistDAO.insert(comActActRegistDO);
            if (result > 0) {
            if(comActActRegistVO.getType()!=null&&comActActRegistVO.getType()==2){
                ComActActRegistDO comActActActRegistDO=comActActRegistDAO.selectOne(new QueryWrapper<ComActActRegistDO>()
                        .lambda().eq(ComActActRegistDO::getActivityId, activityId).eq(ComActActRegistDO::getUserId, userId).eq(ComActActRegistDO::getCodeId,comActActRegistVO.getCodeId()));
                if(comActActActRegistDO==null){
                    return R.fail("未签到无法签退");
                }
                if(comActActActRegistDO.getEndTime()!=null){
                    return R.fail("无法重复签退");
                }
                comActActRegistDO.setId(comActActRegistVO.getId());
                comActActRegistDO.setEndTime(new Date());
                int result=comActActRegistDAO.updateById(comActActRegistDO);
                if (result > 0) {
                    if (isHave) {
                        AddComActIntegralUserDTO addComActIntegralUserDTO=new AddComActIntegralUserDTO();
                        addComActIntegralUserDTO.setUserId(userId);
                        addComActIntegralUserDTO.setIntegralType(6);
                        addComActIntegralUserDTO.setActivityType(2);
                        addComActIntegralUserDTO.setCommunityId(comActActivityDO.getCommunityId());
                        addComActIntegralUserDTO.setServiceId(activityId);
                        comActIntegralUserTradeService.addIntegralTradeAdmin(addComActIntegralUserDTO);
                        return R.ok(comActActivityDO.getRewardIntegral());
                    } else {
                        return R.ok();
                    }
                }
            }
            else {
                int signDayCount = comActActRegistDAO.selectCount(new QueryWrapper<ComActActRegistDO>()
                        .lambda().eq(ComActActRegistDO::getActivityId, activityId).eq(ComActActRegistDO::getUserId, userId).eq(ComActActRegistDO::getCodeId,comActActRegistVO.getCodeId()));
                int signAllCount = comActActRegistDAO.selectCount(new QueryWrapper<ComActActRegistDO>()
                        .lambda().eq(ComActActRegistDO::getActivityId, activityId).eq(ComActActRegistDO::getUserId, userId));
                if (signDayCount > 0) {
                    return R.fail("请扫描新的签到码");
                }
                if (isHave) {
                    boolean isVolunteerAct = comActActivityDO.getVolunteerMax() != 0;
                    AddComActIntegralUserDTO addComActIntegralUserDTO=new AddComActIntegralUserDTO();
                    addComActIntegralUserDTO.setUserId(userId);
                    addComActIntegralUserDTO.setIntegralType(isVolunteerAct ? 5 : 4);
                    addComActIntegralUserDTO.setActivityType(1);
                    addComActIntegralUserDTO.setIsVolunteer(comActActSignDO.getIsVolunteer());
                    addComActIntegralUserDTO.setCommunityId(comActActivityDO.getCommunityId());
                    addComActIntegralUserDTO.setServiceId(activityId);
                    comActIntegralUserTradeService.addIntegralTradeAdmin(addComActIntegralUserDTO);
                    return R.ok(comActActivityDO.getRewardIntegral());
                } else {
                    return R.ok();
                    int limit = comActActivityDO.getLimit().intValue();
                    if(limit != -1 && signAllCount >= limit){
                        return R.fail("签到次数上限");
                    }
                }
                comActActRegistDO.setActivityId(activityId);
                comActActRegistDO.setStartTime(new Date());
                comActActRegistDO.setType(1);
                comActActRegistDO.setUserId(userId);
                comActActRegistDO.setIsVolunteer(comActActSignDO.getIsVolunteer());
                comActActRegistDO.setCreateAt(nowDate);
                comActActRegistDO.setCodeId(comActActRegistVO.getCodeId());
                comActActRegistDO.setAward(isHave ? comActActivityDO.getRewardIntegral() : 0);
                comActActRegistDO.setPosition(comActActRegistVO.getPosition());
                comActActRegistDO.setTimes(signAllCount+1);
                int result = comActActRegistDAO.insert(comActActRegistDO);
                if (result > 0&&comActActRegistDO.getType()==1) {
                    if (isHave) {
                        boolean isVolunteerAct = comActActivityDO.getVolunteerMax() != 0;
                        AddComActIntegralUserDTO addComActIntegralUserDTO=new AddComActIntegralUserDTO();
                        addComActIntegralUserDTO.setUserId(userId);
                        addComActIntegralUserDTO.setIntegralType(isVolunteerAct ? 5 : 4);
                        addComActIntegralUserDTO.setActivityType(1);
                        addComActIntegralUserDTO.setIsVolunteer(comActActSignDO.getIsVolunteer());
                        addComActIntegralUserDTO.setCommunityId(comActActivityDO.getCommunityId());
                        addComActIntegralUserDTO.setServiceId(activityId);
                        comActIntegralUserTradeService.addIntegralTradeAdmin(addComActIntegralUserDTO);
                        return R.ok(comActActivityDO.getRewardIntegral());
                    } else {
                        return R.ok();
                    }
                }
            }
            return R.fail("网络错误，请重试");
        }
//        else {
//            ComPbActivityDO comPbActivityDO=comBpActivityDAO.selectById(activityId);
//            if (isNull(comPbActivityDO)) {
@@ -1022,8 +1041,6 @@
//            }
//            return R.fail("网络错误，请重试");
//        }

        return R.fail("网络错误，请重试");
    }

    /**
@@ -1092,4 +1109,38 @@
        }
        return R.ok();
    }

    @Override
    public R partyMemberCount(Long communityId, String year) {
        PartyActivityStatics partyActivityStatics=this.comActActivityDAO.selectActivityStatics(communityId);
        List<PartyActivityTypeChart> partyActivityTypeChart=this.comActActivityDAO.selectActivityChart(communityId);
        if(partyActivityStatics.getActivityCount()!=null&&partyActivityStatics.getActivityCount()>0){
            if(!CollectionUtils.isEmpty(partyActivityTypeChart)){
                partyActivityTypeChart.forEach(partyActivityTypeChart1 -> {
                    partyActivityTypeChart1.setPercent(partyActivityTypeChart1.getCount()/partyActivityStatics.getActivityCount());
                });
            }
        }
        partyActivityStatics.setPartyActivityTypeChartList(partyActivityTypeChart);
        partyActivityStatics.setPartyActivityLines(getPoints(communityId,year));
        return R.ok(partyActivityStatics);
    }
    public List<PartyActivityLine> getPoints(Long communityId,String year){
        List<PartyActivityLine> partyActivityLines=new ArrayList<>();
        for(int i=1;i<=12;i++){
            String x="";
            if(i<10){
                x="0"+i;
            }
            else {
                x=i+"";
            }
            PartyActivityLine partyActivityLine=new PartyActivityLine();
            partyActivityLine.setX(i+"月");
            Integer y=this.comActActivityDAO.selectActivityLine(communityId,year,x);
            partyActivityLine.setY(y);
            partyActivityLines.add(partyActivityLine);
        }
        return partyActivityLines;
    }
}