From 63bf3eac0b63606348e40d994a54de1cd4b6d3b9 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 28 三月 2020 16:44:50 +0800
Subject: [PATCH] 数据统计 + 会员
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/vip/UserVIPInfoServiceImpl.java | 32 ++++++++++++++++++++++++++++----
1 files changed, 28 insertions(+), 4 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/vip/UserVIPInfoServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/vip/UserVIPInfoServiceImpl.java
index 7068387..b7f9e41 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/vip/UserVIPInfoServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/vip/UserVIPInfoServiceImpl.java
@@ -50,6 +50,7 @@
import com.yeshi.fanli.service.inter.user.vip.UserVIPPreInfoService;
import com.yeshi.fanli.service.inter.user.vip.UserVipConfigService;
import com.yeshi.fanli.util.Constant;
+import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.TimeUtil;
@Service
@@ -203,7 +204,7 @@
userInviteSeparateService.updateStateByWorkerIdAndBossId(uid, bossId, UserInviteSeparate.STATE_INVALID);
// 闄愬埗鏃堕棿
- int limitDays = Integer.parseInt(configService.get(ConfigKeyEnum.inviteSeparateLimitDays.getKey()));
+ int limitDays = Integer.parseInt(userVipConfigService.getValueByKey("invite_separate_limit_days"));
UserInviteSeparate inviteSeparate = new UserInviteSeparate();
inviteSeparate.setBossId(bossId);
inviteSeparate.setWorkerId(uid);
@@ -439,7 +440,7 @@
// 鑴辩閭�璇峰叧绯�
threeSaleSerivce.inviteSeparate(workerId, bossId);
- int limitDays = Integer.parseInt(configService.get(ConfigKeyEnum.inviteSeparateLimitDays.getKey()));
+ int limitDays = Integer.parseInt(userVipConfigService.getValueByKey("invite_separate_limit_days"));
// 娑堟伅
UserInfo userInfo = userInfoService.selectByPKey(workerId);
MsgOtherVIPDTO msgboss = new MsgOtherVIPDTO();
@@ -578,8 +579,31 @@
long firstTeam = threeSaleSerivce.countFirstTeam(uid, 1);
long secondTeam = threeSaleSerivce.countSecondTeam(uid, 1);
- if (countZiGou >= Constant.VIP_PROCESS_3_ZIGOU || countShare >= Constant.VIP_PROCESS_3_SHARE
- || (firstTeam >= Constant.VIP_PROCESS_3_TEAM && secondTeam >= Constant.VIP_PROCESS_3_TEAM_SECOND)) {
+ long limitZiGou = 0;
+ String zigou = userVipConfigService.getValueByKey("vip_pre_10_zigou_order_count");
+ if (!StringUtil.isNullOrEmpty(zigou)) {
+ limitZiGou = Long.parseLong(zigou);
+ }
+
+ long limitShare = 0;
+ String share = userVipConfigService.getValueByKey("vip_pre_10_share_order_count");
+ if (!StringUtil.isNullOrEmpty(share)) {
+ limitShare = Long.parseLong(share);
+ }
+
+ long limitFirst = 0;
+ String first = userVipConfigService.getValueByKey("vip_pre_10_first_level_team_count");
+ if (!StringUtil.isNullOrEmpty(first)) {
+ limitFirst = Long.parseLong(first);
+ }
+
+ long limitSecond = 0;
+ String second = userVipConfigService.getValueByKey("vip_pre_10_second_level_team_count");
+ if (!StringUtil.isNullOrEmpty(second)) {
+ limitSecond = Long.parseLong(second);
+ }
+
+ if (countZiGou >= limitZiGou || countShare >= limitShare || (firstTeam >= limitFirst && secondTeam >= limitSecond)) {
return true;
}
return false;
--
Gitblit v1.8.0