From 6fb64247b9f4a74c386c06251fb678dfa9f48ada Mon Sep 17 00:00:00 2001 From: yujian <yujian@163.com> Date: 星期六, 28 十二月 2019 10:31:18 +0800 Subject: [PATCH] 版本修改 --- fanli/src/main/java/com/yeshi/fanli/service/impl/redpack/RedPackWinInviteServiceImpl.java | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/redpack/RedPackWinInviteServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/redpack/RedPackWinInviteServiceImpl.java index 753373e..f3cfc08 100644 --- a/fanli/src/main/java/com/yeshi/fanli/service/impl/redpack/RedPackWinInviteServiceImpl.java +++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/redpack/RedPackWinInviteServiceImpl.java @@ -103,13 +103,13 @@ return; // 灏忎簬2.0.5鐗堟湰涓嶅鍔� - if (!VersionUtil.greaterThan_2_1("appstore".equalsIgnoreCase(activeLog.getChannel()) ? "ios" : "android", + if (!VersionUtil.greaterThan_2_0_5("appstore".equalsIgnoreCase(activeLog.getChannel()) ? "ios" : "android", activeLog.getVersionCode())) return; // 鍚屼竴闃熷憳鍙褰曚竴娆� int totalReward = redPackWinInviteMapper.countByUidAndTeamUidAndType(bossId, teamUid, - RedPackWinInviteTypeEnum.oneStageReward.name()); + RedPackWinInviteTypeEnum.zeroStageReward.name()); if (totalReward > 0) return; @@ -119,7 +119,7 @@ winInvite.setTeamUid(teamUid); winInvite.setMoney(new BigDecimal(0)); winInvite.setType(RedPackWinInviteTypeEnum.zeroStageReward); - winInvite.setIdentifyCode(StringUtil.Md5(RedPackWinInviteTypeEnum.oneStageReward.name() + ":" + teamUid)); + winInvite.setIdentifyCode(StringUtil.Md5(RedPackWinInviteTypeEnum.zeroStageReward.name() + ":" + teamUid)); winInvite.setCreateTime(new Date()); winInvite.setUpdateTime(new Date()); redPackWinInviteMapper.insertSelective(winInvite); @@ -142,7 +142,7 @@ return; // 灏忎簬2.0.2鐗堟湰涓嶅鍔� - if (!VersionUtil.greaterThan_2_1("appstore".equalsIgnoreCase(activeLog.getChannel()) ? "ios" : "android", + if (!VersionUtil.greaterThan_2_0_5("appstore".equalsIgnoreCase(activeLog.getChannel()) ? "ios" : "android", activeLog.getVersionCode())) return; @@ -196,7 +196,7 @@ dto.setNickName(userInfo.getNickName()); dto.setPortrait(userInfo.getPortrait()); userMoneyMsgNotificationService.teamRedPackRewardMsg(bossId, MsgTypeMoneyTypeEnum.redPackOneStageReward, money, - "闃熷憳锛堝ソ鍙嬶級瀹屾垚绗竴闃舵", new Gson().toJson(dto)); + "绮変笣锛堝ソ鍙嬶級瀹屾垚绗竴闃舵", new Gson().toJson(dto)); } @RequestSerializableByKeyService(key = "#uid") @@ -294,7 +294,7 @@ dto.setNickName(userInfo.getNickName()); dto.setPortrait(userInfo.getPortrait()); userMoneyMsgNotificationService.teamRedPackRewardMsg(bossId, MsgTypeMoneyTypeEnum.redPackTwoStageReward, money, - "闃熷憳锛堝ソ鍙嬶級瀹屾垚绗簩闃舵", new Gson().toJson(dto)); + "绮変笣锛堝ソ鍙嬶級瀹屾垚绗簩闃舵", new Gson().toJson(dto)); } /** @@ -363,7 +363,7 @@ dto.setNickName(userInfo.getNickName()); dto.setPortrait(userInfo.getPortrait()); userMoneyMsgNotificationService.teamRedPackRewardMsg(bossId, MsgTypeMoneyTypeEnum.redPackThreeStageReward, - money, "闃熷憳锛堝ソ鍙嬶級瀹屾垚绗笁闃舵杩炵画[绗�" + monthSpace + "涓湀]", new Gson().toJson(dto)); + money, "绮変笣锛堝ソ鍙嬶級瀹屾垚绗笁闃舵杩炵画[绗�" + monthSpace + "涓湀]", new Gson().toJson(dto)); } -- Gitblit v1.8.0