diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/MoneyTotalRechargeActivity.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/MoneyTotalRechargeActivity.java index bc4d26809..38e3a90af 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/MoneyTotalRechargeActivity.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/MoneyTotalRechargeActivity.java @@ -90,19 +90,27 @@ public class MoneyTotalRechargeActivity extends AbstractActivity { */ private int getState(User user, SActivityRewardConfig config){ if (config == null){ - return 0; + return 1; } ActivityMission mission = user.getActivityManager().getActivityMissionMap().get(id); ActivityProgressInfo info = mission.getActivityMissionMap().get(config.getId()); - if (info != null && info.getState() == 2){ - return 2; - } - if (mission.getV() >= config.getValues()[0][1]){ + if (info != null && info.getState() == 1){ return 1; } return 0; } + /** + * 检查是否可以购买 + * @param mission + * @param config + * @return + * @throws Exception + */ + boolean checkValue(ActivityMission mission, SActivityRewardConfig config) throws Exception { + return mission.getV() >= config.getValues()[0][1]; + } + @Override public List getAllMissInfo(User user,ActivityMission activityMission, Set filter) { if (activityMission == null){ @@ -144,14 +152,13 @@ public class MoneyTotalRechargeActivity extends AbstractActivity { throw new ErrorCodeException(ErrorCode.SYS_ERROR_CODE,"活动信息不存在:"+id); } SActivityRewardConfig rewardConfig = SActivityRewardConfig.getsActivityRewardConfigByMissionId(missionId); - int state = getState(user, rewardConfig); - if (state != 1){ + if (!checkValue(mission,rewardConfig)){ throw new ErrorCodeException(ErrorCode.HAD_TAKE,"活动奖励领取失败:"+mission); } // 更新数据库信息 ActivityProgressInfo info = new ActivityProgressInfo(); - info.setState(2); + info.setState(1); mission.getActivityMissionMap().put(missionId,info); // reward