网页支付礼包限制
parent
f24b25419a
commit
02f957f54e
|
@ -26,6 +26,7 @@ import com.ljsd.jieling.logic.activity.event.*;
|
||||||
import com.ljsd.jieling.logic.dao.RechargeInfo;
|
import com.ljsd.jieling.logic.dao.RechargeInfo;
|
||||||
import com.ljsd.jieling.logic.dao.UserManager;
|
import com.ljsd.jieling.logic.dao.UserManager;
|
||||||
import com.ljsd.jieling.logic.dao.VipInfo;
|
import com.ljsd.jieling.logic.dao.VipInfo;
|
||||||
|
import com.ljsd.jieling.logic.dao.WorldTreasureReward;
|
||||||
import com.ljsd.jieling.logic.dao.root.User;
|
import com.ljsd.jieling.logic.dao.root.User;
|
||||||
import com.ljsd.jieling.logic.expedition.ExpeditionLogic;
|
import com.ljsd.jieling.logic.expedition.ExpeditionLogic;
|
||||||
import com.ljsd.jieling.logic.fight.CombatLogic;
|
import com.ljsd.jieling.logic.fight.CombatLogic;
|
||||||
|
@ -844,6 +845,13 @@ public class BuyGoodsLogic {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
if(sRechargeCommodityConfig.getType()==GiftGoodsType.SKY_TREASURE){
|
||||||
|
WorldTreasureReward worldTreasureReward = user.getExpeditionManager().getWorldTreasureReward();
|
||||||
|
if(worldTreasureReward==null||worldTreasureReward.getIsBuy()==1||worldTreasureReward.getFirstStartTime()>(int)(TimeUtils.now()/1000)){
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if(SGlobalActivity.sRechargeId2ActivityId.containsKey(goodsId)){
|
if(SGlobalActivity.sRechargeId2ActivityId.containsKey(goodsId)){
|
||||||
Integer integer = SGlobalActivity.sRechargeId2ActivityId.get(goodsId);
|
Integer integer = SGlobalActivity.sRechargeId2ActivityId.get(goodsId);
|
||||||
Set<Integer> ids =getOpenActivity(user,6);
|
Set<Integer> ids =getOpenActivity(user,6);
|
||||||
|
@ -897,12 +905,16 @@ public class BuyGoodsLogic {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
long startTime=0;
|
long startTime=0;
|
||||||
long endTime=0;
|
long endTime=0;
|
||||||
int dybuytime = 0;
|
int dybuytime = 0;
|
||||||
RechargeResult rechargeResult = getStartTime( user ,rechargeInfo, sRechargeCommodityConfig);
|
RechargeResult rechargeResult = getStartTime( user ,rechargeInfo, sRechargeCommodityConfig);
|
||||||
if(!rechargeResult.isTag()){
|
if(sRechargeCommodityConfig.getType() == 4){
|
||||||
|
dybuytime = rechargeInfo.getDyGoodsCanBuyTimes().getOrDefault(goodsId,-1);
|
||||||
|
if(0==dybuytime||-1==dybuytime){
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
} else if(!rechargeResult.isTag()){
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
startTime = rechargeResult.getStartTime();
|
startTime = rechargeResult.getStartTime();
|
||||||
|
|
Loading…
Reference in New Issue