From c6b718c3cadf5e5fff4c2a47fd1247842439f8c7 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期三, 15 四月 2020 10:45:18 +0800
Subject: [PATCH] 团队消息

---
 fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserAccountControllerV2.java |  293 +++++++++++++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 235 insertions(+), 58 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserAccountControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserAccountControllerV2.java
index d4178a3..44184a9 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserAccountControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserAccountControllerV2.java
@@ -23,10 +23,14 @@
 import com.google.gson.JsonPrimitive;
 import com.google.gson.JsonSerializationContext;
 import com.google.gson.JsonSerializer;
+import com.yeshi.fanli.dto.user.UserInviteLevelEnum;
 import com.yeshi.fanli.entity.accept.AcceptData;
+import com.yeshi.fanli.entity.bus.user.HongBaoV2;
 import com.yeshi.fanli.entity.bus.user.SMSHistory;
+import com.yeshi.fanli.entity.bus.user.ThreeSale;
 import com.yeshi.fanli.entity.bus.user.UserInfo;
 import com.yeshi.fanli.entity.bus.user.UserInfoExtra;
+import com.yeshi.fanli.entity.bus.user.UserInviteValidNum;
 import com.yeshi.fanli.entity.bus.user.vip.UserVIPInfo;
 import com.yeshi.fanli.entity.money.UserMoneyDetail.UserMoneyDetailTypeEnum;
 import com.yeshi.fanli.entity.push.DeviceActive;
@@ -67,6 +71,8 @@
 import com.yeshi.fanli.service.inter.user.UserSystemCouponService;
 import com.yeshi.fanli.service.inter.user.integral.IntegralDetailService;
 import com.yeshi.fanli.service.inter.user.invite.ThreeSaleSerivce;
+import com.yeshi.fanli.service.inter.user.invite.UserInviteService;
+import com.yeshi.fanli.service.inter.user.invite.UserInviteValidNumService;
 import com.yeshi.fanli.service.inter.user.vip.UserVIPInfoService;
 import com.yeshi.fanli.service.inter.user.vip.UserVipConfigService;
 import com.yeshi.fanli.util.Constant;
@@ -193,6 +199,13 @@
 	@Resource
 	private UserMoneyDetailService userMoneyDetailService;
 
+	@Resource
+	private UserInviteService userInviteService;
+	
+	@Resource
+	private UserInviteValidNumService userInviteValidNumService;
+	
+	
 	/**
 	 * 鏂扮増鐧诲綍 V1.5.3
 	 * 
@@ -447,8 +460,27 @@
 		BigDecimal payMoney = new BigDecimal(userVipConfigService.getValueByKey("require_order_pay"));
 
 		vo.setFinishGoldCoin(Long.parseLong(integralDetailService.getCumulativeMoney(uid).setScale(0).toString()));
-		vo.setFinishTeam(hongBaoV2CountService.countValidOrderTeamUserByUid(uid,
-				TimeUtil.convertDateToTemp(Constant.VIP_ONLINE_TIME), payMoney));
+		
+//		vo.setFinishTeam(hongBaoV2CountService.countValidOrderTeamUserByUid(uid,
+//				, payMoney));
+		
+		int finishTeam = 0;
+		long vipBegin = TimeUtil.convertDateToTemp(Constant.VIP_ONLINE_TIME);
+		List<ThreeSale> listThreeSale = threeSaleSerivce.getValidWorkerIdsByTime(uid, vipBegin);
+		if (listThreeSale != null && listThreeSale.size() > 0) {
+			for (ThreeSale three: listThreeSale) {
+				UserInfo worker = three.getWorker();
+				if (worker == null || worker.getId() == null) {
+					continue;
+				}
+				// 1銆侀個璇峰叧绯绘垚鍔熷悗锛�2銆佸崟锛堝垎浜� + 鑷喘锛夊疄浠樻澶т簬1鍏�
+				long countValid = hongBaoV2CountService.countValidOrderByUidAndTime(worker.getId(), three.getSucceedTime(), payMoney);
+				if (countValid > 0) {
+					finishTeam ++;
+				}
+			}
+		}
+		vo.setFinishTeam(finishTeam);
 		vo.setFinishHongBao(banLiShopOrderService.countByUidAndState(uid, list));
 
 		// 鍖哄垎鑰佺敤鎴峰拰鏂扮敤鎴�
@@ -507,60 +539,7 @@
 			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(1, "鐢ㄦ埛鏈櫥褰�"));
 			return;
 		}
-
-		UserInfo userInfo = userInfoService.selectByPKey(uid);
-		if (userInfo == null) {
-			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(1, "璇ョ敤鎴蜂笉瀛樺湪"));
-			return;
-		}
-
-		// 鐪侀挶 -鑷喘浜х敓杩斿埄
-
-		List<Integer> list = new ArrayList<Integer>();
-		list.add(BanLiShopOrder.STATE_SUCCESS);
-		BigDecimal payMoney = new BigDecimal(userVipConfigService.getValueByKey("require_order_pay"));
-
-		BigDecimal finishGoldCoin = integralDetailService.getCumulativeMoney(uid);
-		long finishTeam = hongBaoV2CountService.countValidOrderTeamUserByUid(uid,
-				TimeUtil.convertDateToTemp(Constant.VIP_ONLINE_TIME), payMoney);
-		long finishHongBao = banLiShopOrderService.countByUidAndState(uid, list);
-		BigDecimal finishMoney = hongBaoV2CountService.getRewardMoneyBySelf(uid);
-
-		long limitTeam = 0;
-
-		// 鍖哄垎鑰佺敤鎴峰拰鏂扮敤鎴�
-		String limtDate = userVipConfigService.getValueByKey("vip_execute_time");
-		Date executeDate = null;
-		try {
-			SimpleDateFormat format = new SimpleDateFormat("yyyy-mm-dd");
-			executeDate = format.parse(limtDate);
-		} catch (ParseException e) {
-			e.printStackTrace();
-		}
-
-		UserInfoExtra extra = userInfoExtraService.getUserInfoExtra(uid);
-		if (extra != null
-				&& (extra.getFirstLoginTime() == null || extra.getFirstLoginTime().getTime() < executeDate.getTime())) {
-			limitTeam = (Long.parseLong(userVipConfigService.getValueByKey("require_invite_num_old_user")));
-		} else {
-			limitTeam = (Long.parseLong(userVipConfigService.getValueByKey("require_invite_num_new_user")));
-		}
-		long limitHongBao = (Long.parseLong(userVipConfigService.getValueByKey("require_shop_buy")));
-		BigDecimal limitMoney = (new BigDecimal(userVipConfigService.getValueByKey("require_fan_money")));
-		BigDecimal limitgoldCoin = (new BigDecimal(userVipConfigService.getValueByKey("require_gold_coin")));
-
-		if (finishGoldCoin.compareTo(limitgoldCoin) >= 0 && finishTeam >= limitTeam && finishHongBao >= limitHongBao
-				&& finishMoney.compareTo(limitMoney) >= 0) {// 鏉′欢绗﹀悎
-			;
-		} else {
-			if (!StringUtil.isNullOrEmpty(callback)) {
-				out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadFalseResult("鏈揪鍒板紑閫氭潯浠�")));
-			} else {
-				out.print(JsonUtil.loadFalseResult("鏈揪鍒板紑閫氭潯浠�"));
-			}
-			return;
-		}
-		// 寮�閫�
+		
 		try {
 			userVIPInfoService.applyVIP(uid);
 		} catch (UserVIPInfoException e) {
@@ -573,9 +552,207 @@
 		}
 
 		if (!StringUtil.isNullOrEmpty(callback)) {
-			out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult("")));
+			out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult("鐢宠鎴愬姛锛屾鍦ㄥ彈鐞嗕腑")));
 		} else {
-			out.print(JsonUtil.loadTrueResult(""));
+			out.print(JsonUtil.loadTrueResult("鐢宠鎴愬姛锛屾鍦ㄥ彈鐞嗕腑"));
+		}
+	}
+
+	
+	
+	/**
+	 * 鑾峰彇vip淇℃伅
+	 * 
+	 * @param acceptData
+	 * @param uid
+	 * @param out
+	 */
+	@RequestMapping(value = "getVIPInfoV2")
+	public void getVIPInfoV2(String callback, AcceptData acceptData, Long uid, PrintWriter out) {
+		if (uid == null || uid <= 0) {
+			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(1, "鐢ㄦ埛鏈櫥褰�"));
+			return;
+		}
+
+		// 鐢ㄦ埛淇℃伅
+		UserInfo userInfo = userInfoService.selectByPKey(uid);
+		if (userInfo == null) {
+			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(1, "璇ョ敤鎴蜂笉瀛樺湪"));
+			return;
+		}
+		// 鑾峰彇绛夌骇
+		UserInviteLevelEnum level = userInviteService.getUserInviteLevelNew(uid);
+		
+		// 杈句汉
+		long limitZiGou = 0;
+		long limitShare = 0;
+		long limitFirst = 0;
+		long limitSecond = 0;
+		if (level == UserInviteLevelEnum.actived ||  level == UserInviteLevelEnum.noActive) {
+			String zigou = userVipConfigService.getValueByKey("vip_pre_3_zigou_order_count");
+			if (!StringUtil.isNullOrEmpty(zigou)) {
+				limitZiGou = Long.parseLong(zigou);
+			}
+			String share = userVipConfigService.getValueByKey("vip_pre_3_share_order_count");
+			if (!StringUtil.isNullOrEmpty(share)) {
+				limitShare = Long.parseLong(share);
+			}
+			String first = userVipConfigService.getValueByKey("vip_pre_3_first_level_team_count");
+			if (!StringUtil.isNullOrEmpty(first)) {
+				limitFirst = Long.parseLong(first);
+			}
+			String second = userVipConfigService.getValueByKey("vip_pre_3_second_level_team_count");
+			if (!StringUtil.isNullOrEmpty(second)) {
+				limitSecond = Long.parseLong(second);
+			}
+		} else if (level == UserInviteLevelEnum.vipPre1) {
+			String zigou = userVipConfigService.getValueByKey("vip_pre_7_zigou_order_count");
+			if (!StringUtil.isNullOrEmpty(zigou)) {
+				limitZiGou = Long.parseLong(zigou);
+			}
+			String share = userVipConfigService.getValueByKey("vip_pre_7_share_order_count");
+			if (!StringUtil.isNullOrEmpty(share)) {
+				limitShare = Long.parseLong(share);
+			}
+			String first = userVipConfigService.getValueByKey("vip_pre_7_first_level_team_count");
+			if (!StringUtil.isNullOrEmpty(first)) {
+				limitFirst = Long.parseLong(first);
+			}
+			String second = userVipConfigService.getValueByKey("vip_pre_7_second_level_team_count");
+			if (!StringUtil.isNullOrEmpty(second)) {
+				limitSecond = Long.parseLong(second);
+			}
+		} else if (level == UserInviteLevelEnum.vipPre2 || level == UserInviteLevelEnum.vipApply) {
+			String zigou = userVipConfigService.getValueByKey("vip_pre_10_zigou_order_count");
+			if (!StringUtil.isNullOrEmpty(zigou)) {
+				limitZiGou = Long.parseLong(zigou);
+			}
+			String share = userVipConfigService.getValueByKey("vip_pre_10_share_order_count");
+			if (!StringUtil.isNullOrEmpty(share)) {
+				limitShare = Long.parseLong(share);
+			}
+			String first = userVipConfigService.getValueByKey("vip_pre_10_first_level_team_count");
+			if (!StringUtil.isNullOrEmpty(first)) {
+				limitFirst = Long.parseLong(first);
+			}
+			String second = userVipConfigService.getValueByKey("vip_pre_10_second_level_team_count");
+			if (!StringUtil.isNullOrEmpty(second)) {
+				limitSecond = Long.parseLong(second);
+			}
+		} else if (level == UserInviteLevelEnum.vip || level == UserInviteLevelEnum.tearcherApply) {
+			// TODO 姣斾緥
+			
+		} else if (level == UserInviteLevelEnum.tearcher) {
+			// TODO
+		}
+		
+		// 鑷喘璁㈠崟
+		long doneZiGou = hongBaoV2CountService.counOrderByUidAndOrderType(uid, Constant.VIP_ORDER_PAY,
+				HongBaoV2.TYPE_ZIGOU);
+		// 鍒嗕韩璁㈠崟
+		long doneShare = hongBaoV2CountService.counOrderByUidAndOrderType(uid, Constant.VIP_ORDER_PAY,
+				HongBaoV2.TYPE_SHARE_GOODS);
+		
+		
+		Date now = new Date();
+		Date start = new Date(0);
+		
+		// 鏈夋晥绮変笣
+		int doneFirst = 0;
+		int doneSecond = 0;
+		UserInviteValidNum userInviteValidNum = userInviteValidNumService.selectByPrimaryKey(uid);
+		if (userInviteValidNum != null) {
+			doneFirst = userInviteValidNum.getNumFirst() == null ? 0 : userInviteValidNum.getNumFirst();
+			doneSecond = userInviteValidNum.getNumSecond() == null ? 0 : userInviteValidNum.getNumSecond();
+		}
+		
+		// 鐪侀挶锛� ---杩斿埄璁㈠崟銆佸鍔卞埜鎻愭垚
+		List<UserMoneyDetailTypeEnum> typeFanli = new ArrayList<>();
+		typeFanli.add(UserMoneyDetailTypeEnum.fanli);
+		typeFanli.add(UserMoneyDetailTypeEnum.orderReward);
+		BigDecimal saveMoney = userMoneyDetailService.statisticUserTypeMoneyWithDate(uid, typeFanli, start, now).abs();
+		
+		// 璧氶挶锛� 閭�璇疯鍗曘�佸垎浜鍗曘�佽ˉ璐�
+		List<UserMoneyDetailTypeEnum> typeList = new ArrayList<>();
+		typeList.add(UserMoneyDetailTypeEnum.share);
+		typeList.add(UserMoneyDetailTypeEnum.invite);
+		typeList.add(UserMoneyDetailTypeEnum.inviteAndShare);
+		typeList.add(UserMoneyDetailTypeEnum.systemEqualize);
+		typeList.add(UserMoneyDetailTypeEnum.subsidy);
+		BigDecimal earnMoney = userMoneyDetailService.statisticUserTypeMoneyWithDate(uid, typeList, start, now).abs();
+		if (level != UserInviteLevelEnum.vip) {
+			BigDecimal rate = new BigDecimal("0.409");
+			saveMoney = MoneyBigDecimalUtil.mul2(saveMoney, rate);
+			earnMoney = MoneyBigDecimalUtil.mul2(earnMoney, rate);
+		}
+		
+		String shareRate = "鍙韩浣ｉ噾鐨�<label style=\"color:#E5005C;\">%s</label>";
+		String fansRate = "鏈�楂樹剑閲戠殑<label style=\"color:#E5005C;\">%s</label>";
+		String fansIndirect = "鏈�楂樹剑閲戠殑<label style=\"color:#E5005C;\">%s</label>";
+		String teamBonus = "鍥㈤槦鍒嗙孩姹�<label style=\"color:#E5005C;\">%s</label>";
+		// 杈句汉鐗�
+		JSONObject jsonrRed1 = new JSONObject();
+		jsonrRed1.put("shareRate", String.format(shareRate, "152%"));
+		jsonrRed1.put("fansRate", String.format(fansRate, "22.5%"));
+		jsonrRed1.put("fansIndirect", String.format(fansIndirect, "5%"));
+		jsonrRed1.put("teamBonus", "楂樼骇浼氬憳浠ヤ笂涓撳睘");
+		
+		JSONObject jsonrRed2 = new JSONObject();
+		jsonrRed2.put("shareRate", String.format(shareRate, "162.5%"));
+		jsonrRed2.put("fansRate", String.format(fansRate, "27.5%"));
+		jsonrRed2.put("fansIndirect", String.format(fansIndirect, "7.5%"));
+		jsonrRed2.put("teamBonus", "楂樼骇浼氬憳浠ヤ笂涓撳睘");
+
+		JSONObject jsonrRed3 = new JSONObject();
+		jsonrRed3.put("shareRate", String.format(shareRate, "170%"));
+		jsonrRed3.put("fansRate", String.format(fansRate, "32.5%"));
+		jsonrRed3.put("fansIndirect", String.format(fansIndirect, "10%"));
+		jsonrRed3.put("teamBonus", String.format(teamBonus, "40%"));
+
+		JSONObject jsonrRed4 = new JSONObject();
+		jsonrRed4.put("shareRate", String.format(shareRate, "225%"));
+		jsonrRed4.put("fansRate", String.format(fansRate, "37.5%"));
+		jsonrRed4.put("fansIndirect", String.format(fansIndirect, "12.5%"));
+		jsonrRed4.put("teamBonus", String.format(teamBonus, "80%"));
+		
+		
+		JSONObject json = new JSONObject();
+		json.put("level", level.name());
+		json.put("nickName", userInfo.getNickName());
+		json.put("portrait", userInfo.getPortrait());
+		json.put("ruleLink", userVipConfigService.getValueByKey("help_link_vip_h5"));
+		json.put("saveMoney", saveMoney);
+		json.put("earnMoney", earnMoney);
+		
+		json.put("tearcherTip", "鎴戞槸浣犵殑瀵煎笀锛屼负浣犲湪鐪佽禋杩囩▼涓В闅剧瓟鐤戯紝瀵逛綘涓�瀵逛竴杈呭锛屽�惧惉浣犵殑闇�姹傛�荤粨骞跺弽棣堢粰鏉挎牀蹇渷瀹樻柟杩愯惀鍥㈤槦锛屽揩鏉ユ坊鍔犳垜鍚с��");
+		json.put("tearcherWX", userVipConfigService.getValueByKey("tearcher_weixin_num"));
+		json.put("newerGongLue", configService.get(ConfigKeyEnum.newerGonglue.getKey()));
+		
+		// 宸插畬鎴�
+		json.put("doneZiGou", doneZiGou);
+		json.put("doneShare", doneShare);
+		json.put("doneFirst", doneFirst);
+		json.put("doneSecond", doneSecond);
+		
+		// 鏍囧噯
+		json.put("limitZiGou", limitZiGou);
+		json.put("limitShare", limitShare);
+		json.put("limitFirst", limitFirst);
+		json.put("limitSecond", limitSecond);
+		
+		// 宸插畬鎴�
+		json.put("master", jsonrRed1);
+		json.put("vip1", jsonrRed2);
+		json.put("vip2", jsonrRed3);
+		json.put("vip3", jsonrRed4);
+		
+		// 浜哄伐瀹㈡湇閾炬帴
+		json.put("csdLink", configService.get(ConfigKeyEnum.customerServiceLink.getKey()));
+		
+		if (!StringUtil.isNullOrEmpty(callback)) {
+			out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult(json)));
+		} else {
+			out.print(JsonUtil.loadTrueResult(json));
 		}
 	}
 

--
Gitblit v1.8.0