From 4c3f272357db2de60e15db3c6460674cfc04d616 Mon Sep 17 00:00:00 2001 From: lvxinran Date: Wed, 29 Jul 2020 20:04:00 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=95=B0=E6=89=93=E7=82=B9=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/ljsd/jieling/ktbeans/ReportEventEnum.java | 4 +++- .../jieling/ktbeans/reportEvent/CreateRoleEventHandler.java | 2 +- .../java/com/ljsd/jieling/logic/player/PlayerLogic.java | 3 +++ .../java/com/ljsd/jieling/logic/store/BuyGoodsLogic.java | 6 ++++-- 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/ktbeans/ReportEventEnum.java b/serverlogic/src/main/java/com/ljsd/jieling/ktbeans/ReportEventEnum.java index 0dc2c8d4d..19ada2af4 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/ktbeans/ReportEventEnum.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/ktbeans/ReportEventEnum.java @@ -39,12 +39,14 @@ public enum ReportEventEnum { JOIN_GUILD(25,"join_guild", new CommonEventHandler(),new String[]{"guild_id","guild_name","guild_level","guild_people_num","guild_fighting_capacity","guild_create_time"}), QUIT_GUILD(26,"quit_guild", new CommonEventHandler(),new String[]{"guild_id","guild_name","guild_level","guild_people_num","guild_fighting_capacity","guild_create_time"}), CREATE_ORDER(27,"create_order", new CommonEventHandler(),new String[]{"order_id","order_money_amount","Bundle_id","entrance","item_id","item_name","goods_id","item_list"}), - ORDER_COMPLETE(28,"order_complete", new ChargeAmountEventHandler(),new String[]{"order_id","order_money_amount","Bundle_id","entrance","item_id","item_name","goods_id","item_list"}), + ORDER_COMPLETE(28,"order_complete", new ChargeAmountEventHandler(),new String[]{"order_id","order_money_amount","Bundle_id","channel_id","server_id","goods_id","goods_name","item_id","item_num"}), CHECK_RANKING(29,"check_ranking", new CommonEventHandler(),new String[]{"ranking_type"}), ASK_FOR_BEING_FRIENDS(30,"ask_for_being_friends", new CommonEventHandler(),new String[]{"target_id","target_name","target_level","entrance"}), ALLOW_FRIENDS_ASK(31,"allow_friends_ask", new CommonEventHandler(),new String[]{"target_id","target_name","target_level","entrance"}), SEND_MESSAGE(32,"send_message", new CommonEventHandler(),new String[]{"message_type","message_content"}), OPEN_MAIL(33,"open_mail", new CommonEventHandler(),new String[]{""}), + GUIDE(34,"guide", new CommonEventHandler(),new String[]{"step_id"}), + VIP_LEVEL_UP(100,"", new VipLevelUpEventHandler(),new String[]{""}); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/ktbeans/reportEvent/CreateRoleEventHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/ktbeans/reportEvent/CreateRoleEventHandler.java index 911ab1caf..598d492f6 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/ktbeans/reportEvent/CreateRoleEventHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/ktbeans/reportEvent/CreateRoleEventHandler.java @@ -22,7 +22,7 @@ public class CreateRoleEventHandler extends CommonEventHandler{ setProperties.put("role_name",user.getPlayerInfoManager().getNickName()); setOnceProperties.put("role_create_time",new Date()); setOnceProperties.put("server_id",String.valueOf(GameApplication.serverId)); - setOnceProperties.put("channel_id",user.getPlayerInfoManager().getChannel()); + setOnceProperties.put("channel_id",user.getPlayerInfoManager().getPid()); setOnceProperties.put("platform_id",user.getPlayerInfoManager().getPlatform()); setOnceProperties.put("reg_ip",user.getPlayerInfoManager().getIp()); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java index e4bd2ca6c..208559766 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java @@ -104,6 +104,9 @@ public class PlayerLogic { int uid = session.getUid(); User user = UserManager.getUser(uid); user.getPlayerInfoManager().updateGuidePoint(type,id); + if(type==1){ + ReportUtil.onReportEvent(user,ReportEventEnum.GUILD.getType(),String.valueOf(id)); + } MessageUtil.sendMessage(session,1, MessageTypeProto.MessageType.SAVE_NEW_PLAYER_GUIDE_POINT_RESPONSE_VALUE,null,true); } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsLogic.java index 544ca7de2..3a3470463 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsLogic.java @@ -1,5 +1,6 @@ package com.ljsd.jieling.logic.store; +import com.ljsd.GameApplication; import com.ljsd.jieling.config.clazzStaticCfg.CommonStaticConfig; import com.ljsd.jieling.config.reportData.DataMessageUtils; import com.ljsd.jieling.core.GlobalsDef; @@ -81,7 +82,6 @@ public class BuyGoodsLogic { for(int[] item:sRechargeCommodityConfig.getBaseReward()){ itemList.add(item[0]); } - ReportUtil.onReportEvent(user, ReportEventEnum.ORDER_COMPLETE.getType(),"",price,"","","","",String.valueOf(goodsId),itemList); // KtEventUtils.onKtEvent(user, ParamEventBean.UserPayEvent,goodsId,System.currentTimeMillis()+"",result.getResultCode(),price*10); } @@ -352,12 +352,14 @@ public class BuyGoodsLogic { rechargeInfo.updateRefreshMapByKey(sRechargeCommodityConfig.getId(),TimeUtils.now()+sRechargeCommodityConfig.getDailyUpdate()*TimeUtils.DAY); } resultRes.setResultCode(1); - KtEventUtils.onKtEvent(user, ParamEventBean.UserPayEvent,goodsId,orderId,resultRes.getResultCode(),price); +// KtEventUtils.onKtEvent(user, ParamEventBean.UserPayEvent,goodsId,orderId,resultRes.getResultCode(),price); notifyPaySuccessFul(uid,goodsId,amount != -999); // Poster.getPoster().dispatchEvent(new NewWelfareEvent(user, NewWelfareTypeEnum.RECHARGE_BUY.getType(),goodsId)); MongoUtil.getLjsdMongoTemplate().lastUpdate(); sendGiftGooodsIndication(uid); onChargeSuccess(uid,sRechargeCommodityConfig.getPrice(),0);//充值成功上报 + Map mapReward = ItemUtil.arrayToMap(baseReward); + ReportUtil.onReportEvent(user, ReportEventEnum.ORDER_COMPLETE.getType(),orderId,price,user.getPlayerInfoManager().getGid(),user.getPlayerInfoManager().getPid(),String.valueOf(GameApplication.serverId),String.valueOf(goodsId),sRechargeCommodityConfig.getName(),mapReward.keySet(),mapReward.values()); return resultRes; }