java/zhihuishenqu.git

			@@ -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));
			@@ -1440,16 +1440,16 @@
			if(!StringUtils.isEmpty(actActivityDO.getJinhuiCoinPunishment()) && !StringUtils.equals(actActivityDO.getJinhuiCoinPunishment(),"0"))
			{
			//查询个人金汇币总额
			R<JinhuiCoinGeneralTable> jinhuiCoinGeneralTable=jinhuiCommunityService.coinTableGetDetails(userId+"");
			JinhuiCoinGeneralTable jinhuiCoinGeneralTable=comActActRegistDAO.getDetails(userId+"");
			if(jinhuiCoinGeneralTable!=null)
			{
			if (!StringUtils.isEmpty(jinhuiCoinGeneralTable.getData().getGoldCoin()))
			if (!StringUtils.isEmpty(jinhuiCoinGeneralTable.getGoldCoin()))
			{
			JinhuiCoinGeneralTableVO jinhuiVO=new JinhuiCoinGeneralTableVO();
			jinhuiVO.setId(jinhuiCoinGeneralTable.getData().getId());
			jinhuiVO.setId(jinhuiCoinGeneralTable.getId());

			int punishmentGold=Integer.valueOf(actActivityDO.getJinhuiCoinPunishment());
			int allGold=Integer.valueOf(jinhuiCoinGeneralTable.getData().getGoldCoin());
			int allGold=Integer.valueOf(jinhuiCoinGeneralTable.getGoldCoin());
			if(punishmentGold>=allGold)
			{
			jinhuiVO.setGoldCoin("0");
			@@ -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(0);
			comActActRegistDO.setAward(rewardIntegral);

			int result = comActActRegistDAO.updateById(comActActRegistDO);
			if (result > 0) {
			if (isHave) {
			@@ -1538,19 +1577,19 @@
			// comActIntegralUserTradeService.addIntegralTradeAdmin(addComActIntegralUserDTO);

			//查询个人金汇币总额
			R<JinhuiCoinGeneralTable> jinhuiCoinGeneralTable=jinhuiCommunityService.coinTableGetDetails(userId+"");
			if(jinhuiCoinGeneralTable.getData()!=null)
			JinhuiCoinGeneralTable jinhuiCoinGeneralTable=comActActRegistDAO.getDetails(userId+"");
			if(jinhuiCoinGeneralTable!=null)
			{
			if (!StringUtils.isEmpty(jinhuiCoinGeneralTable.getData().getGoldCoin()))
			JinhuiCoinGeneralTableVO jinhuiVO=new JinhuiCoinGeneralTableVO();
			jinhuiVO.setId(jinhuiCoinGeneralTable.getId());
			int allGold=0;
			if (!StringUtils.isEmpty(jinhuiCoinGeneralTable.getGoldCoin()))
			{
			JinhuiCoinGeneralTableVO jinhuiVO=new JinhuiCoinGeneralTableVO();
			jinhuiVO.setId(jinhuiCoinGeneralTable.getData().getId());

			int allGold=Integer.valueOf(jinhuiCoinGeneralTable.getData().getGoldCoin());
			allGold=allGold+rewardIntegral;
			jinhuiVO.setGoldCoin(allGold+"");
			jinhuiCommunityService.coinTableEditData(jinhuiVO);
			allGold=Integer.valueOf(jinhuiCoinGeneralTable.getGoldCoin());
			}
			allGold=allGold+rewardIntegral;
			jinhuiVO.setGoldCoin(allGold+"");
			jinhuiCommunityService.coinTableEditData(jinhuiVO);
			}
			else
			{