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));
			@@ -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 {
			@@ -628,7 +634,8 @@
			.filter(activitySignVO -> activitySignVO.getActivityId().equals(comActActivityVO.getId()))
			.collect(Collectors.toList());
			comActActivityVO.setSignCount(collect.size());
			comActActivityVO.setIsComment(1);
			comActActivityVO.setIsComment(0);
			comActActivityVO.setIsRegist(0);
			ActivitySignVO activitySignVO = collect.get(0);
			Integer activityStatus = comActActivityVO.getStatus();
			if (activityStatus.intValue() == 3) {
			@@ -642,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);
			});
			}
			@@ -970,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);
			@@ -979,7 +986,7 @@
			comActActRegistDO.setPosition(comActActRegistVO.getPosition());
			comActActRegistDO.setTimes(signAllCount+1);
			int result = comActActRegistDAO.insert(comActActRegistDO);
			if (result > 0&&comActActRegistDO.getType()==1&&comActActivityDO.getType()!=3) {
			if (result > 0&&comActActivityDO.getType()!=3) {
			if (isHave) {
			boolean isVolunteerAct = comActActivityDO.getVolunteerMax() != 0;
			AddComActIntegralUserDTO addComActIntegralUserDTO=new AddComActIntegralUserDTO();