java/zhihuishenqu.git

			@@ -199,6 +199,7 @@
			if (comActActivityVO.getSignUpEnd() != null && now.getTime() < comActActivityVO.getSignUpEnd().getTime()
			&& now.getTime() > comActActivityVO.getSignUpBegin().getTime()) {
			comActActivityDO.setStatus(3);
			comActActivityDO.setPublishAt(new Date());
			}
			boolean b = this.updateById(comActActivityDO);
			if (b) {
			@@ -309,7 +310,7 @@
			List<ComActActRegistDO> collect = regList.stream().sorted(Comparator.comparing(ComActActRegistDO::getId).reversed()).collect(Collectors.toList());
			comActActivityVO.setTimes(collect.get(0).getTimes());
			ComActActRegistDO comActActRegistDO=collect.get(0);
			if(comActActRegistDO.getType()==2){
			if(comActActRegistDO.getType()==3){
			if(comActActRegistDO.getEndTime()==null){
			comActActivityVO.setSignType(2);
			}
			@@ -473,6 +474,9 @@
			if (isNull(actActivityDO)) {
			return R.fail("活动不存在");
			}
			if(actActivityDO.getSignUpBegin().after(new Date())){
			return R.fail("未到报名时间");
			}
			int num = 0;
			ComActActSignDO comActActSignDO = comActActSignDAO.selectOne(new QueryWrapper<ComActActSignDO>()
			.lambda().eq(ComActActSignDO::getActivityId, activityId).eq(ComActActSignDO::getUserId, userId));
			@@ -489,7 +493,7 @@
			// 查询当前活动下参与居民
			Integer residentCount = comActActSignDAO.selectCount(new QueryWrapper<ComActActSignDO>().lambda()
			.eq(ComActActSignDO::getActivityId, activityId).eq(ComActActSignDO::getIsVolunteer, 0).eq(ComActActSignDO::getStatus, 1));
			if (activityType.equals(2)) {
			if (activityType.equals(1)) {
			//志愿者活动
			boolean userIsVolunteer = loginUserInfoVO.getIsVolunteer() == 1;
			// 查询当前活动下参与志愿者
			@@ -546,12 +550,14 @@
			comActActSignDO.setCreateAt(new Date());
			comActActSignDO.setReason(null);
			comActActSignDO.setIsVolunteer(isVolunteer);
			comActActSignDO.setTimes(comActActSignDO.getTimes()+1);
			num = comActActSignDAO.updateById(comActActSignDO);
			} else {
			comActActSignDO = new ComActActSignDO();
			comActActSignDO.setActivityId(activityId);
			comActActSignDO.setUserId(userId);
			comActActSignDO.setIsVolunteer(isVolunteer);
			comActActSignDO.setTimes(1);
			num = comActActSignDAO.insert(comActActSignDO);
			}
			} else {
			@@ -577,7 +583,7 @@
			AddComActIntegralUserDTO addComActIntegralUserDTO = new AddComActIntegralUserDTO();
			addComActIntegralUserDTO.setUserId(userId);
			addComActIntegralUserDTO.setIntegralType(8);
			addComActIntegralUserDTO.setActivityType(1);
			addComActIntegralUserDTO.setActivityType(actActivityDO.getType());
			addComActIntegralUserDTO.setIsVolunteer(comActActSignDO.getIsVolunteer());
			addComActIntegralUserDTO.setCommunityId(actActivityDO.getCommunityId());
			addComActIntegralUserDTO.setServiceId(activityId);
			@@ -617,7 +623,7 @@
			.filter(activityDO -> activityDO.getStatus().equals(status)).collect(Collectors.toList());
			}
			}
			if(isNull(type)){
			if(!isNull(type)){
			comActActivityDOS=comActActivityDOS.stream().filter(comActActivityDO -> comActActivityDO.getType().equals(type)).collect(Collectors.toList());
			}
			if (!comActActivityDOS.isEmpty()) {
			@@ -628,13 +634,9 @@
			.filter(activitySignVO -> activitySignVO.getActivityId().equals(comActActivityVO.getId()))
			.collect(Collectors.toList());
			comActActivityVO.setSignCount(collect.size());
			comActActivityVO.setIsComment(0);
			comActActivityVO.setIsRegist(0);
			ActivitySignVO activitySignVO = collect.get(0);
			Integer isVolunteer = activitySignVO.getIsVolunteer();
			if (isVolunteer.intValue() == 1) {
			comActActivityVO.setType(1);
			} else {
			comActActivityVO.setType(2);
			}
			Integer activityStatus = comActActivityVO.getStatus();
			if (activityStatus.intValue() == 3) {
			comActActivityVO.setStatus(4);
			@@ -647,9 +649,9 @@
			log.error("时间转换异常【{}】", e.getMessage());
			}
			comActActivityVO.setSingDate(createAt);
			comActActivityVO.setTimes(activitySignVO.getTimes());
			Integer totalAward = comActActRegistDAO.selectTotalAwardWithRegist(activitySignVO.getActivityId(), userId);
			comActActivityVO.setAward(totalAward);
			comActActivityVO.setActivitySignVOList(collect);
			comActActivityVOS.add(comActActivityVO);
			});
			}
			@@ -932,7 +934,7 @@
			// return R.fail("你已签到，如要再次签到请三十分钟后尝试！");
			// }
			ComActActRegistDO comActActRegistDO = new ComActActRegistDO();
			if(comActActRegistVO.getType()!=null&&comActActRegistVO.getType()==2){
			if(comActActRegistVO.getSignType()!=null&&comActActRegistVO.getSignType()==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){
			@@ -941,7 +943,7 @@
			if(comActActActRegistDO.getEndTime()!=null){
			return R.fail("无法重复签退");
			}
			comActActRegistDO.setId(comActActRegistVO.getId());
			comActActRegistDO.setId(comActActActRegistDO.getId());
			comActActRegistDO.setEndTime(new Date());
			int result=comActActRegistDAO.updateById(comActActRegistDO);
			if (result > 0) {
			@@ -975,7 +977,7 @@
			}
			comActActRegistDO.setActivityId(activityId);
			comActActRegistDO.setStartTime(new Date());
			comActActRegistDO.setType(1);
			comActActRegistDO.setType(comActActivityDO.getType());
			comActActRegistDO.setUserId(userId);
			comActActRegistDO.setIsVolunteer(comActActSignDO.getIsVolunteer());
			comActActRegistDO.setCreateAt(nowDate);
			@@ -984,7 +986,7 @@
			comActActRegistDO.setPosition(comActActRegistVO.getPosition());
			comActActRegistDO.setTimes(signAllCount+1);
			int result = comActActRegistDAO.insert(comActActRegistDO);
			if (result > 0&&comActActRegistDO.getType()==1) {
			if (result > 0&&comActActivityDO.getType()!=3) {
			if (isHave) {
			boolean isVolunteerAct = comActActivityDO.getVolunteerMax() != 0;
			AddComActIntegralUserDTO addComActIntegralUserDTO=new AddComActIntegralUserDTO();
			@@ -1000,6 +1002,9 @@
			return R.ok();
			}
			}
			else {
			return R.ok();
			}
			}
			return R.fail("网络错误，请重试");
			// else {