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 83730f64e..8e046ab9f 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 @@ -1800,11 +1800,23 @@ public class PlayerLogic { List cardInfos = new LinkedList<>(); PlayerManager playerInfoManager = user.getPlayerInfoManager(); NewRechargeInfo rechargeInfo = playerInfoManager.getNewRechargeInfo(); - STableManager.getConfig(SMonthcardConfig.class).forEach((integer, sMonthcardConfig) -> { - int time = playerInfoManager.getMonthCard().getOrDefault(integer,0); - int state = playerInfoManager.getMonthCardDailyTake().contains(integer)?1:0; - double saveAmt = integer==1?rechargeInfo.getMonthRr():rechargeInfo.getsMonthRr(); - cardInfos.add(CommonProto.MonthCardInfo.newBuilder().setId(integer).setEndingTime(time).setState(state).setTotleAmt(saveAmt).build()); + STableManager.getConfig(SMonthcardConfig.class).forEach((key, config) -> { + int time = playerInfoManager.getMonthCard().getOrDefault(key,0); + int state = playerInfoManager.getMonthCardDailyTake().contains(key)?1:0; + double saveAmt = 0; + switch (key){ + case 1: + saveAmt = rechargeInfo.getMonthRr(); + break; + case 2: + saveAmt = rechargeInfo.getsMonthRr(); + break; + case 3: + saveAmt = rechargeInfo.getSinceremonth(); + break; + default:break; + } + cardInfos.add(CommonProto.MonthCardInfo.newBuilder().setId(key).setEndingTime(time).setState(state).setTotleAmt(saveAmt).build()); }); return cardInfos; }