diff --git a/serverlogic/src/main/java/com/ljsd/GmService.java b/serverlogic/src/main/java/com/ljsd/GmService.java index 4eeba5540..1d5f15452 100644 --- a/serverlogic/src/main/java/com/ljsd/GmService.java +++ b/serverlogic/src/main/java/com/ljsd/GmService.java @@ -55,18 +55,17 @@ public class GmService implements RPCRequestGMIFace.Iface { } try { String[] parameters = java.util.Arrays.copyOfRange(arg, 1, arg.length); + String[] parameters2; if (obj instanceof GmRoleAbstract) { - //todo - Map rechargeInfoMap = new HashMap<>(); - List sendIds = new LinkedList<>(); if (obj instanceof GmGlobleAbstract) { for (ISession session : OnlineUserManager.sessionMap.values()) { sendIds.add(session.getUid()); } - } else { + } + else { if(cmd.contains("hotfix") || cmd.contains("shop")|| cmd.contains("endStore")){ List usersInDB = MongoUtil.getLjsdMongoTemplate().findAll("user", User.class); for(User user1 : usersInDB){ @@ -76,18 +75,16 @@ public class GmService implements RPCRequestGMIFace.Iface { } sendIds.add(user1.getId()); } - }else if(cmd.contains("recharge")){ - sendIds.addAll(rechargeInfoMap.keySet()); - }else if(cmd.contains("force")){ - + } + else if(cmd.contains("force")){ Set> rankInfo = RedisUtil.getInstence().getZsetreverseRangeWithScores(RedisKey.FORCE_RANK, "", 0, -1); for (ZSetOperations.TypedTuple item : rankInfo) { String value = item.getValue(); int uid = Integer.parseInt(value); sendIds.add(uid); } - - } else if(cmd.contains("mainfightrank")){ + } + else if (cmd.contains("mainfightrank")){ Poster.getPoster().listenEvent(new UserForceUpEventHandler(), UserForceChangeEvent.class); Set> rankInfo = RedisUtil.getInstence().getZsetreverseRangeWithScores(RedisKey.MAIN_LEVEL_RANK, "", 0, -1); for (ZSetOperations.TypedTuple item : rankInfo) { @@ -95,25 +92,23 @@ public class GmService implements RPCRequestGMIFace.Iface { int uid = Integer.parseInt(value); sendIds.add(uid); } - } else { + + } + // 扶持功能 + else if (cmd.contains("support")){ + sendIds.add(Integer.valueOf(parameters[0])); + } + else { String[] ids = parameters[0].split("#"); for (String id : ids) { sendIds.add(Integer.valueOf(id)); } } - } - int randomTime = sendIds.size() * 1; + int randomTime = sendIds.size(); + parameters2 = java.util.Arrays.copyOfRange(parameters, 1, parameters.length); + //两分钟内发完所有协议 - Gson gson = new Gson(); - String[] parameters2 = java.util.Arrays.copyOfRange(parameters, 1, parameters.length); - if(cmd.contains("recharge") ){ - LOGGER.info("recharge map size={}",rechargeInfoMap.size()); - if(!rechargeInfoMap.isEmpty()){ - parameters2[3] = gson.toJson(rechargeInfoMap); - } - } - InnerMessageUtil.broadcastWithRandom( user->{ ((GmRoleAbstract) obj).setUser(user); obj.exec(parameters2); 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 12876217a..85dd3118a 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 @@ -79,9 +79,6 @@ public class Cmd_changename extends GmRoleAbstract { StoreLogic.initOnsStoereWithTime(user, 13,openTimeOfFuntionCacheByType.getStartTime(),openTimeOfFuntionCacheByType.getEndTime()); } } - if("recharge".equals(args[2])){ - - } } String name; diff --git a/serverlogic/src/main/java/com/ljsd/jieling/kefu/Cmd_support.java b/serverlogic/src/main/java/com/ljsd/jieling/kefu/Cmd_support.java new file mode 100644 index 000000000..848c064fd --- /dev/null +++ b/serverlogic/src/main/java/com/ljsd/jieling/kefu/Cmd_support.java @@ -0,0 +1,34 @@ +package com.ljsd.jieling.kefu; + +import com.ljsd.jieling.logic.dao.root.User; +import com.ljsd.jieling.logic.store.BuyGoodsLogic; +import util.TimeUtils; + +/** + * @author hj + * gm,扶持功能 + */ +public class Cmd_support extends GmRoleAbstract { + @Override + public boolean exec(String[] args) throws Exception { + // 获取用户 + User user = getUser(); + // 第一位是奖励信息 + String arg = args[0]; + // 价格 + int price = 0; + // 订单id + String orderId = "support-order"; + // 多个奖励组,需要用"|"分割 + String[] rewards = arg.split("\\|"); + for (String reward : rewards) { + // 奖励id#奖励数量 + String[] item = reward.split("#"); + for (int i = 0; i < Integer.parseInt(item[1]); i++) { + // 发送充值礼包 + BuyGoodsLogic.sendGoods(user.getId(), item[0], user.getPlayerInfoManager().getOpenId(), orderId, TimeUtils.now(), price); + } + } + return true; + } +}