diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/arena/ChallengeLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/arena/ChallengeLogic.java index eeb7009a3..0482ad312 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/arena/ChallengeLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/arena/ChallengeLogic.java @@ -81,7 +81,7 @@ public class ChallengeLogic { // 加成百分比 for (int[] fix : stage.getPassReward()) { Integer num = comDropMap.getOrDefault(fix[0], 0); - num = num + (int)(fix[1] * (ratio+10000d)); + num = num + (int)(fix[1] * (ratio/10000d+1d)); comDropMap.put(fix[0], num); } builder.setPercentReward(ratio); 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 43e8dce42..d6457942c 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 @@ -270,12 +270,9 @@ public class BuyGoodsNewLogic { if(info.getMaxSingleR() < price){ info.setMaxSingleR(price); } - info.addRmb(price); - info.setRechargeList(TimeUtils.now(),price); //处理月卡 activeMonthCard(user,config.getId()); //活动 - user.getPlayerInfoManager().setRechargedaily(user.getPlayerInfoManager().getRechargedaily()+price); changeActivity(user,price,info); } if(!info.getIsFirst()){ @@ -311,7 +308,7 @@ public class BuyGoodsNewLogic { return resultRes; } - // 数数上报 +// 数数上报 // private static void ReportUploadPayInfo(User user,String orderId,double price){ // Map mapReward = ItemUtil.arrayToMap(dropByBag); // ReportUtil.onReportEvent(user, ReportEventEnum.ORDER_COMPLETE.getType(), orderId, price, @@ -423,16 +420,21 @@ public class BuyGoodsNewLogic { ActivityLogic.getInstance().updateActivityMissionProgress(user, ActivityType.RechargeTotal,(int)(price*1000)); ActivityLogic.getInstance().updateActivityMissionProgress(user, ActivityType.LUCKYCAT,(int)(price*1000)); ActivityLogic.getInstance().updateActivityMissionProgress(user, ActivityType.DAILY_RECHARGE,(int)(price*1000)); - webPayHandlerBuy(user,price); ActivityLogic.getInstance().updateActivityMissionProgress(user, ActivityType.RECHARGE_NUM,(int)(price*1000)); ActivityLogic.getInstance().updateActivityMissionProgress(user, ActivityType.JADE_DYNASTY_RECHARGE_SUM,(int)(price*1000)); ActivityLogic.getInstance().updateActivityMissionProgress(user, ActivityType.RECHARGE_SUM_DAY, (int)(user.getPlayerInfoManager().getRechargedaily()*1000)); ActivityLogic.getInstance().updateActivityMissionProgress(user, ActivityType.FIND_FAIRY_FESTIVAL, (int)(price*1000)); ActivityLogic.getInstance().updateActivityMissionProgress(user, ActivityType.NEW_WELFARE, (int)(info.getRr())); + info.addRmb(price); + info.setRechargeList(TimeUtils.now(),price); + user.getPlayerInfoManager().setRechargedaily(user.getPlayerInfoManager().getRechargedaily()+price); + AyyncWorker ayyncWorker = new AyyncWorker(user, true, new AynMissionWorker(GameEvent.RECHARGE_TOTAL,(int)(price*1000))) ; ProtocolsManager.getInstance().updateAyncWorker(ayyncWorker); + webPayHandlerBuy(user,price); + ISession session = OnlineUserManager.getSessionByUid(user.getId()); PlayerInfoProto.RefreshRechargeIndication.Builder builder = PlayerInfoProto.RefreshRechargeIndication.newBuilder(); builder.setAmount(info.getRr()); @@ -1027,20 +1029,18 @@ public class BuyGoodsNewLogic { public static void minuteCheckReharge() throws Exception { Map sessionMap = OnlineUserManager.sessionMap; - Iterator iterator = sessionMap.values().iterator(); - while(iterator.hasNext()){ - ISession value = iterator.next(); - if(value.getFiveReady() == 1){ + for (ISession value : sessionMap.values()) { + if (value.getFiveReady() == 1) { User user = UserManager.getUser(value.getUid(), true); - if(user == null){ + if (user == null) { continue; } - AyyncWorker ayyncWorker = new AyyncWorker(user, false,new AyncWorkerRunnable(){ + AyyncWorker ayyncWorker = new AyyncWorker(user, false, new AyncWorkerRunnable() { @Override public void work(User user) throws Exception { sendGiftGooodsIndication(user.getId()); } - }) ; + }); ProtocolsManager.getInstance().updateAyncWorker(ayyncWorker); } } @@ -1061,12 +1061,7 @@ public class BuyGoodsNewLogic { if(list == null){ return; } - Collections.sort(list, new Comparator(){ - @Override - public int compare(SPackPushConfig o1, SPackPushConfig o2) { - return Integer.compare(o1.getPriority(), o2.getPriority()); - } - }); + list.sort(Comparator.comparingInt(SPackPushConfig::getPriority)); int popup = 0; boolean push = false; for(SPackPushConfig con : list){ diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/store/newRechargeInfo/NewRechargeInfo.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/store/newRechargeInfo/NewRechargeInfo.java index d797ff19f..fcf2786a6 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/store/newRechargeInfo/NewRechargeInfo.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/store/newRechargeInfo/NewRechargeInfo.java @@ -108,8 +108,7 @@ public class NewRechargeInfo extends MongoBase { } public void addRmb(double rmb) { - double add = MathUtils.doubleAdd(rmb, rr); - this.rr = add; + this.rr = MathUtils.doubleAdd(rmb, rr); updateString("rr",rr); } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java b/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java index 4bd37b252..8ccc90e3f 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java @@ -1505,7 +1505,6 @@ public class ItemUtil { switch (sItem.getItemType()){ case GlobalItemType.RMB_CARD: case GlobalItemType.DAY_RMB_CARD: - info.addRmb(num); BuyGoodsNewLogic.changeActivity(user,num,info); break; case GlobalItemType.XIAN_RECHARGE_CARD: