From 30814f86a544d646734a7def305f773e876532d0 Mon Sep 17 00:00:00 2001 From: mengchengzhen <13682025901@163.com> Date: Wed, 28 Apr 2021 18:03:47 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E7=A4=BC=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jieling/logic/store/BuyGoodsNewLogic.java | 35 +++++++++++++------ .../jieling/logic/store/GiftGoodsType.java | 1 + .../bean/ReceiveWelfareBag.java | 8 ----- 3 files changed, 26 insertions(+), 18 deletions(-) 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 428b9f0a0..dc19c83e7 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 @@ -35,10 +35,7 @@ import com.ljsd.jieling.logic.store.newRechargeInfo.bean.*; import com.ljsd.jieling.network.server.ProtocolsManager; import com.ljsd.jieling.network.session.ISession; import com.ljsd.jieling.thrift.idl.Result; -import com.ljsd.jieling.util.AynMissionWorker; -import com.ljsd.jieling.util.AyyncWorker; -import com.ljsd.jieling.util.ItemUtil; -import com.ljsd.jieling.util.MessageUtil; +import com.ljsd.jieling.util.*; import config.*; import manager.STableManager; import org.slf4j.Logger; @@ -51,10 +48,7 @@ import util.StringUtil; import util.TimeUtils; import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import java.util.Map; +import java.util.*; /** * 新礼包逻辑 @@ -254,7 +248,7 @@ public class BuyGoodsNewLogic { public static void sendGiftGooodsIndication(int uid) throws Exception { List goodsBagInfo = new ArrayList<>(SRechargeCommodityConfig.rechargeCommodityConfigMap.size()); - boolean change = BuyGoodsLogic.getGoodsBagInfo(uid, goodsBagInfo,false); + boolean change = BuyGoodsNewLogic.getGoodsBagInfo(uid, goodsBagInfo); ISession session = OnlineUserManager.getSessionByUid(uid); if(session!=null && change){ PlayerInfoProto.AllGiftGoodsIndication build = PlayerInfoProto.AllGiftGoodsIndication.newBuilder().addAllGiftGoodsInfo(goodsBagInfo).build(); @@ -314,7 +308,7 @@ public class BuyGoodsNewLogic { } /** - * 处理各类型发货 + * 处理特殊类型发货 */ public static void sendGoodsByType(User user,SRechargeCommodityNewConfig config,String rewardStr) throws Exception{ ISession session = OnlineUserManager.getSessionByUid(user.getId()); @@ -557,4 +551,25 @@ public class BuyGoodsNewLogic { builder.setDynamicBuyTimes(bag.getLimit() - bag.getBuyTimes()); return builder.build(); } + + 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){ + User user = UserManager.getUser(value.getUid(), true); + if(user == null){ + continue; + } + AyyncWorker ayyncWorker = new AyyncWorker(user, false,new AyncWorkerRunnable(){ + @Override + public void work(User user) throws Exception { + sendGiftGooodsIndication(user.getId()); + } + }) ; + ProtocolsManager.getInstance().updateAyncWorker(ayyncWorker); + } + } + } } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/store/GiftGoodsType.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/store/GiftGoodsType.java index 8dbe0b9bf..9538e7139 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/store/GiftGoodsType.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/store/GiftGoodsType.java @@ -10,6 +10,7 @@ public interface GiftGoodsType { int WEEKCARD = 7; //周卡 int FOUND_ONE = 8; //豪华基金 int FOUND_TWO = 9; //豪华基金 + int RED_PACKET = 10;//红包 int SUN_LONG = 11; //豪华基金 int SKY_TREASURE = 12; //天宫秘宝 diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/store/newRechargeInfo/bean/ReceiveWelfareBag.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/store/newRechargeInfo/bean/ReceiveWelfareBag.java index d9aa299e7..8ba07091c 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/store/newRechargeInfo/bean/ReceiveWelfareBag.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/store/newRechargeInfo/bean/ReceiveWelfareBag.java @@ -50,13 +50,5 @@ public class ReceiveWelfareBag extends AbstractWelfareBag { } private boolean bought ; - private int buyTimes; - public int getBuyTimes() { - return buyTimes; - } - - public void setBuyTimes(int buyTimes) { - this.buyTimes = buyTimes; - } }