fix store

back_recharge
wangyuan 2019-09-25 10:14:46 +08:00
parent c208d37eb5
commit 95d82b59bd
2 changed files with 22 additions and 4 deletions

View File

@ -4,6 +4,7 @@ import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken;
import com.ljsd.jieling.config.SErrorCodeEerverConfig;
import com.ljsd.jieling.config.SGameSetting;
import com.ljsd.jieling.config.SGlobalActivity;
import com.ljsd.jieling.config.SRechargeCommodityConfig;
import com.ljsd.jieling.dataReport.reportBeans_37.ChatContentType;
import com.ljsd.jieling.dataReport.reportBeans_37.Repot37EventUtil;
@ -15,15 +16,13 @@ import com.ljsd.jieling.globals.Global;
import com.ljsd.jieling.logic.OnlineUserManager;
import com.ljsd.jieling.logic.activity.ActivityLogic;
import com.ljsd.jieling.logic.activity.ActivityType;
import com.ljsd.jieling.logic.dao.ActivityManager;
import com.ljsd.jieling.logic.dao.PlayerManager;
import com.ljsd.jieling.logic.dao.RechargeInfo;
import com.ljsd.jieling.logic.dao.UserManager;
import com.ljsd.jieling.logic.dao.*;
import com.ljsd.jieling.logic.dao.root.User;
import com.ljsd.jieling.logic.hero.HeroLogic;
import com.ljsd.jieling.logic.mail.MailLogic;
import com.ljsd.jieling.logic.player.PlayerLogic;
import com.ljsd.jieling.logic.store.GiftGoodsType;
import com.ljsd.jieling.logic.store.StoreLogic;
import com.ljsd.jieling.network.session.ISession;
import com.ljsd.jieling.protocols.MessageTypeProto;
import com.ljsd.jieling.protocols.PlayerInfoProto;
@ -74,6 +73,22 @@ public class Cmd_changename extends GmRoleAbstract {
}
if("shop".equals(args[2])){
if(user.getActivityManager().getActivityMissionMap().containsKey(10)){
StoreManager storeManager = user.getStoreManager();
Map<Integer, StoreInfo> storeInfoMap = storeManager.getStoreInfoMap();
if(!storeInfoMap.containsKey(10) && !storeInfoMap.containsKey(15)){
SGlobalActivity sGlobalActivity = SGlobalActivity.getsGlobalActivityMap().get(10);
long userCreateTime = user.getPlayerInfoManager().getCreateTime();
long startTime = sGlobalActivity.getTimeLong(userCreateTime, 1);
long endTime = sGlobalActivity.getTimeLong(userCreateTime, 2);
StoreLogic.initOnsStoereWithTime(user,10,startTime,endTime);
LOGGER.info("hotfix user={} store",user.getId());
}
}
}
if("recharge".equals(args[2])){
Gson gson = new Gson();
Map<String,String> rechargeInfoMap = new HashMap<>();

View File

@ -130,6 +130,9 @@ public class StoreLogic {
StoreInfo storeInfo = it.next().getValue();
SStoreTypeConfig sStoreTypeConfig = SStoreTypeConfig.getsStoreTypeConfigMap().get(storeInfo.getId());
if (sStoreTypeConfig.getStoreOpenRule() ==2 || sStoreTypeConfig.getStoreOpenRule() ==5){
if(storeInfo.getEndTime()==0){
continue;
}
if (nowTime > storeInfo.getEndTime()){
removeStoreIds.add(storeInfo.getId());
}