数据库对象初始化bug 点金刷新修改

back_recharge
zhangshanxue 2020-05-27 19:24:58 +08:00
parent e931d53f5c
commit c5edd276e4
4 changed files with 58 additions and 58 deletions

View File

@ -26,7 +26,7 @@
<Jbean name="ActivityManager"> <Jbean name="ActivityManager">
<Variable name="activityMissionMap" type="map" key="int" value="ActivityMission" /> <Variable name="activityMissionMap" type="map" key="int" value="ActivityMission" />
<Variable name="senvenTime" type="long"/> 七日狂欢结束时间 <Variable name="senvenStartTime" type="long"/> 七日狂欢开始时间
<Variable name="luckWheel" type="LuckWheelMission"/>幸运探宝奖池 <Variable name="luckWheel" type="LuckWheelMission"/>幸运探宝奖池
<Variable name="luckWheelAdvance" type="LuckWheelMission"/>高级幸运探宝奖池 <Variable name="luckWheelAdvance" type="LuckWheelMission"/>高级幸运探宝奖池
</Jbean> </Jbean>

View File

@ -25,6 +25,7 @@ public final class ActivityManager extends MongoBase {
public ActivityManager(ActivityManager _o_ ) { public ActivityManager(ActivityManager _o_ ) {
this.activityMissionMap = new HashMap<Integer, com.ljsd.jieling.jbean.ActivityMission>(); this.activityMissionMap = new HashMap<Integer, com.ljsd.jieling.jbean.ActivityMission>();
_o_.activityMissionMap.forEach((_k_, _v_) -> this.activityMissionMap.put(_k_, new ActivityMission(_v_))); _o_.activityMissionMap.forEach((_k_, _v_) -> this.activityMissionMap.put(_k_, new ActivityMission(_v_)));
this.senvenStartTime = _o_.senvenStartTime;
this.luckWheel = new LuckWheelMission(_o_.luckWheel); this.luckWheel = new LuckWheelMission(_o_.luckWheel);
this.luckWheelAdvance = new LuckWheelMission(_o_.luckWheelAdvance); this.luckWheelAdvance = new LuckWheelMission(_o_.luckWheelAdvance);
} }
@ -35,6 +36,9 @@ public final class ActivityManager extends MongoBase {
return this.activityMissionMapLog; return this.activityMissionMapLog;
} }
public long getSenvenStartTime() { // 七日狂欢开始时间
return this.senvenStartTime;
}
public com.ljsd.jieling.jbean.LuckWheelMission getLuckWheel() { // 幸运探宝奖池 public com.ljsd.jieling.jbean.LuckWheelMission getLuckWheel() { // 幸运探宝奖池
return this.luckWheel; return this.luckWheel;
@ -44,17 +48,11 @@ public final class ActivityManager extends MongoBase {
return this.luckWheelAdvance; return this.luckWheelAdvance;
} }
public void setSenvenStartTime(long senvenstarttime) { // 七日狂欢开始时间
public void setSenvenStartTime(long senvenStartTime) { updateString("senvenStartTime",senvenstarttime);
updateString("senvenStartTime",senvenStartTime); this.senvenStartTime = senvenstarttime;
this.senvenStartTime = senvenStartTime;
} }
public long getSenvenStartTime() {
return senvenStartTime;
}
public void setLuckWheel(LuckWheelMission luckwheel) { // 幸运探宝奖池 public void setLuckWheel(LuckWheelMission luckwheel) { // 幸运探宝奖池
updateString("luckWheel",luckwheel); updateString("luckWheel",luckwheel);
luckwheel.init(getRootId(),getMongoKey()+ ".luckWheel"); luckwheel.init(getRootId(),getMongoKey()+ ".luckWheel");
@ -73,6 +71,7 @@ public final class ActivityManager extends MongoBase {
StringBuilder _sb_ = new StringBuilder(super.toString()); StringBuilder _sb_ = new StringBuilder(super.toString());
_sb_.append("=("); _sb_.append("=(");
_sb_.append(this.activityMissionMap).append(","); _sb_.append(this.activityMissionMap).append(",");
_sb_.append(this.senvenStartTime).append(",");
_sb_.append(this.luckWheel).append(","); _sb_.append(this.luckWheel).append(",");
_sb_.append(this.luckWheelAdvance).append(","); _sb_.append(this.luckWheelAdvance).append(",");
_sb_.append(")"); _sb_.append(")");

View File

@ -215,12 +215,13 @@ public class ActivityLogic implements IEventHandler{
if (map.containsKey(activityId)) { if (map.containsKey(activityId)) {
return false; return false;
} }
ActivityMission activityMission = new ActivityMission();
initMissionInfo(activityMission,activityId); ActivityMission activityMission = new ActivityMission();
// activityMission.init(getRootId(), getMongoKey() + ".activityMissionMap." + activityId);
//自动初始化 //自动初始化
map.put(activityId, activityMission); map.put(activityId, activityMission);
initMissionInfo(activityMission,activityId);
// activityMission.init(getRootId(), getMongoKey() + ".activityMissionMap." + activityId);
return true; return true;
} }

View File

@ -54,53 +54,53 @@ class BuyGoldActivity extends AbstractActivity {
@Override @Override
public void onEvent(IEvent event) throws Exception { public void onEvent(IEvent event) throws Exception {
super.onEvent(event); super.onEvent(event);
//点金刷新走商店
List<Integer> list = SSpecialConfig.getListValue(SSpecialConfig.Gold_touch_refresh); // List<Integer> list = SSpecialConfig.getListValue(SSpecialConfig.Gold_touch_refresh);
if (event instanceof HourTaskEvent) { // if (event instanceof HourTaskEvent) {
if (list.contains(((HourTaskEvent) event).getHour())) { // if (list.contains(((HourTaskEvent) event).getHour())) {
InnerMessageUtil.broadcastWithRandom(user -> { // InnerMessageUtil.broadcastWithRandom(user -> {
if (user == null) { // if (user == null) {
return; // return;
} // }
setUpTime(user); // setUpTime(user);
}, new ArrayList<>(OnlineUserManager.sessionMap.keySet()), 1); // }, new ArrayList<>(OnlineUserManager.sessionMap.keySet()), 1);
//
} // }
} // }
if (event instanceof UserOnlineEvent) { // if (event instanceof UserOnlineEvent) {
User user = UserManager.getUser(((UserOnlineEvent) event).getUid()); // User user = UserManager.getUser(((UserOnlineEvent) event).getUid());
ActivityMission activityMission = user.getActivityManager().getActivityMissionMap().get(id); // ActivityMission activityMission = user.getActivityManager().getActivityMissionMap().get(id);
if (null == activityMission) { // if (null == activityMission) {
return; // return;
} // }
boolean needRefresh = false; // boolean needRefresh = false;
for (Integer aList : list) { // for (Integer aList : list) {
if (TimeUtils.isOverAppointRefreshTime(System.currentTimeMillis(), activityMission.getV() * 1000L, aList)) { // if (TimeUtils.isOverAppointRefreshTime(System.currentTimeMillis(), activityMission.getV() * 1000L, aList)) {
needRefresh = true; // needRefresh = true;
break; // break;
} // }
} // }
if (needRefresh) { // if (needRefresh) {
setUpTime(user); // setUpTime(user);
} // }
} // }
} }
private void setUpTime(User user) { private void setUpTime(User user) {
ActivityMission activityMission = user.getActivityManager().getActivityMissionMap().get(id); // ActivityMission activityMission = user.getActivityManager().getActivityMissionMap().get(id);
if (null == activityMission) { // if (null == activityMission) {
return; // return;
} // }
//sendclient // //sendclient
activityMission.setV((int) (System.currentTimeMillis()/1000)); // activityMission.setV((int) (System.currentTimeMillis()/1000));
HashSet<Integer> ids = new HashSet<>(); // HashSet<Integer> ids = new HashSet<>();
List<Integer> listValue = SSpecialConfig.getListValue(SSpecialConfig.Gold_touch); // List<Integer> listValue = SSpecialConfig.getListValue(SSpecialConfig.Gold_touch);
listValue.forEach(type -> SPrivilegeTypeConfig.privilegeByType.get(type).forEach(sPrivilegeTypeConfig -> { // listValue.forEach(type -> SPrivilegeTypeConfig.privilegeByType.get(type).forEach(sPrivilegeTypeConfig -> {
ids.add(sPrivilegeTypeConfig.getId()); // ids.add(sPrivilegeTypeConfig.getId());
user.getPlayerInfoManager().refreshVipByType(type); // user.getPlayerInfoManager().refreshVipByType(type);
})); // }));
notifyClient(user, ids); // notifyClient(user, ids);
} }