Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn

back_recharge
lvxinran 2021-07-19 17:15:09 +08:00
commit 62fe24b3af
1 changed files with 14 additions and 8 deletions

View File

@ -75,7 +75,7 @@ public class SuperFundActivity extends AbstractActivity {
* *
* @param user * @param user
*/ */
private void updateValue(User user, int giftId){ private void updateValue(User user, int giftId) throws Exception {
// 活动详情 // 活动详情
ActivityMission mission = user.getActivityManager().getActivityMissionMap().get(id); ActivityMission mission = user.getActivityManager().getActivityMissionMap().get(id);
if (mission == null || mission.getV() == 2){ if (mission == null || mission.getV() == 2){
@ -92,15 +92,19 @@ public class SuperFundActivity extends AbstractActivity {
if (id == 79){ if (id == 79){
monthTime = monthCard.getOrDefault(2, 0); monthTime = monthCard.getOrDefault(2, 0);
} }
// 旧信息兼容
ReceiveWelfareBag bagInfo = getBagInfo(user);
// 已激活月卡 // 已激活月卡
if (monthTime > 0){ if (monthTime > 0 || bagInfo.isOpen()){
mission.setV(1); mission.setV(1);
} }
// 已购买基金 // 已购买基金
if (giftId == id){ if (giftId == id || bagInfo.isBought()){
mission.setV(2);
// 初始化基金 // 初始化基金
reSetValue(user); mission.setV(2);
mission.setCreatTime(TimeUtils.now());
} }
} }
@ -214,8 +218,6 @@ public class SuperFundActivity extends AbstractActivity {
Map<Integer, ActivityProgressInfo> infoMap = getMissionMap(mission); Map<Integer, ActivityProgressInfo> infoMap = getMissionMap(mission);
// 领取得天数 // 领取得天数
int days = TimeUtils.differentDays(bag.getStartTime(), TimeUtils.getTodayZero())+1; int days = TimeUtils.differentDays(bag.getStartTime(), TimeUtils.getTodayZero())+1;
// 老玩家活动重置
reSetValue(user);
// 遍历 // 遍历
infoMap.forEach((k,v)->{ infoMap.forEach((k,v)->{
// 已领取得不做处理 // 已领取得不做处理
@ -226,16 +228,20 @@ public class SuperFundActivity extends AbstractActivity {
} }
}); });
mission.setV(2); mission.setV(2);
mission.setCreatTime(TimeUtils.now());
bag.setGetRewardTime(0); bag.setGetRewardTime(0);
LOGGER.info("================超值基金老玩家兼容===============,uid:{},id:{}",user.getId(),id); LOGGER.info("================超值基金老玩家兼容===============,uid:{},id:{}",user.getId(),id);
} }
@Override @Override
public void reSetValue(User user){ public void reSetValue(User user) throws Exception {
// 活动信息重置 // 活动信息重置
ActivityManager activityManager = user.getActivityManager(); ActivityManager activityManager = user.getActivityManager();
activityManager.getActivityMissionMap().remove(id); activityManager.getActivityMissionMap().remove(id);
initActivity(user); initActivity(user);
// 旧信息兼容
ReceiveWelfareBag bagInfo = getBagInfo(user);
bagInfo.refresh();
LOGGER.info("================超值基金礼包刷新===============,uid:{},id:{}",user.getId(),id); LOGGER.info("================超值基金礼包刷新===============,uid:{},id:{}",user.getId(),id);
} }