From a364fbab598a45842d4b38d156e8b5e55f9513ad Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 23 十一月 2019 14:35:54 +0800
Subject: [PATCH] 红包封禁   + 后台管理

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/redpack/RedPackWinNewUserServiceImpl.java |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/redpack/RedPackWinNewUserServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/redpack/RedPackWinNewUserServiceImpl.java
index 165b86b..7e67fe3 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/redpack/RedPackWinNewUserServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/redpack/RedPackWinNewUserServiceImpl.java
@@ -12,13 +12,13 @@
 import com.yeshi.fanli.dao.mongodb.redpack.RedPackWinNewUserDao;
 import com.yeshi.fanli.entity.bus.user.UserInfoExtra;
 import com.yeshi.fanli.entity.push.DeviceActive;
-import com.yeshi.fanli.entity.redpack.RedPackBalance;
 import com.yeshi.fanli.entity.redpack.RedPackWinNewUser;
 import com.yeshi.fanli.log.LogHelper;
 import com.yeshi.fanli.service.inter.money.msg.UserMoneyMsgNotificationService;
 import com.yeshi.fanli.service.inter.push.DeviceActiveService;
 import com.yeshi.fanli.service.inter.redpack.RedPackBalanceService;
 import com.yeshi.fanli.service.inter.redpack.RedPackConfigService;
+import com.yeshi.fanli.service.inter.redpack.RedPackForbidService;
 import com.yeshi.fanli.service.inter.redpack.RedPackWinNewUserService;
 import com.yeshi.fanli.service.inter.user.UserInfoExtraService;
 import com.yeshi.fanli.util.Constant;
@@ -49,6 +49,9 @@
 	@Resource
 	private DeviceActiveService deviceActiveService;
 	
+	@Resource
+	private RedPackForbidService redPackForbidService;
+	
 	
 	@Override
 	public boolean verifyHasReward(Long uid, String device) {
@@ -70,10 +73,8 @@
 				return true; // 鏈秴杩囨椂闂�
 			}
 			
-			RedPackBalance redPackBalance = redPackBalanceService.selectByPrimaryKey(uid);
-			if (redPackBalance != null && redPackBalance.getState() != null 
-					&& redPackBalance.getState() == RedPackBalance.STATE_LOCKED) 
-				return false;  // 绾㈠寘灏佺
+			if(redPackForbidService.verifyForbid(uid))
+				return false; // 绾㈠寘灏佺
 			
 			UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(uid);
 			if (userInfoExtra == null || userInfoExtra.getFirstLoginTime() == null) 

--
Gitblit v1.8.0