Merge branch 'master' of 60.1.1.230:backend/jieling_server
commit
fa7534ce86
|
@ -247,8 +247,7 @@ public class BuyGoodsLogic {
|
||||||
MessageUtil.sendIndicationMessage(session,1, MessageTypeProto.MessageType.ALL_GIFTGOODS_INDICATION_VALUE,build,true);
|
MessageUtil.sendIndicationMessage(session,1, MessageTypeProto.MessageType.ALL_GIFTGOODS_INDICATION_VALUE,build,true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
//发送直购事件
|
|
||||||
Poster.getPoster().dispatchEvent(new BuyGoodsDirectEvent(uid,goodsId));
|
|
||||||
|
|
||||||
}else{
|
}else{
|
||||||
String title = SErrorCodeEerverConfig.getI18NMessage("recharge_" + sRechargeCommodityConfig.getType() + "_title");
|
String title = SErrorCodeEerverConfig.getI18NMessage("recharge_" + sRechargeCommodityConfig.getType() + "_title");
|
||||||
|
@ -256,6 +255,12 @@ public class BuyGoodsLogic {
|
||||||
if(type== 3 || type==1 || type==6){
|
if(type== 3 || type==1 || type==6){
|
||||||
content = SErrorCodeEerverConfig.getI18NMessage("recharge_" + sRechargeCommodityConfig.getType() + "_txt",new Object[]{rewardStr.split("#")[1]});
|
content = SErrorCodeEerverConfig.getI18NMessage("recharge_" + sRechargeCommodityConfig.getType() + "_txt",new Object[]{rewardStr.split("#")[1]});
|
||||||
}
|
}
|
||||||
|
if(type==10){
|
||||||
|
//红包事件
|
||||||
|
Poster.getPoster().dispatchEvent(new BuyGoodsDirectEvent(uid,goodsId));
|
||||||
|
title = SErrorCodeEerverConfig.getI18NMessage("recharge_" + sRechargeCommodityConfig.getType() + "_title",new Object[]{sRechargeCommodityConfig.getName()});
|
||||||
|
content = SErrorCodeEerverConfig.getI18NMessage("recharge_" + sRechargeCommodityConfig.getType() + "_txt",new Object[]{sRechargeCommodityConfig.getName()});
|
||||||
|
}
|
||||||
MailLogic.getInstance().sendMail(user.getId(),title,content,rewardStr,nowTime, Global.MAIL_EFFECTIVE_TIME);
|
MailLogic.getInstance().sendMail(user.getId(),title,content,rewardStr,nowTime, Global.MAIL_EFFECTIVE_TIME);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue