|
|
@ -819,7 +819,7 @@ public class WorkActServiceImpl implements WorkActService { |
|
|
|
//act_info表改为已完成
|
|
|
|
actInfoDTO.setActStatus(ActConstant.ACT_STATUS_FINISHED); |
|
|
|
actInfoService.update(actInfoDTO); |
|
|
|
//发放爱心时长、参与活动并获得积分的次数
|
|
|
|
//发放爱心时长、参与活动并获得积分的次数、实际参与活动个数
|
|
|
|
updateHeartUserInfo(actInfoDTO); |
|
|
|
//保存结束活动日志
|
|
|
|
this.saveActOperationRec(actId); |
|
|
@ -950,8 +950,10 @@ public class WorkActServiceImpl implements WorkActService { |
|
|
|
if(null==heartUserInfoDTO){ |
|
|
|
continue; |
|
|
|
} |
|
|
|
boolean updateFlag=false; |
|
|
|
if(actInfoDTO.getReward()>0){ |
|
|
|
if(ActConstant.ACT_USER_STATUS_AGREE.equals(actUserRelation.getRewardFlag())){ |
|
|
|
updateFlag=true; |
|
|
|
heartUserInfoDTO.setObtainPointNum(heartUserInfoDTO.getObtainPointNum()+1); |
|
|
|
} |
|
|
|
} |
|
|
@ -959,6 +961,7 @@ public class WorkActServiceImpl implements WorkActService { |
|
|
|
//爱心时长发放(签到的。未签到但是有积分的)
|
|
|
|
if(ActConstant.ACT_USER_STATUS_SIGNED_IN.equals(actUserRelation.getSignInFlag())){ |
|
|
|
//已签到的
|
|
|
|
updateFlag=true; |
|
|
|
heartUserInfoDTO.setKindnessTime(heartUserInfoDTO.getKindnessTime()+actInfoDTO.getServiceMin()); |
|
|
|
UserKindnessTimeLogEntity userKindnessTimeLogEntity=new UserKindnessTimeLogEntity(); |
|
|
|
userKindnessTimeLogEntity.setActId(actInfoDTO.getId()); |
|
|
@ -968,6 +971,7 @@ public class WorkActServiceImpl implements WorkActService { |
|
|
|
}else{ |
|
|
|
//未签到,但是有积分的
|
|
|
|
if(ActConstant.ACT_USER_STATUS_AGREE.equals(actUserRelation.getRewardFlag())){ |
|
|
|
updateFlag=true; |
|
|
|
heartUserInfoDTO.setKindnessTime(heartUserInfoDTO.getKindnessTime()+actInfoDTO.getServiceMin()); |
|
|
|
UserKindnessTimeLogEntity userKindnessTimeLogEntity=new UserKindnessTimeLogEntity(); |
|
|
|
userKindnessTimeLogEntity.setActId(actInfoDTO.getId()); |
|
|
@ -977,7 +981,17 @@ public class WorkActServiceImpl implements WorkActService { |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
if(actInfoDTO.getReward()>0||actInfoDTO.getServiceMin()>0){ |
|
|
|
//审核通过并且已经签到的更新实际参与活动数,+1
|
|
|
|
if (ActConstant.ACT_USER_STATUS_SIGNED_IN.equals(actUserRelation.getSignInFlag()) |
|
|
|
&& ActConstant.ACT_USER_STATUS_PASSED.equals(actUserRelation.getStatus())) { |
|
|
|
updateFlag = true; |
|
|
|
if (null != heartUserInfoDTO.getParticipationNum() && heartUserInfoDTO.getParticipationNum() >= 0) { |
|
|
|
heartUserInfoDTO.setParticipationNum(heartUserInfoDTO.getParticipationNum() + 1); |
|
|
|
} else if (null == heartUserInfoDTO.getParticipationNum()) { |
|
|
|
heartUserInfoDTO.setParticipationNum(NumConstant.ONE); |
|
|
|
} |
|
|
|
} |
|
|
|
if (updateFlag) { |
|
|
|
heartUserInfoService.update(heartUserInfoDTO); |
|
|
|
} |
|
|
|
} |
|
|
|