From ffd91d6adb0c36912ef5cb417ab0f60dc1c81571 Mon Sep 17 00:00:00 2001 From: lvxinran Date: Sat, 28 Sep 2019 08:22:40 +0800 Subject: [PATCH] =?UTF-8?q?gm=E6=97=A0=E5=B0=BD=E5=95=86=E5=BA=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- serverlogic/src/main/java/com/ljsd/GmService.java | 2 +- .../java/com/ljsd/jieling/kefu/Cmd_changename.java | 14 +++++++++----- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/GmService.java b/serverlogic/src/main/java/com/ljsd/GmService.java index 6ab34e0e3..18021cb7c 100644 --- a/serverlogic/src/main/java/com/ljsd/GmService.java +++ b/serverlogic/src/main/java/com/ljsd/GmService.java @@ -122,7 +122,7 @@ public class GmService implements RPCRequestGMIFace.Iface { sendIds.add(session.getUid()); } } else { - if(cmd.contains("hotfix") || cmd.contains("shop")){ + if(cmd.contains("hotfix") || cmd.contains("shop")|| cmd.contains("endStore")){ List usersInDB = MongoUtil.getLjsdMongoTemplate().findAll("user", User.class); for(User user1 : usersInDB){ User userInMem = UserManager.getUserInMem(user1.getId()); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/kefu/Cmd_changename.java b/serverlogic/src/main/java/com/ljsd/jieling/kefu/Cmd_changename.java index 08bca20f7..a62e30453 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/kefu/Cmd_changename.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/kefu/Cmd_changename.java @@ -2,10 +2,8 @@ package com.ljsd.jieling.kefu; 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.config.*; +import com.ljsd.jieling.core.FunctionIdEnum; import com.ljsd.jieling.dataReport.reportBeans_37.ChatContentType; import com.ljsd.jieling.dataReport.reportBeans_37.Repot37EventUtil; import com.ljsd.jieling.db.mongo.MongoUtil; @@ -13,6 +11,7 @@ import com.ljsd.jieling.db.redis.RedisKey; import com.ljsd.jieling.db.redis.RedisUtil; import com.ljsd.jieling.globals.BIReason; import com.ljsd.jieling.globals.Global; +import com.ljsd.jieling.logic.GlobalDataManaager; import com.ljsd.jieling.logic.OnlineUserManager; import com.ljsd.jieling.logic.activity.ActivityLogic; import com.ljsd.jieling.logic.activity.ActivityType; @@ -87,9 +86,14 @@ public class Cmd_changename extends GmRoleAbstract { LOGGER.info("hotfix user={} store end",user.getId()); } } - } + if("endStore".equals(args[2])){ + if(!user.getStoreManager().getStoreInfoMap().containsKey(13)){ + TimeControllerOfFunction openTimeOfFuntionCacheByType = GlobalDataManaager.getInstance().getOpenTimeOfFuntionCacheByType(FunctionIdEnum.Endless); + StoreLogic.initOnsStoereWithTime(user, 13,openTimeOfFuntionCacheByType.getStartTime(),openTimeOfFuntionCacheByType.getEndTime()); + } + } if("recharge".equals(args[2])){ Gson gson = new Gson(); Map rechargeInfoMap = new HashMap<>();