wangyuan 2019-07-25 07:16:34 +08:00
parent cfbc1eb00e
commit f814586624
3 changed files with 23 additions and 19 deletions

View File

@ -21,4 +21,6 @@ public interface ActivityType {
int FirstRecharge =4; //首充 int FirstRecharge =4; //首充
int RechargeTotal =5; //累计充值 int RechargeTotal =5; //累计充值
int GrowthFund =6; //成长基金 int GrowthFund =6; //成长基金
int TREASURE =8; //孙龙的宝藏
} }

View File

@ -49,18 +49,15 @@ public class RechargeInfo extends MongoBase{
} }
public boolean checkOneGoodsIsOverTimeByPrivilege(int privilageId){ public boolean checkOneGoodsIsOverTimeByPrivilege(int privilageId){
if(privilageId == VipPrivilegeType.UNLOCK_STAR_EXTRA_REWARD){ for(Map.Entry<Integer,Integer> item: goodseDurationMap.entrySet()){
for(Map.Entry<Integer,Integer> item: goodseDurationMap.entrySet()){ SRechargeCommodityConfig sRechargeCommodityConfig = SRechargeCommodityConfig.rechargeCommodityConfigMap.get(item.getKey());
SRechargeCommodityConfig sRechargeCommodityConfig = SRechargeCommodityConfig.rechargeCommodityConfigMap.get(item.getKey()); int[] openPrivilege = sRechargeCommodityConfig.getOpenPrivilege();
if (sRechargeCommodityConfig.getType() == GiftGoodsType.LUXURYMONTHCARD && System.currentTimeMillis()/1000 <= item.getValue()){ for(int privilege : openPrivilege){
return true; if(privilege == privilageId){
} if(System.currentTimeMillis()/1000 <= item.getValue()){
} return true;
}else if(privilageId == VipPrivilegeType.UNLOCK_TRIAL_BOMB_REWARD){ }
for(Map.Entry<Integer,Integer> item: goodseDurationMap.entrySet()){ break;
SRechargeCommodityConfig sRechargeCommodityConfig = SRechargeCommodityConfig.rechargeCommodityConfigMap.get(item.getKey());
if (sRechargeCommodityConfig.getType() == GiftGoodsType.MONTHCARD && System.currentTimeMillis()/1000 <= item.getValue()){
return true;
} }
} }
} }

View File

@ -118,7 +118,7 @@ public class BuyGoodsLogic {
endTime += 30 * 24 * 3600; endTime += 30 * 24 * 3600;
rechargeInfo.updateGoodsTypeDuration(sRechargeCommodityConfig.getId(),endTime); rechargeInfo.updateGoodsTypeDuration(sRechargeCommodityConfig.getId(),endTime);
if(needSendMail){ if(needSendMail){
triggerEvent(user,type,nowTime); triggerEvent(user,sRechargeCommodityConfig,nowTime);
} }
} }
@ -191,9 +191,9 @@ public class BuyGoodsLogic {
/** /**
* *
* @param goodsType
*/ */
public static void triggerEvent(User user,int goodsType,int nowTime) throws Exception { public static void triggerEvent(User user,SRechargeCommodityConfig sRechargeCommodityConfig,int nowTime) throws Exception {
int goodsType = sRechargeCommodityConfig.getType();
if(goodsType == GiftGoodsType.LUXURYMONTHCARD){ if(goodsType == GiftGoodsType.LUXURYMONTHCARD){
PlayerLogic.getInstance().sendDayilyMail(user,goodsType); PlayerLogic.getInstance().sendDayilyMail(user,goodsType);
int starReward = user.getMapManager().getStarReward(); int starReward = user.getMapManager().getStarReward();
@ -207,14 +207,19 @@ public class BuyGoodsLogic {
rewardStr.append(StringUtil.parseArrayToString(extraReward)); rewardStr.append(StringUtil.parseArrayToString(extraReward));
starReward--; starReward--;
} }
user.getPlayerInfoManager().addVipInfo(VipPrivilegeType.UNLOCK_STAR_EXTRA_REWARD);
String title = SErrorCodeEerverConfig.getI18NMessage("recharge_6_star_title"); String title = SErrorCodeEerverConfig.getI18NMessage("recharge_6_stars_title");
String content = SErrorCodeEerverConfig.getI18NMessage("recharge_6_star_txt"); String content = SErrorCodeEerverConfig.getI18NMessage("recharge_6_stars_txt");
MailLogic.getInstance().sendMail(user.getId(),title,content,rewardStr.toString(),nowTime, Global.MAIL_EFFECTIVE_TIME); MailLogic.getInstance().sendMail(user.getId(),title,content,rewardStr.toString(),nowTime, Global.MAIL_EFFECTIVE_TIME);
}else if(goodsType == GiftGoodsType.MONTHCARD){ }else if(goodsType == GiftGoodsType.MONTHCARD){
user.getPlayerInfoManager().addVipInfo(VipPrivilegeType.UNLOCK_TRIAL_BOMB_REWARD);
PlayerLogic.getInstance().sendDayilyMail(user,goodsType); PlayerLogic.getInstance().sendDayilyMail(user,goodsType);
} }
int[] openPrivilege = sRechargeCommodityConfig.getOpenPrivilege();
if(openPrivilege!=null && openPrivilege.length>0){
for(int privilege:openPrivilege){
user.getPlayerInfoManager().addVipInfo(privilege);
}
}
} }
public static List<CommonProto.GiftGoodsInfo> getGoodsBagInfo(int uid) throws Exception { public static List<CommonProto.GiftGoodsInfo> getGoodsBagInfo(int uid) throws Exception {