错误修复

master_otnew
grimm 2024-01-25 15:23:53 +08:00
parent 9bdd4163c2
commit 227f57090d
2 changed files with 11 additions and 10 deletions

View File

@ -12,6 +12,7 @@ import com.ljsd.jieling.logic.dao.UserManager;
import com.ljsd.jieling.logic.dao.root.User;
import com.ljsd.jieling.logic.mail.MailLogic;
import com.ljsd.jieling.util.ItemUtil;
import com.ljsd.jieling.util.ToolsUtil;
import config.*;
import manager.STableManager;
import util.TimeUtils;
@ -68,19 +69,16 @@ public class WeekCardActivity extends AbstractActivity {
/**
*
* @param cardId
* @param activityId
* @param valueMap
* @return
*/
private Map<Integer,Integer> packagingWeekCardMap(User user, int activityId, int cardId, Map<Integer,Integer> valueMap){
HashMap<Integer, Integer> result = new HashMap<>();
Map<Integer, SWeekcardConfig> config = STableManager.getConfig(SWeekcardConfig.class);
SWeekcardConfig sWeekcardConfig = config.get(cardId);
SGlobalActivity activity = SGlobalActivity.getsGlobalActivityMap().get(activityId);
long createTime = user.getPlayerInfoManager().getCreateTime();
// 计算间隔时间
long startTimeLong = WeekCardLogic.getInstance().getStartTime(user, activityId);
long startTimeLong = ToolsUtil.getTimeLong(activity.getStartTimeLong(),activity.getEndTimeLong(),activity.getTime(),createTime,1);
int days = TimeUtils.differentDays(startTimeLong, TimeUtils.now()) + 1;
for (int[] ints : sWeekcardConfig.getBaseRewardID()) {
@ -111,8 +109,11 @@ public class WeekCardActivity extends AbstractActivity {
Map<Integer, Map<Integer, Integer>> weekCard = user.getPlayerInfoManager().getWeekCard();
Map<Integer, SWeekRewardConfig> rewardConfigMap = STableManager.getConfig(SWeekRewardConfig.class);
Map<Integer, SWeekcardConfig> configMap = STableManager.getConfig(SWeekcardConfig.class);
SGlobalActivity activity = SGlobalActivity.getsGlobalActivityMap().get(id);
long createTime = user.getPlayerInfoManager().getCreateTime();
// 计算间隔时间
long startTimeLong = WeekCardLogic.getInstance().getStartTime(user,id);
long startTimeLong = ToolsUtil.getTimeLong(activity.getStartTimeLong(),activity.getEndTimeLong(),activity.getTime(),createTime,1);
int days = TimeUtils.differentDays(startTimeLong, TimeUtils.now())+1;
for (Map.Entry<Integer, Map<Integer, Integer>> entry : weekCard.entrySet()) {
@ -151,7 +152,7 @@ public class WeekCardActivity extends AbstractActivity {
}
weekCard.put(weekCardId,value);
}
if (itemArrs.size() == 0) {
if (itemArrs.isEmpty()) {
return;
}
// 更新数据

View File

@ -271,7 +271,7 @@ public class UserMissionManager extends MongoBase {
if(!achievementMissionTypMap.getDoingMissionIds().isEmpty() ){
List<SAchievementConfig> sAchievementConfigs = SAchievementConfig.sTaskConfigByTypeMap.get(missionType.getMissionTypeValue());
if(sAchievementConfigs!=null&&sAchievementConfigs.size()!=0){
if(sAchievementConfigs!=null&& !sAchievementConfigs.isEmpty()){
CumulationData.Result result= achievementMap.updateData(missionType, parm);
if(result!=null){
achievementMissionTypMap.calCumulationDataResult(user,result,missionTypeEnumListMap.get(GameMisionType.ACHIEVEMISSION),achievementMap);
@ -293,7 +293,7 @@ public class UserMissionManager extends MongoBase {
//缥缈之旅
if(!mistyTripMissionType.getDoingMissionIds().isEmpty() ){
Map<Integer, SJourneyWithWind> config = STableManager.getConfig(SJourneyWithWind.class);
if(config!=null&&config.size()!=0){
if(config!=null&& !config.isEmpty()){
int starSum = HardStageLogic.getHardStageStarsSum(user);
if(starSum != 0 && mistyTripCumulationData.getHardstage_stars() == 0){
mistyTripCumulationData.setHardstage_stars(starSum);