Merge branch 'master' of http://60.1.1.230/backend/jieling_server
commit
0039930f98
|
@ -312,7 +312,7 @@ public class BuyGoodsLogic {
|
||||||
String title = SErrorCodeEerverConfig.getI18NMessage("recharge_6_stars_title");
|
String title = SErrorCodeEerverConfig.getI18NMessage("recharge_6_stars_title");
|
||||||
String content = SErrorCodeEerverConfig.getI18NMessage("recharge_6_stars_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 || goodsType == GiftGoodsType.WEEKCARD){
|
}else if(goodsType == GiftGoodsType.MONTHCARD || goodsType == GiftGoodsType.WEEKCARD || goodsType == GiftGoodsType.FOUND_ONE || goodsType == GiftGoodsType.FOUND_TWO){
|
||||||
PlayerLogic.getInstance().sendDayilyMail(user,goodsType);
|
PlayerLogic.getInstance().sendDayilyMail(user,goodsType);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -474,6 +474,7 @@ public class CBean2Proto {
|
||||||
.addAllPath(user.getGuildMyInfo().getPath())
|
.addAllPath(user.getGuildMyInfo().getPath())
|
||||||
.setUid(user.getId())
|
.setUid(user.getId())
|
||||||
.setName(user.getPlayerInfoManager().getNickName())
|
.setName(user.getPlayerInfoManager().getNickName())
|
||||||
|
.setGender(user.getPlayerInfoManager().getSex())
|
||||||
.build();
|
.build();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue