diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/activity/WeekCardHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/activity/WeekCardHandler.java index 6e48f60cf..befd9b53e 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/activity/WeekCardHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/activity/WeekCardHandler.java @@ -9,7 +9,6 @@ import com.ljsd.jieling.network.session.ISession; import com.ljsd.jieling.util.ItemUtil; import com.ljsd.jieling.util.MessageUtil; import config.SWeekcardConfig; -import config.SWeekcardRotationConfig; import manager.STableManager; import org.springframework.stereotype.Component; import rpc.protocols.ActivityProto; diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/activity/WeekCardInfoHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/activity/WeekCardInfoHandler.java index 98e5d8a5b..269abd309 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/activity/WeekCardInfoHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/activity/WeekCardInfoHandler.java @@ -3,22 +3,14 @@ package com.ljsd.jieling.handler.activity; import com.ljsd.jieling.handler.BaseHandler; import com.ljsd.jieling.logic.activity.activityLogic.WeekCardLogic; import com.ljsd.jieling.logic.dao.UserManager; -import com.ljsd.jieling.logic.dao.WeekCardInfo; import com.ljsd.jieling.logic.dao.root.User; import com.ljsd.jieling.network.session.ISession; import com.ljsd.jieling.util.MessageUtil; -import config.SMServerArenaSetting; -import config.SWeekcardConfig; -import config.SWeekcardRotationConfig; -import manager.STableManager; import rpc.protocols.ActivityProto; import rpc.protocols.CommonProto; import rpc.protocols.MessageTypeProto; -import util.TimeUtils; -import java.util.Arrays; import java.util.List; -import java.util.Map; public class WeekCardInfoHandler extends BaseHandler { @Override diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/activityLogic/WeekCardLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/activityLogic/WeekCardLogic.java index f4aeb6c0c..c146a758b 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/activityLogic/WeekCardLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/activityLogic/WeekCardLogic.java @@ -2,7 +2,6 @@ package com.ljsd.jieling.logic.activity.activityLogic; import com.ljsd.jieling.globals.Global; -import com.ljsd.jieling.logic.OnlineUserManager; import com.ljsd.jieling.logic.dao.UserManager; import com.ljsd.jieling.logic.dao.WeekCardInfo; import com.ljsd.jieling.logic.dao.root.User; @@ -136,12 +135,30 @@ public class WeekCardLogic { } - public void buyWeekCard(User user,int weekCardType){ + public void buyWeekCard(User user,int weekCardType) throws Exception{ Map weekCard = user.getPlayerInfoManager().getWeekCard(); - if(!weekCard.containsKey(weekCardType)){ + int[] weekType = WeekCardLogic.getInstance().getWeekCardType(user); + if(weekType == null){ return; } - WeekCardInfo singleWeekCard = weekCard.get(weekCardType); + //根据礼包id 找出此时开卖的周卡id + int id = 0; + Map config = STableManager.getConfig(SWeekcardConfig.class); + for(int i=1;i config = STableManager.getConfig(SWeekcardRotationConfig.class); + Map config = STableManager.getConfig(SWeekcardRotationConfig.class); for(SWeekcardRotationConfig con:config.values()){ if( TimeUtils.now()>=TimeUtils.parseTimeToMiles(con.getStartTime(),TimeUtils.Stand_CeHua_Data_format) && TimeUtils.now()<=TimeUtils.parseTimeToMiles(con.getEndtime(),TimeUtils.Stand_CeHua_Data_format)){ diff --git a/tablemanager/src/main/java/config/SWeekcardConfig.java b/tablemanager/src/main/java/config/SWeekcardConfig.java index a9e4e04e4..c9b5d324b 100644 --- a/tablemanager/src/main/java/config/SWeekcardConfig.java +++ b/tablemanager/src/main/java/config/SWeekcardConfig.java @@ -24,6 +24,8 @@ public class SWeekcardConfig implements BaseConfig { private String endtime; + private int rechargeId; + public static Map weekcardConfig; @Override public void init() throws Exception { @@ -64,5 +66,7 @@ public class SWeekcardConfig implements BaseConfig { return endtime; } - + public int getRechargeId() { + return rechargeId; + } } \ No newline at end of file