diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java index 30bfd20ac..b0825d2c3 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java @@ -45,6 +45,7 @@ import com.ljsd.jieling.logic.store.BuyGoodsNewLogic; import com.ljsd.jieling.logic.store.StoreLogic; import com.ljsd.jieling.logic.store.StoreType; +import com.ljsd.jieling.logic.store.newRechargeInfo.PushRechargeType; import com.ljsd.jieling.network.session.ISession; import rpc.protocols.*; import com.ljsd.jieling.util.*; @@ -2190,7 +2191,7 @@ public class MapLogic { Poster.getPoster().dispatchEvent(new FightMainEvent(user.getId(),fightId)); Poster.getPoster().dispatchEvent(new NewWelfareEvent(user, NewWelfareTypeEnum.LEVEL_FIGHT.getType(),fightId)); user.getMainLevelManager().updateFight(updateFightId,state); - BuyGoodsNewLogic.openPush(session,user,1,fightId,0); + BuyGoodsNewLogic.openPush(session,user, PushRechargeType.main_line.getType(),fightId,0); if(state == -1){ //删除为0的 Map fightStateInfo = user.getMainLevelManager().getFightStateInfo(); @@ -2295,7 +2296,7 @@ public class MapLogic { ReportUtil.onReportEvent(user,ReportEventEnum.COMPLETE_XINMO.getType(),checkFightId,sFloodConfig.getMonster(),MonsterUtil.getMonsterForce(new int[]{sFloodConfig.getMonster()}),new Date(),"",null,null,"失败"); return; } - BuyGoodsNewLogic.openPush(session,user,2,sFloodConfig.getId(),0); + BuyGoodsNewLogic.openPush(session,user,PushRechargeType.tower.getType(),sFloodConfig.getId(),0); //排行榜 // String rankKey = RedisKey.getKey(RedisKey.MONSTER_ATTACK_RANK,"", false); // RedisUtil.getInstence().zsetAddOneOffsetByTime(rankKey, String.valueOf(user.getId()), checkFightId); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/miniGame/CircleGame.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/miniGame/CircleGame.java index d46b0eb75..87967f23d 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/miniGame/CircleGame.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/miniGame/CircleGame.java @@ -8,6 +8,7 @@ import com.ljsd.jieling.logic.dao.root.User; import com.ljsd.jieling.logic.redpacket.WelfareRedPackEvent; import com.ljsd.jieling.logic.redpacket.WelfareRedPacketType; import com.ljsd.jieling.logic.store.BuyGoodsNewLogic; +import com.ljsd.jieling.logic.store.newRechargeInfo.PushRechargeType; import com.ljsd.jieling.network.session.ISession; import config.SSpiritAnimal; import rpc.protocols.CommonProto; @@ -88,7 +89,7 @@ public class CircleGame extends ColorGame{ if(ssa != null && ssa.getQuality()==5){ Poster.getPoster().dispatchEvent(new WelfareRedPackEvent(user.getId(), WelfareRedPacketType.game_pokemon.getType(),1)); ISession session = OnlineUserManager.getSessionByUid(user.getId()); - BuyGoodsNewLogic.openPush(session,user,8,5,1); + BuyGoodsNewLogic.openPush(session,user, PushRechargeType.pokemon_quality.getType(),5,1); } } } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/eventhandler/HeroFiveStarGetEventHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/eventhandler/HeroFiveStarGetEventHandler.java index c3fc14a7d..f231b5fef 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/eventhandler/HeroFiveStarGetEventHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/eventhandler/HeroFiveStarGetEventHandler.java @@ -11,6 +11,7 @@ import com.ljsd.jieling.logic.dao.UserManager; import com.ljsd.jieling.logic.dao.root.User; import com.ljsd.jieling.logic.store.BuyGoodsNewLogic; import com.ljsd.jieling.logic.store.newRechargeInfo.NewRechargeInfo; +import com.ljsd.jieling.logic.store.newRechargeInfo.PushRechargeType; import com.ljsd.jieling.network.session.ISession; import rpc.protocols.CommonProto; import rpc.protocols.MessageTypeProto; @@ -36,6 +37,6 @@ public class HeroFiveStarGetEventHandler implements IEventHandler { int star = ((HeroFiveStarGetEvent) event).getStar(); int num = ((HeroFiveStarGetEvent) event).getNum(); ISession session = OnlineUserManager.getSessionByUid(user.getId()); - BuyGoodsNewLogic.openPush(session,user,4,star,num); + BuyGoodsNewLogic.openPush(session,user, PushRechargeType.card_star.getType(),star,num); } } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/eventhandler/PokemonFiveStarGetEventHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/eventhandler/PokemonFiveStarGetEventHandler.java index bd470701c..0786a77a2 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/eventhandler/PokemonFiveStarGetEventHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/eventhandler/PokemonFiveStarGetEventHandler.java @@ -7,6 +7,7 @@ import com.ljsd.jieling.logic.activity.event.PokemonFiveStarGetEvent; import com.ljsd.jieling.logic.dao.UserManager; import com.ljsd.jieling.logic.dao.root.User; import com.ljsd.jieling.logic.store.BuyGoodsNewLogic; +import com.ljsd.jieling.logic.store.newRechargeInfo.PushRechargeType; import com.ljsd.jieling.network.session.ISession; public class PokemonFiveStarGetEventHandler implements IEventHandler { @@ -20,6 +21,6 @@ public class PokemonFiveStarGetEventHandler implements IEventHandler { int star = ((PokemonFiveStarGetEvent) event).getStar(); int num = ((PokemonFiveStarGetEvent) event).getNum(); ISession session = OnlineUserManager.getSessionByUid(user.getId()); - BuyGoodsNewLogic.openPush(session,user,8,star,num); + BuyGoodsNewLogic.openPush(session,user, PushRechargeType.pokemon_quality.getType(),star,num); } } \ No newline at end of file diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java index 1d57c3584..084e1fe0d 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java @@ -34,6 +34,7 @@ import com.ljsd.jieling.logic.player.PlayerLogic; import com.ljsd.jieling.logic.redpacket.WelfareRedPackEvent; import com.ljsd.jieling.logic.redpacket.WelfareRedPacketType; import com.ljsd.jieling.logic.store.BuyGoodsNewLogic; +import com.ljsd.jieling.logic.store.newRechargeInfo.PushRechargeType; import com.ljsd.jieling.network.server.ProtocolsManager; import com.ljsd.jieling.network.session.ISession; import com.ljsd.jieling.util.*; @@ -3693,7 +3694,7 @@ public class HeroLogic{ consumeBuilder.append(consume[0]).append("#").append(consume[1]); } ReportUtil.onReportEvent(user,ReportEventEnum.BEAST_STAR.getType(),pokemon.getTmpId(),oldStar,pokemon.getStar(),consumeBuilder.toString()); - BuyGoodsNewLogic.openPush(session,user,9,pokemon.getStar(),1); + BuyGoodsNewLogic.openPush(session,user, PushRechargeType.pokemon_star.getType(),pokemon.getStar(),1); } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/event/UserLevelEventProcessor.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/event/UserLevelEventProcessor.java index df8a69416..bf0511692 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/event/UserLevelEventProcessor.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/event/UserLevelEventProcessor.java @@ -10,6 +10,7 @@ import com.ljsd.jieling.logic.mission.main.MissionStateChangeInfo; import com.ljsd.jieling.logic.redpacket.WelfareRedPackEvent; import com.ljsd.jieling.logic.redpacket.WelfareRedPacketType; import com.ljsd.jieling.logic.store.BuyGoodsNewLogic; +import com.ljsd.jieling.logic.store.newRechargeInfo.PushRechargeType; import com.ljsd.jieling.network.session.ISession; import java.util.List; @@ -26,7 +27,7 @@ public class UserLevelEventProcessor implements BaseGameEventProcessor{ int upLevel = (int)parm[1]; ISession session = OnlineUserManager.getSessionByUid(user.getId()); - BuyGoodsNewLogic.openPush(session,user,3,upLevel,0); + BuyGoodsNewLogic.openPush(session,user, PushRechargeType.user_level.getType(),upLevel,0); BuyGoodsNewLogic.sendGiftGooodsIndication(user.getId()); Poster.getPoster().dispatchEvent(new WelfareRedPackEvent(user.getId(), WelfareRedPacketType.player_level.getType(),upLevel)); } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsNewLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsNewLogic.java index 8f8813626..f2f292fc2 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsNewLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsNewLogic.java @@ -31,6 +31,7 @@ import com.ljsd.jieling.logic.mail.MailLogic; import com.ljsd.jieling.logic.mission.GameEvent; import com.ljsd.jieling.logic.player.PlayerLogic; import com.ljsd.jieling.logic.store.newRechargeInfo.NewRechargeInfo; +import com.ljsd.jieling.logic.store.newRechargeInfo.PushRechargeType; import com.ljsd.jieling.logic.store.newRechargeInfo.RechargeType; import com.ljsd.jieling.logic.store.newRechargeInfo.bean.*; import com.ljsd.jieling.logic.store.newRechargeInfo.rechargeHandler.RechargeHandler; @@ -239,7 +240,7 @@ public class BuyGoodsNewLogic { notifyPaySuccessFul(uid,goodsId,amount != -999); MongoUtil.getLjsdMongoTemplate().lastUpdate(); sendGiftGoodsWithoutJudge(uid); - + openPush(session,user, PushRechargeType.point_recharge.getType(),goodsId,1); // 扶持订单不需要上报 if(price>0 && !orderId.equals("support-order")){ // 以下为充值上报 diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/store/newRechargeInfo/PushRechargeType.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/store/newRechargeInfo/PushRechargeType.java new file mode 100644 index 000000000..243dad810 --- /dev/null +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/store/newRechargeInfo/PushRechargeType.java @@ -0,0 +1,25 @@ +package com.ljsd.jieling.logic.store.newRechargeInfo; + +public enum PushRechargeType { + main_line(1), + tower(2), + user_level(3), + card_star(4), + fail(5), + tower_fail(6), + once_pay(7), + pokemon_quality(8), + pokemon_star(9), + point_recharge(10), + ; + + private int type; + + PushRechargeType(int type){ + this.type = type; + } + + public int getType() { + return type; + } +}