Merge branch 'master_online_hw' of http://60.1.1.230/backend/jieling_server into master_online_hw

back_recharge
zhangshanxue 2020-10-21 16:24:16 +08:00
commit 1e6dedddf4
2 changed files with 9 additions and 2 deletions

View File

@ -251,7 +251,14 @@ public class DeathPathLogic {
* @param messageType
*/
public void getStatus(ISession session, MessageTypeProto.MessageType messageType) throws Exception {
GuildMyInfo info = UserManager.getUser(session.getUid()).getGuildMyInfo();
int uid = session.getUid();
String key = RedisKey.getKey(RedisKey.DEATH_PATH_CHALLENGE_COUNT, String.valueOf(uid), false);
AbstractRank personRank = RankContext.getRankEnum(RankEnum.DEATH_PATH_TOTAL_PERSON_RANK.getType());
double scoreById = personRank.getScoreById(uid, "");
if(RedisUtil.getInstence().get(key)!=null&&scoreById==-1){
RedisUtil.getInstence().del(key);
}
GuildMyInfo info = UserManager.getUser(uid).getGuildMyInfo();
int joinType =0;
if(info.getJoinTime()<startTime||info.getJoinTime()>overTime) {
joinType = 1;

View File

@ -788,7 +788,7 @@ public class BuyGoodsLogic {
}
}
} else if (time == 6) {
if (rechargeInfo.getDyGoodsCanBuyTimes().containsKey(sRechargeCommodityConfig.getId())) {
if (rechargeInfo.getDyGoodsCanBuyTimes().containsKey(sRechargeCommodityConfig.getId())&&rechargeInfo.getRefreshBagMap().containsKey(sRechargeCommodityConfig.getId())) {
endTime = rechargeInfo.getRefreshBagMap().get(sRechargeCommodityConfig.getId());
if (now > endTime || rechargeInfo.getDyGoodsCanBuyTimes().get(sRechargeCommodityConfig.getId()) <= 0) {
return new RechargeResult();