From 46a33cb062800fe051a75dd025a57d70994217d5 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 12 十一月 2019 17:18:20 +0800
Subject: [PATCH] 版本区分
---
fanli/src/main/java/com/yeshi/fanli/service/impl/redpack/RedPackWinInviteServiceImpl.java | 36 ++++++++++++++++++++++++++++++++++--
1 files changed, 34 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 88d155e..2050e41 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
@@ -12,8 +12,10 @@
import com.google.gson.Gson;
import com.yeshi.fanli.dao.mybatis.redpack.RedPackWinInviteMapper;
+import com.yeshi.fanli.dto.mq.user.body.UserAccountBindingMQMsg;
import com.yeshi.fanli.dto.msg.MsgRedPackAddContentDTO;
import com.yeshi.fanli.entity.bus.msg.MsgMoneyDetail.MsgTypeMoneyTypeEnum;
+import com.yeshi.fanli.entity.bus.user.UserActiveLog;
import com.yeshi.fanli.entity.bus.user.UserExtraTaoBaoInfo;
import com.yeshi.fanli.entity.bus.user.UserInfo;
import com.yeshi.fanli.entity.order.CommonOrder;
@@ -24,6 +26,7 @@
import com.yeshi.fanli.service.inter.redpack.RedPackBalanceService;
import com.yeshi.fanli.service.inter.redpack.RedPackConfigService;
import com.yeshi.fanli.service.inter.redpack.RedPackWinInviteService;
+import com.yeshi.fanli.service.inter.user.UserActiveLogService;
import com.yeshi.fanli.service.inter.user.UserInfoService;
import com.yeshi.fanli.service.inter.user.integral.IntegralTaskRecordService;
import com.yeshi.fanli.service.inter.user.invite.ThreeSaleSerivce;
@@ -31,6 +34,7 @@
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.MoneyBigDecimalUtil;
import com.yeshi.fanli.util.StringUtil;
+import com.yeshi.fanli.util.VersionUtil;
import com.yeshi.fanli.util.annotation.RequestSerializableByKeyService;
import com.yeshi.fanli.util.annotation.redpack.RedPackGetVersionLimit;
import com.yeshi.fanli.util.factory.RedPackDetailFactory;
@@ -66,6 +70,9 @@
@Resource
private IntegralTaskRecordService integralTaskRecordService;
+ @Resource
+ private UserActiveLogService userActiveLogService;
+
@Override
public List<RedPackWinInvite> getRewardList(int start, int count, Long uid) {
@@ -78,6 +85,12 @@
return redPackWinInviteMapper.countRewardRecord(uid);
}
+ @Override
+ public BigDecimal getRewardMoney(Long uid) {
+ return redPackWinInviteMapper.getRewardMoney(uid);
+ }
+
+
@RedPackGetVersionLimit(uid = "#uid")
@RequestSerializableByKeyService(key = "#uid")
@Transactional(rollbackFor = Exception.class)
@@ -89,6 +102,15 @@
// 涓婁竴绾х殑濂栧姳
UserInfo boss = threeSaleSerivce.getBoss(uid);
if(boss != null) {
+ UserActiveLog activeLog = userActiveLogService.getUserLatestActiveInfo(boss.getId());
+ if (activeLog != null) {
+ // 灏忎簬2.0.2鐗堟湰涓嶅鍔犵Н鍒�
+ if (!VersionUtil.greaterThan_2_0_2("appstore".equalsIgnoreCase(activeLog.getChannel()) ? "ios" : "android",
+ activeLog.getVersionCode()))
+ return;
+ }
+
+
bossReward(boss.getId(), uid, source, orderNo);
}
}
@@ -223,15 +245,25 @@
}
- @RequestSerializableByKeyService(key = "#uid")
@Override
- @Transactional
+ @RedPackGetVersionLimit(uid = "#uid")
+ @RequestSerializableByKeyService(key = "#uid")
+ @Transactional(rollbackFor = Exception.class)
public void inviteSucceedReward(Long uid) throws Exception{
// 楠岃瘉鏄惁瀛樺湪涓婄骇
UserInfo boss = threeSaleSerivce.getBoss(uid);
if(boss == null)
return;
+ UserActiveLog activeLog = userActiveLogService.getUserLatestActiveInfo(boss.getId());
+ if (activeLog != null) {
+ // 灏忎簬2.0.2鐗堟湰涓嶅鍔犵Н鍒�
+ if (!VersionUtil.greaterThan_2_0_2("appstore".equalsIgnoreCase(activeLog.getChannel()) ? "ios" : "android",
+ activeLog.getVersionCode()))
+ return;
+ }
+
+
// 鍚屼竴闃熷憳濂栧姳涓�娆�
long totalReward = redPackWinInviteMapper.countByUidAndTeamUidAndType(boss.getId(), uid, RedPackWinInviteTypeEnum.inviteSucceed.name());
if (totalReward > 0)
--
Gitblit v1.8.0