From c96375400afce5cd0be41e8af0eb7e8deb484994 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 20 十二月 2019 14:03:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/redpack/RedPackWinInviteServiceImpl.java |    4 ++--
 1 files changed, 2 insertions(+), 2 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 19f3906..6a22ce6 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
@@ -109,7 +109,7 @@
 		
 		// 鍚屼竴闃熷憳鍙褰曚竴娆�
 		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);

--
Gitblit v1.8.0