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/UserVIPPreInfoServiceImpl.java |   80 ++++++++++++++++++++++++++++++++++------
 1 files changed, 68 insertions(+), 12 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/vip/UserVIPPreInfoServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/vip/UserVIPPreInfoServiceImpl.java
index c77bb39..858730f 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/vip/UserVIPPreInfoServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/vip/UserVIPPreInfoServiceImpl.java
@@ -21,7 +21,9 @@
 import com.yeshi.fanli.service.inter.user.invite.ThreeSaleSerivce;
 import com.yeshi.fanli.service.inter.user.msg.MsgAccountDetailService;
 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;
 import com.yeshi.fanli.util.annotation.RequestSerializableByKeyService;
 
@@ -39,6 +41,10 @@
 
 	@Resource
 	private MsgAccountDetailService msgAccountDetailService;
+	
+	@Resource
+	private UserVipConfigService userVipConfigService;
+	
 
 	@Override
 	public void addUserVIPPreInfo(UserVIPPreInfo info) throws UserVIPPreInfoException {
@@ -161,15 +167,40 @@
 	private boolean oneProcess(Long uid, long countZiGou, long countShare, long firstTeam, long secondTeam) {
 		boolean process = false;
 		String msg = "";
-		if (countZiGou >= Constant.VIP_PROCESS_1_ZIGOU) {
+		
+		long limitZiGou = 0;
+		String zigou = userVipConfigService.getValueByKey("vip_pre_3_zigou_order_count");
+		if (!StringUtil.isNullOrEmpty(zigou)) {
+			limitZiGou = Long.parseLong(zigou);
+		}
+		
+		long limitShare = 0;
+		String share = userVipConfigService.getValueByKey("vip_pre_3_share_order_count");
+		if (!StringUtil.isNullOrEmpty(share)) {
+			limitShare = Long.parseLong(share);
+		}
+		
+		long limitFirst = 0;
+		String first = userVipConfigService.getValueByKey("vip_pre_3_first_level_team_count");
+		if (!StringUtil.isNullOrEmpty(first)) {
+			limitFirst = Long.parseLong(first);
+		}
+		
+		long limitSecond = 0;
+		String second = userVipConfigService.getValueByKey("vip_pre_3_second_level_team_count");
+		if (!StringUtil.isNullOrEmpty(second)) {
+			limitSecond = Long.parseLong(second);
+		}
+		
+		if (countZiGou >= limitZiGou) {
 			process = true;
-			msg = "鎭枩浣狅紒杩斿埄璁㈠崟杈惧埌 " + Constant.VIP_PROCESS_1_ZIGOU + "绗�";
-		} else if (countShare >= Constant.VIP_PROCESS_1_SHARE) {
+			msg = "鎭枩浣狅紒杩斿埄璁㈠崟杈惧埌 " + limitZiGou + "绗�";
+		} else if (countShare >= limitShare) {
 			process = true;
-			msg = "鎭枩浣狅紒鍒嗕韩璁㈠崟杈惧埌 " + Constant.VIP_PROCESS_1_SHARE + "绗�";
-		} else if (firstTeam >= Constant.VIP_PROCESS_1_TEAM && secondTeam >= Constant.VIP_PROCESS_1_TEAM_SECOND) {
+			msg = "鎭枩浣狅紒鍒嗕韩璁㈠崟杈惧埌 " + limitShare + "绗�";
+		} else if (firstTeam >= limitFirst && secondTeam >= limitSecond) {
 			process = true;
-			msg = "鐩存帴绮変笣杈惧埌" + Constant.VIP_PROCESS_1_TEAM + "浜猴紝闂存帴绮変笣杈惧埌 " + Constant.VIP_PROCESS_1_TEAM_SECOND + "浜�";
+			msg = "鐩存帴绮変笣杈惧埌" + limitFirst + "浜猴紝闂存帴绮変笣杈惧埌 " + limitSecond + "浜�";
 		}
 
 		if (process) {
@@ -205,15 +236,40 @@
 	private boolean twoProcess(Long uid, long countZiGou, long countShare, long firstTeam, long secondTeam) {
 		boolean process = false;
 		String msg = "";
-		if (countZiGou >= Constant.VIP_PROCESS_2_ZIGOU) {
+		
+		long limitZiGou = 0;
+		String zigou = userVipConfigService.getValueByKey("vip_pre_7_zigou_order_count");
+		if (!StringUtil.isNullOrEmpty(zigou)) {
+			limitZiGou = Long.parseLong(zigou);
+		}
+		
+		long limitShare = 0;
+		String share = userVipConfigService.getValueByKey("vip_pre_7_share_order_count");
+		if (!StringUtil.isNullOrEmpty(share)) {
+			limitShare = Long.parseLong(share);
+		}
+		
+		long limitFirst = 0;
+		String first = userVipConfigService.getValueByKey("vip_pre_7_first_level_team_count");
+		if (!StringUtil.isNullOrEmpty(first)) {
+			limitFirst = Long.parseLong(first);
+		}
+		
+		long limitSecond = 0;
+		String second = userVipConfigService.getValueByKey("vip_pre_7_second_level_team_count");
+		if (!StringUtil.isNullOrEmpty(second)) {
+			limitSecond = Long.parseLong(second);
+		}
+		
+		if (countZiGou >= limitZiGou) {
 			process = true;
-			msg = "鎭枩浣狅紒杩斿埄璁㈠崟杈惧埌 " + Constant.VIP_PROCESS_2_ZIGOU + "绗�";
-		} else if (countShare >= Constant.VIP_PROCESS_2_SHARE) {
+			msg = "鎭枩浣狅紒杩斿埄璁㈠崟杈惧埌 " + limitZiGou + "绗�";
+		} else if (countShare >= limitShare) {
 			process = true;
-			msg = "鎭枩浣狅紒鍒嗕韩璁㈠崟杈惧埌 " + Constant.VIP_PROCESS_2_SHARE + "绗�";
-		} else if (firstTeam >= Constant.VIP_PROCESS_2_TEAM && secondTeam >= Constant.VIP_PROCESS_2_TEAM_SECOND) {
+			msg = "鎭枩浣狅紒鍒嗕韩璁㈠崟杈惧埌 " + limitShare + "绗�";
+		} else if (firstTeam >= limitFirst && secondTeam >= limitSecond) {
 			process = true;
-			msg = "鐩存帴绮変笣杈惧埌" + Constant.VIP_PROCESS_2_TEAM + "浜猴紝闂存帴绮変笣杈惧埌 " + Constant.VIP_PROCESS_2_TEAM_SECOND + "浜�";
+			msg = "鐩存帴绮変笣杈惧埌" + limitFirst + "浜猴紝闂存帴绮変笣杈惧埌 " + limitSecond + "浜�";
 		}
 
 		if (process) {

--
Gitblit v1.8.0