From a660a1b5bf59e23d48f301bd75194d650444db6b Mon Sep 17 00:00:00 2001 From: duhui Date: Tue, 22 Jun 2021 17:39:47 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=89=B6=E6=8C=81=E5=8F=91=E5=A5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ljsd/jieling/logic/store/BuyGoodsNewLogic.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 41935a434..2249b8cf9 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 @@ -170,7 +170,7 @@ public class BuyGoodsNewLogic { double priceTemp =config.getPrice(); int cfgType = SSpecialConfig.getIntegerValue(SSpecialConfig.EXCHANGE_FORCE_TYPE); double price = priceTemp==0?0: SExchangeRate.doubleIntegerHashMap.get(cfgType).get((int)priceTemp); - if(amount!=-999&&!MathUtils.doubleEquals(amount,price * 100)){ + if(amount!=-999&&!MathUtils.doubleEquals(amount,price * 100)&&!"support-order".equals(orderId)){ resultRes.setResultCode(0); resultRes.setResultMsg("charge count error"); LOGGER.error("charge count error, uid={},the goodId={}, currentPrice={},realPrice={}",uid,goodsId, amount,price); From ff2bb3013b489fd325851856addbb039f0a6a360 Mon Sep 17 00:00:00 2001 From: mengchengzhen <13682025901@163.com> Date: Wed, 23 Jun 2021 16:17:47 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E7=A6=8F=E5=88=A9=E7=BA=A2=E5=8C=85?= =?UTF-8?q?=E4=BC=9A=E9=95=BF=E6=96=B0=E4=BA=BA=E7=BA=A2=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ljsd/jieling/logic/family/GuildLogic.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildLogic.java index 864fd59b0..680a105b5 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildLogic.java @@ -625,7 +625,7 @@ public class GuildLogic { } targetUser.getGuildMyInfo().setJoinTime(TimeUtils.nowInt()); ReportUtil.onReportEvent(targetUser, ReportEventEnum.JOIN_GUILD.getType(),String.valueOf(guildInfo.getId()),guildInfo.getName(),guildInfo.getLevel(),guildInfo.getTotalMembers()); - sendNewGuyRedPacket(guildInfo); + sendNewGuyRedPacket(guildInfo,applyId); } /** @@ -1715,18 +1715,18 @@ public class GuildLogic { return true; } - private static void sendNewGuyRedPacket(GuildInfo guildInfo) throws Exception{ + private static void sendNewGuyRedPacket(GuildInfo guildInfo,int userId) throws Exception{ for(int id : guildInfo.getMembers().get(GlobalsDef.CHAIRMAN)){ - User user = UserManager.getUser(id); - if(user == null) + User chairman = UserManager.getUser(id); + if(chairman == null) continue; - if(guildInfo.getHistoryMember().contains(user.getId())){ + if(guildInfo.getHistoryMember().contains(userId)){ return; }else{ - guildInfo.getHistoryMember().add(user.getId()); + guildInfo.getHistoryMember().add(userId); guildInfo.updateHistoryMember(); } - Poster.getPoster().dispatchEvent(new WelfareRedPackEvent(user.getId(), WelfareRedPacketType.newfish_come.getType(),0)); + Poster.getPoster().dispatchEvent(new WelfareRedPackEvent(chairman.getId(), WelfareRedPacketType.newfish_come.getType(),0)); } } From e0568b2717c41dafa1eefc818eb7fe90728de36b Mon Sep 17 00:00:00 2001 From: lvxinran Date: Sat, 26 Jun 2021 14:04:01 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=B7=85=E5=B3=B0=E8=B5=9B=E7=AB=9E?= =?UTF-8?q?=E7=8C=9C=E5=B8=81=E6=8D=A2=E6=88=90=E9=82=AE=E4=BB=B6=E8=BD=AC?= =?UTF-8?q?=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jieling/logic/championship/ChampionshipLogic.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/championship/ChampionshipLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/championship/ChampionshipLogic.java index a822cf724..fc8545527 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/championship/ChampionshipLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/championship/ChampionshipLogic.java @@ -444,10 +444,13 @@ public class ChampionshipLogic { costs[0] = new int[2]; costs[0][0] = arenaItemId; costs[0][1] = itemNum; +// Map itemReward = new HashMap<>(1); +// itemReward.put(rewardItemId, (long) (itemNum / sChampionshipSetting.getExchangeItem())); + String title = SErrorCodeEerverConfig.getI18NMessage("champion_bet_title"); + String content = SErrorCodeEerverConfig.getI18NMessage("champion_bet_content"); + MailLogic.getInstance().sendMail(user.getId(),title,content,rewardItemId+"#"+(itemNum / sChampionshipSetting.getExchangeItem()),TimeUtils.nowInt(),Global.MAIL_EFFECTIVE_TIME); ItemUtil.itemCost(user, costs, BIReason.CHAMPIONM_EXCHANGE_CONSUME, sendId); - Map itemReward = new HashMap<>(1); - itemReward.put(rewardItemId, (long) (itemNum / sChampionshipSetting.getExchangeItem())); - ItemUtil.addItem(user, itemReward, null, BIReason.CHAMPIONM_EXCHANGE_REWARD); +// ItemUtil.addItem(user, itemReward, null, BIReason.CHAMPIONM_EXCHANGE_REWARD); } LOGGER.info("the uid={},send rewardnum={}", itemNum / sChampionshipSetting.getExchangeItem());