花城 【小程序】统计排行添加是否是问题清单标识5

lidongdong

2024-07-11 eef6d2bcdb29348efe4ef17bc45a4c6886b487b1

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

@@ -1364,10 +1364,10 @@
                    ComActActivityInvite activityInvite = comActActivityInviteService.getBaseMapper().selectOne(new LambdaQueryWrapper<ComActActivityInvite>()
                            .eq(ComActActivityInvite::getActivityId, activityId).eq(ComActActivityInvite::getUserId, userId));
                    if (isNull(activityInvite)) {
                        int count = pbMemberDAO.checkIsPbMember(userId);
                        if (count < 1) {
                            return R.fail(HttpStatus.NOT_ACCEPTABLE, "您还不是党员");
                        }
//                        int count = pbMemberDAO.checkIsPbMember(userId);
//                        if (count < 1) {
//                            return R.fail(HttpStatus.NOT_ACCEPTABLE, "您还不是党员");
//                        }
                        // 查询当前活动下参与志愿者
                        Integer partyMemberCount = comActActSignDAO.selectCount(new QueryWrapper<ComActActSignDO>().lambda()
                                .eq(ComActActSignDO::getActivityId, activityId).eq(ComActActSignDO::getSignIdentity, 2)
@@ -1384,10 +1384,10 @@
                    if (volunteerMax == null) {
                        return R.fail("活动暂未对志愿者开放");
                    }
                    int count = pbMemberDAO.checkIsVolunteer(userId);
                    if (count < 1) {
                        return R.fail(HttpStatus.NOT_ACCEPTABLE, "您还不是志愿者");
                    }
//                    int count = pbMemberDAO.checkIsVolunteer(userId);
//                    if (count < 1) {
//                        return R.fail(HttpStatus.NOT_ACCEPTABLE, "您还不是志愿者");
//                    }
                    // 查询当前活动下参与志愿者
                    Integer volunteerCount = comActActSignDAO.selectCount(new QueryWrapper<ComActActSignDO>().lambda()
                            .eq(ComActActSignDO::getActivityId, activityId).eq(ComActActSignDO::getSignIdentity, 3).eq(ComActActSignDO::getStatus, 1));
@@ -1521,9 +1521,48 @@
            if (comActActActRegistDO.getEndTime() != null) {
                return R.fail("无法重复签退");
            }

            //1.居民 2.党员 3.志愿者
            switch (comActActActRegistDO.getSignIdentity())
            {
                case 1:
                    if(comActActivityDO.getParticipantRewardWay()==2)
                    {
                        int hours = com.panzhihua.common.utlis.DateUtils.getHour(comActActActRegistDO.getStartTime(), comActActActRegistDO.getEndTime());
                        if(hours>1)
                        {
                            rewardIntegral=rewardIntegral * hours;
                        }
                    }
                    break;

                case 2:
                    if(comActActivityDO.getPbRewardWay()==2)
                    {
                        int hours = com.panzhihua.common.utlis.DateUtils.getHour(comActActActRegistDO.getStartTime(), comActActActRegistDO.getEndTime());
                        if(hours>1)
                        {
                            rewardIntegral=rewardIntegral * hours;
                        }
                    }
                    break;

                case 3:
                    if(comActActivityDO.getVolunteerRewardWay()==2)
                    {
                        int hours = com.panzhihua.common.utlis.DateUtils.getHour(comActActActRegistDO.getStartTime(), comActActActRegistDO.getEndTime());
                        if(hours>1)
                        {
                            rewardIntegral=rewardIntegral * hours;
                        }
                    }
                    break;
            }

            comActActRegistDO.setId(comActActActRegistDO.getId());
            comActActRegistDO.setEndTime(nowDate);
            comActActRegistDO.setAward(rewardIntegral);

            int result = comActActRegistDAO.updateById(comActActRegistDO);
            if (result > 0) {
                if (isHave) {