From a6f34b99ee20e528b766c8ed5a61bd9c5aa0e7ae Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 16 十一月 2019 18:10:33 +0800
Subject: [PATCH] 淘宝相似商品推荐接口优化，根据商品ID搜索商品基本信息优化
---
fanli/src/main/java/com/yeshi/fanli/service/impl/redpack/RedPackWinNewUserServiceImpl.java | 34 ++++++++++++++++++++++++++++++----
1 files changed, 30 insertions(+), 4 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 d397ed7..165b86b 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
@@ -11,15 +11,19 @@
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.RedPackWinNewUserService;
import com.yeshi.fanli.service.inter.user.UserInfoExtraService;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.MoneyBigDecimalUtil;
+import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.annotation.RequestSerializableByKeyService;
import com.yeshi.fanli.util.factory.RedPackDetailFactory;
import com.yeshi.fanli.vo.redpack.RedPackWinDetailVO;
@@ -42,12 +46,34 @@
@Resource
private UserMoneyMsgNotificationService userMoneyMsgNotificationService;
+ @Resource
+ private DeviceActiveService deviceActiveService;
+
@Override
- public boolean verifyHasReward(Long uid) {
+ public boolean verifyHasReward(Long uid, String device) {
try {
- if (uid == null || uid <= 0)
- return true; // 鏈櫥褰曞脊鍑�
+ if (StringUtil.isNullOrEmpty(device) && (uid == null || uid <= 0))
+ return false;
+
+ if (uid == null || uid <= 0) {
+ DeviceActive deviceActive = deviceActiveService.getFirstActiveInfo(device);
+ if (deviceActive == null)
+ return true; // 鏂拌澶囧脊鍑�
+
+ Date nowTime = new Date();
+ Date createTime = deviceActive.getCreateTime();
+ int days = DateUtil.daysBetween2(createTime, nowTime);
+ if (days >= Constant.RED_PACK_NEW_USER_DAYS) {
+ return false; // 宸茬粡瓒呭嚭璁剧疆澶╂暟
+ }
+ return true; // 鏈秴杩囨椂闂�
+ }
+
+ RedPackBalance redPackBalance = redPackBalanceService.selectByPrimaryKey(uid);
+ if (redPackBalance != null && redPackBalance.getState() != null
+ && redPackBalance.getState() == RedPackBalance.STATE_LOCKED)
+ return false; // 绾㈠寘灏佺
UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(uid);
if (userInfoExtra == null || userInfoExtra.getFirstLoginTime() == null)
@@ -56,7 +82,7 @@
Date nowTime = new Date();
Date firstLoginTime = userInfoExtra.getFirstLoginTime();
int days = DateUtil.daysBetween2(firstLoginTime, nowTime);
- if (days > Constant.RED_PACK_NEW_USER_DAYS)
+ if (days >= Constant.RED_PACK_NEW_USER_DAYS)
return false; // 宸茬粡瓒呭嚭璁剧疆澶╂暟
RedPackWinNewUser redPackWin = redPackWinNewUserDao.getByUid(uid);
--
Gitblit v1.8.0