From 416a93b98143e70a818dcef574e7141aa00a98db Mon Sep 17 00:00:00 2001 From: lvxinran Date: Tue, 20 Apr 2021 10:25:38 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E5=85=AC=E4=BC=9A=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E6=8E=92=E8=A1=8C=E6=A6=9C=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../logic/rank/rankImpl/CarDealyGuildRank.java | 8 -------- .../rank/rankImpl/DeathPathEveryGuildRank.java | 15 +-------------- .../rank/rankImpl/DeathPathTotalGuildRank.java | 10 +--------- .../logic/rank/rankImpl/GuildSheJiScoreRank.java | 6 +----- 4 files changed, 3 insertions(+), 36 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/CarDealyGuildRank.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/CarDealyGuildRank.java index 206cf0309..ddd65640b 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/CarDealyGuildRank.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/CarDealyGuildRank.java @@ -27,10 +27,6 @@ public class CarDealyGuildRank extends AbstractRank{ @Override protected void getOptional(int index, ZSetOperations.TypedTuple data, PlayerInfoProto.RankResponse.Builder builder) throws Exception { - User everyUser = UserManager.getUser(Integer.parseInt(data.getValue()), true); - if (everyUser == null){ - return; - } String value = data.getValue(); int guildId = Integer.parseInt(value); GuildInfo guildInfo = GuilidManager.guildInfoMap.get(guildId); @@ -46,10 +42,6 @@ public class CarDealyGuildRank extends AbstractRank{ CommonProto.UserRank everyRank = CommonProto.UserRank.newBuilder() .setGuildName(familyName) .setRankInfo(everyRankInfo) - .setSex(everyUser.getPlayerInfoManager().getSex()) - .setUserSkin(everyUser.getPlayerInfoManager().getUserSkin()) - .setUserTitle(everyUser.getPlayerInfoManager().getUserTitle()) - .setUserMount(everyUser.getPlayerInfoManager().getUserMount()) .build(); builder.addRanks(everyRank); } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/DeathPathEveryGuildRank.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/DeathPathEveryGuildRank.java index d162341f0..949cbff9d 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/DeathPathEveryGuildRank.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/DeathPathEveryGuildRank.java @@ -22,15 +22,6 @@ public class DeathPathEveryGuildRank extends AbstractRank { protected void getOptional(int index, ZSetOperations.TypedTuple data, PlayerInfoProto.RankResponse.Builder builder) { GuildInfo guildInfo = GuilidManager.guildInfoMap.get(Integer.parseInt(data.getValue())); - User everyUser = null; - try{ - everyUser = UserManager.getUser(Integer.parseInt(data.getValue()), true); - if (everyUser == null){ - return; - } - }catch(Exception e){ - e.printStackTrace(); - } CommonProto.RankInfo.Builder everyRankInfo = CommonProto.RankInfo.newBuilder() .setRank(index) .setParam1(getParam1(data.getScore())) @@ -39,11 +30,7 @@ public class DeathPathEveryGuildRank extends AbstractRank { CommonProto.UserRank.Builder everyRank = CommonProto.UserRank.newBuilder() .setUid(guildInfo.getId()) .setGuildName(guildInfo.getName()) - .setRankInfo(everyRankInfo) - .setSex(everyUser.getPlayerInfoManager().getSex()) - .setUserSkin(everyUser.getPlayerInfoManager().getUserSkin()) - .setUserTitle(everyUser.getPlayerInfoManager().getUserTitle()) - .setUserMount(everyUser.getPlayerInfoManager().getUserMount()); + .setRankInfo(everyRankInfo); builder.addRanks(everyRank); } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/DeathPathTotalGuildRank.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/DeathPathTotalGuildRank.java index 3b0890cab..aca685928 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/DeathPathTotalGuildRank.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/DeathPathTotalGuildRank.java @@ -40,10 +40,6 @@ public class DeathPathTotalGuildRank extends AbstractRank{ } protected void getOptional(int index, ZSetOperations.TypedTuple data, PlayerInfoProto.RankResponse.Builder builder) throws Exception { - User everyUser = UserManager.getUser(Integer.parseInt(data.getValue()), true); - if (everyUser == null){ - return; - } GuildInfo guildInfo = GuilidManager.guildInfoMap.get(Integer.parseInt(data.getValue())); DeathChallengeCount countInfo = RedisUtil.getInstence().get(RedisKey.DEATH_PATH_TOTAL_CHALLENGE_COUNT, String.valueOf(guildInfo.getId()), DeathChallengeCount.class); CommonProto.RankInfo.Builder everyRankInfo = CommonProto.RankInfo.newBuilder() @@ -54,11 +50,7 @@ public class DeathPathTotalGuildRank extends AbstractRank{ CommonProto.UserRank.Builder everyRank = CommonProto.UserRank.newBuilder() .setUid(guildInfo.getId()) .setGuildName(guildInfo.getName()) - .setRankInfo(everyRankInfo) - .setSex(everyUser.getPlayerInfoManager().getSex()) - .setUserSkin(everyUser.getPlayerInfoManager().getUserSkin()) - .setUserTitle(everyUser.getPlayerInfoManager().getUserTitle()) - .setUserMount(everyUser.getPlayerInfoManager().getUserMount()); + .setRankInfo(everyRankInfo); builder.addRanks(everyRank); } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/GuildSheJiScoreRank.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/GuildSheJiScoreRank.java index a85d738ea..b4e80dfea 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/GuildSheJiScoreRank.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/GuildSheJiScoreRank.java @@ -46,11 +46,7 @@ public class GuildSheJiScoreRank extends AbstractRank { .setUid(user.getId()) .setLevel(user.getPlayerInfoManager().getLevel()) .setGuildName(guildInfo.getName()) - .setRankInfo(everyRankInfo) - .setSex(user.getPlayerInfoManager().getSex()) - .setUserSkin(user.getPlayerInfoManager().getUserSkin()) - .setUserTitle(user.getPlayerInfoManager().getUserTitle()) - .setUserMount(user.getPlayerInfoManager().getUserMount()); + .setRankInfo(everyRankInfo); builder.addRanks(everyRank); } From ffbd9ac4014dcfce3416e2b214842f93c649d4dc Mon Sep 17 00:00:00 2001 From: lvxinran Date: Tue, 20 Apr 2021 10:45:37 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E5=85=AC=E4=BC=9A=E7=A5=AD=E7=A5=80=20?= =?UTF-8?q?=E6=8F=B4=E5=8A=A9=20=E6=89=93=E5=8D=B0=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/ljsd/jieling/thread/task/MinuteTask.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/thread/task/MinuteTask.java b/serverlogic/src/main/java/com/ljsd/jieling/thread/task/MinuteTask.java index 25ce52e99..9cb88110a 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/thread/task/MinuteTask.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/thread/task/MinuteTask.java @@ -197,7 +197,7 @@ public class MinuteTask extends Thread { for(Map.Entry guildInfoEntry:guildInfoMap.entrySet()){ RedisUtil.getInstence().del(RedisKey.getKey(RedisKey.GUILD_RED_PACKAGE_RANK,String.valueOf(guildInfoEntry.getKey()),false)); guildInfoEntry.getValue().reSetFete(); - + LOGGER.info("{}更新公会祭祀完毕",guildInfoEntry.getValue().getName()); SimpleTransaction transaction = SimpleTransaction.current(); GuildInfo guildInfo = guildInfoEntry.getValue(); Set sendUids = new HashSet<>(); @@ -218,6 +218,8 @@ public class MinuteTask extends Thread { guildMyInfo.setGuildHelpReward(false); guildMyInfo.setGuildHelpTime(0); } + LOGGER.info("{}更新公会援助完毕",guildInfoEntry.getValue().getName()); + SimpleTransaction.remove(); //处理公会援助信息 From ed597fd9032b1bdd659dc3194ff65a86768927b9 Mon Sep 17 00:00:00 2001 From: duhui Date: Mon, 19 Apr 2021 16:48:00 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E5=A4=A7=E9=97=B9=E5=A4=A9=E5=AE=AB,?= =?UTF-8?q?=E6=8B=9B=E5=8B=9F=E6=98=9F=E7=BA=A7=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ljsd/jieling/logic/hero/HeroLogic.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) 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 91b42e349..413007f0c 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 @@ -1238,7 +1238,7 @@ public class HeroLogic{ // 聚合::根据openlevel倒序,输出list List collect = rankUpConfigs.stream().sorted(Comparator.comparing(SCHeroRankUpConfig::getOpenLevel).reversed()).collect(Collectors.toList()); for(SCHeroRankUpConfig scHeroRankUpConfig : collect){ - if (heroLevel >= scHeroRankUpConfig.getOpenLevel()){ + if (heroLevel > scHeroRankUpConfig.getOpenLevel()){ if (scHeroRankUpConfig.getOpenStar() > 10){ continue; } @@ -1265,7 +1265,7 @@ public class HeroLogic{ // 聚合:根据openlevel倒叙排序,输出成list List collect = rankUpConfigs.stream().sorted(Comparator.comparing(SCHeroRankUpConfig::getOpenLevel).reversed()).collect(Collectors.toList()); for(SCHeroRankUpConfig scHeroRankUpConfig : collect){ - if (heroLevel >= scHeroRankUpConfig.getLimitLevel()){ + if (heroLevel > scHeroRankUpConfig.getLimitLevel()){ return scHeroRankUpConfig.getId(); } } @@ -1292,9 +1292,11 @@ public class HeroLogic{ // 聚合::根据openlevel倒序,输出list List collect = rankUpStar.stream().sorted(Comparator.comparing(SCHeroRankUpConfig::getOpenLevel).reversed()).collect(Collectors.toList()); for(SCHeroRankUpConfig val : collect){ - if (heroLevel >= val.getOpenLevel()){ + if (heroLevel > val.getOpenLevel()){ + // 计算星级需要+1操作 + int result = val.getOpenStar()+1; // 机器人生成星级,最高10星 - return val.getOpenStar()>10?10:val.getOpenStar(); + return result>10?10:result; } } } @@ -1306,7 +1308,7 @@ public class HeroLogic{ // 聚合:根据openlevel倒叙排序,输出成list List collect = rankUpBreak.stream().sorted(Comparator.comparing(SCHeroRankUpConfig::getOpenLevel).reversed()).collect(Collectors.toList()); for(SCHeroRankUpConfig val : collect){ - if (heroLevel >= val.getLimitLevel()){ + if (heroLevel > val.getLimitLevel()){ return val.getOpenStar()>10?10:val.getOpenStar(); } } From 305f2879ed266305c61b1adb8b8feb44a77c21a6 Mon Sep 17 00:00:00 2001 From: lvxinran Date: Mon, 19 Apr 2021 20:20:25 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E7=A4=BE=E7=A8=B7=E5=A4=A7=E5=85=B8?= =?UTF-8?q?=E6=8E=92=E8=A1=8C=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jieling/logic/rank/rankImpl/GuildSheJiScoreRank.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/GuildSheJiScoreRank.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/GuildSheJiScoreRank.java index b4e80dfea..a85d738ea 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/GuildSheJiScoreRank.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/GuildSheJiScoreRank.java @@ -46,7 +46,11 @@ public class GuildSheJiScoreRank extends AbstractRank { .setUid(user.getId()) .setLevel(user.getPlayerInfoManager().getLevel()) .setGuildName(guildInfo.getName()) - .setRankInfo(everyRankInfo); + .setRankInfo(everyRankInfo) + .setSex(user.getPlayerInfoManager().getSex()) + .setUserSkin(user.getPlayerInfoManager().getUserSkin()) + .setUserTitle(user.getPlayerInfoManager().getUserTitle()) + .setUserMount(user.getPlayerInfoManager().getUserMount()); builder.addRanks(everyRank); } From 0ac4200f7c1c7fdddb35f2ea3d18052f2c92b8f4 Mon Sep 17 00:00:00 2001 From: lvxinran Date: Fri, 30 Apr 2021 22:57:24 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E8=80=81=E7=8E=A9=E5=AE=B6=E4=BF=9D?= =?UTF-8?q?=E5=AD=98=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ljsd/jieling/logic/dao/PlayerManager.java | 2 +- .../com/ljsd/jieling/logic/store/BuyGoodsNewLogic.java | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/PlayerManager.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/PlayerManager.java index 65036a3d1..32437ec97 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/PlayerManager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/PlayerManager.java @@ -74,7 +74,7 @@ public class PlayerManager extends MongoBase { private Set reds = new CopyOnWriteArraySet<>(); // private RechargeInfo rechargeInfo; - private NewRechargeInfo newRechargeInfo = new NewRechargeInfo(); + private NewRechargeInfo newRechargeInfo; private Map monthCard = new HashMap<>();//月卡信息 private Set monthCardDailyTake = new HashSet<>(); 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 f21c09411..72b90a666 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 @@ -67,15 +67,15 @@ public class BuyGoodsNewLogic { * 登录刷新礼包 */ public static boolean refreshWelfareState(User user) throws Exception { - dailyRefresh(user); - sendDailyMailReward(user); - boolean needChange = false; - List pAddList = new ArrayList<>(); NewRechargeInfo info = user.getPlayerInfoManager().getNewRechargeInfo(); if(info == null){ info = new NewRechargeInfo(); user.getPlayerInfoManager().setNewRechargeInfo(info); } + dailyRefresh(user); + sendDailyMailReward(user); + boolean needChange = false; + List pAddList = new ArrayList<>(); for(Map.Entry entry : SRechargeCommodityNewConfig.configMap.entrySet()){ //获取处理类 RechargeHandler rechargeHandler = getRechargeHandler(entry.getValue().getOtype()); From 575accafa7e9c3c99f092c70a19c178745e6d829 Mon Sep 17 00:00:00 2001 From: lvxinran Date: Tue, 4 May 2021 10:22:06 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E7=B4=AF=E8=AE=A1=E5=85=85=E5=80=BC?= =?UTF-8?q?=E9=92=B1=E6=95=B0=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../reportBeans_37/Repot37EventUtil.java | 3 +- .../jieling/handler/GetPlayerInfoHandler.java | 2 +- .../reportEvent/ChargeAmountEventHandler.java | 5 ++-- .../ljsd/jieling/logic/dao/PlayerManager.java | 8 ++--- .../ljsd/jieling/logic/dao/RechargeInfo.java | 29 +++++++++---------- .../jieling/logic/store/BuyGoodsNewLogic.java | 13 +++++++++ .../ljsd/jieling/logic/store/StoreLogic.java | 2 +- 7 files changed, 38 insertions(+), 24 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/dataReport/reportBeans_37/Repot37EventUtil.java b/serverlogic/src/main/java/com/ljsd/jieling/dataReport/reportBeans_37/Repot37EventUtil.java index 685be7679..147b820a6 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/dataReport/reportBeans_37/Repot37EventUtil.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/dataReport/reportBeans_37/Repot37EventUtil.java @@ -4,6 +4,7 @@ import com.google.gson.Gson; import com.ljsd.jieling.config.json.SDK37Constans; import com.ljsd.jieling.config.reportData.DataMessageUtils; import com.ljsd.jieling.logic.dao.root.User; +import com.ljsd.jieling.logic.store.BuyGoodsNewLogic; import com.ljsd.jieling.util.MD5Util; import util.TimeUtils; @@ -38,7 +39,7 @@ public class Repot37EventUtil { report37RoleLeveBean.setRole_grade_u_time(TimeUtils.getTimeStamp(System.currentTimeMillis())); report37RoleLeveBean.setRole_grade_desc("null"); report37RoleLeveBean.setBalance("null");//todo - report37RoleLeveBean.setTotal_pay_amoun(String.valueOf(user.getPlayerInfoManager().getNewRechargeInfo().getRr()*100)); + report37RoleLeveBean.setTotal_pay_amoun(String.valueOf(BuyGoodsNewLogic.getAllAmount(user) *100)); report37RoleLeveBean.setTotal_online_time(user.getPlayerInfoManager().getOnlineTime()); report37RoleLeveBean.setGuild_id("");//todo report37RoleLeveBean.setGuild_name("0");//todo diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/GetPlayerInfoHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/GetPlayerInfoHandler.java index 85aa7614f..d3abd1bb9 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/GetPlayerInfoHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/GetPlayerInfoHandler.java @@ -205,7 +205,7 @@ public class GetPlayerInfoHandler extends BaseHandler{ .setQuestionState(questState) .setSoulEquipPool(equipPool) .addAllPlayedMapTypes(mapManager.getPlayedMapType()) - .setAmount(newRechargeInfo.getRr()) + .setAmount(BuyGoodsNewLogic.getAllAmount(user)) .setVipDaily(playerInfoManager.getHadTakeDailyBoxVip()) .setMissingRefreshCount(vipPrivilageValue) .addAllMonthinfos(PlayerLogic.getInstance().getMonthCardInfo(user)) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/ktbeans/reportEvent/ChargeAmountEventHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/ktbeans/reportEvent/ChargeAmountEventHandler.java index 207c4138b..b495bcb65 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/ktbeans/reportEvent/ChargeAmountEventHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/ktbeans/reportEvent/ChargeAmountEventHandler.java @@ -1,6 +1,7 @@ package com.ljsd.jieling.ktbeans.reportEvent; import com.ljsd.jieling.logic.dao.root.User; +import com.ljsd.jieling.logic.store.BuyGoodsNewLogic; import java.util.Date; import java.util.HashMap; @@ -19,10 +20,10 @@ public class ChargeAmountEventHandler extends CommonEventHandler { Map setOnceProperties = new HashMap<>(); - setProperties.put("charge_amount",user.getPlayerInfoManager().getNewRechargeInfo().getRr()); + setProperties.put("charge_amount", BuyGoodsNewLogic.getAllAmount(user)); setProperties.put("last_recharge_time",new Date()); setOnceProperties.put("first_charge_time",new Date()); - setOnceProperties.put("first_charge_amount",user.getPlayerInfoManager().getNewRechargeInfo().getRr()); + setOnceProperties.put("first_charge_amount",BuyGoodsNewLogic.getAllAmount(user)); userProperties.put(1,setProperties); userProperties.put(2,setOnceProperties); return userProperties; diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/PlayerManager.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/PlayerManager.java index 32437ec97..a4604eb8c 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/PlayerManager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/PlayerManager.java @@ -73,7 +73,7 @@ public class PlayerManager extends MongoBase { private Set reds = new CopyOnWriteArraySet<>(); -// private RechargeInfo rechargeInfo; + private RechargeInfo rechargeInfo; private NewRechargeInfo newRechargeInfo; private Map monthCard = new HashMap<>();//月卡信息 private Set monthCardDailyTake = new HashSet<>(); @@ -467,9 +467,9 @@ public class PlayerManager extends MongoBase { removeString(getMongoKey() +".vipInfo."+privilageId); } -// public RechargeInfo getRechargeInfo() { -// return rechargeInfo; -// } + public RechargeInfo getRechargeInfo() { + return rechargeInfo; + } // // public void setRechargeInfo(RechargeInfo rechargeInfo) { // rechargeInfo.init(this.getRootId(), getMongoKey()+".rechargeInfo"); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/RechargeInfo.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/RechargeInfo.java index 73d41210a..de6f631f4 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/RechargeInfo.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/RechargeInfo.java @@ -1,15 +1,14 @@ -//package com.ljsd.jieling.logic.dao; +package com.ljsd.jieling.logic.dao; + +import com.ljsd.common.mogodb.MongoBase; +import io.netty.util.internal.ConcurrentSet; +import org.springframework.data.annotation.Transient; + +import java.util.*; + +public class RechargeInfo extends MongoBase{ // -//import com.ljsd.common.mogodb.MongoBase; -//import config.SRechargeCommodityConfig; -//import io.netty.util.internal.ConcurrentSet; -//import org.springframework.data.annotation.Transient; -// -//import java.util.*; -// -//public class RechargeInfo extends MongoBase{ -// -// private double saveAmt;//累计充值 + private double saveAmt;//累计充值; // // private double monthSaveAmt ; //月卡累计总额 // private double smonthSaveAmt ; //豪华月卡累计总额 @@ -144,9 +143,9 @@ // } // // -// public double getSaveAmt() { -// return saveAmt; -// } + public double getSaveAmt() { + return saveAmt; + } // // public long getCreateTime() { // return createTime; @@ -270,4 +269,4 @@ // } // // -//} +} 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 72b90a666..fd380dba4 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 @@ -21,6 +21,7 @@ import com.ljsd.jieling.logic.activity.event.NewWelfareEvent; import com.ljsd.jieling.logic.activity.event.NewWelfareTypeEnum; import com.ljsd.jieling.logic.activity.event.Poster; 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.VipInfo; import com.ljsd.jieling.logic.dao.root.User; @@ -63,6 +64,18 @@ public class BuyGoodsNewLogic { return RechargeType.getHandler(type); } + + //获取充值总金额,结合前面的 + public static double getAllAmount(User user){ + PlayerManager playerInfoManager = user.getPlayerInfoManager(); + NewRechargeInfo newRechargeInfo = playerInfoManager.getNewRechargeInfo(); + RechargeInfo rechargeInfo = playerInfoManager.getRechargeInfo(); + double amount = newRechargeInfo.getRr(); + if(rechargeInfo!=null){ + amount+=rechargeInfo.getSaveAmt(); + } + return amount; + } /** * 登录刷新礼包 */ diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/store/StoreLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/store/StoreLogic.java index 0699ae154..ec4962334 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/store/StoreLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/store/StoreLogic.java @@ -559,7 +559,7 @@ public class StoreLogic implements IEventHandler { int[] buyRule = sStoreConfig.getBuyRule(); if(buyRule!=null&&buyRule.length>0){ //充值金额购买条件判断 - if(buyRule[0]==1&&playerInfoManager.getNewRechargeInfo().getRr()