From 1e4e20573dfc917e7b43068da35ee532a192aacd Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 03 一月 2020 15:09:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserInfoController.java |   48 +++++++++++++++++-------------------------------
 1 files changed, 17 insertions(+), 31 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserInfoController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserInfoController.java
index 59b5b4e..a9e7a3d 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserInfoController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserInfoController.java
@@ -110,6 +110,7 @@
 import com.yeshi.fanli.service.inter.user.vip.UserVIPInfoService;
 import com.yeshi.fanli.util.AESUtil;
 import com.yeshi.fanli.util.Constant;
+import com.yeshi.fanli.util.FilePathEnum;
 import com.yeshi.fanli.util.GsonUtil;
 import com.yeshi.fanli.util.HongBaoUtil;
 import com.yeshi.fanli.util.RedisManager;
@@ -359,7 +360,7 @@
 				form.setPortrait(weiXinUser.getHeadimgurl());
 				String wxHeadImg = COSManager.getInstance()
 						.uploadFile(HttpUtil.getAsInputStream(weiXinUser.getHeadimgurl()),
-								Constant.WXHEADURL + UUID.randomUUID().toString())
+								FilePathEnum.userPortrait.getPath() + UUID.randomUUID().toString())
 						.getUrl();
 				form.setWxPic(wxHeadImg);
 				form.setNickName(weiXinUser.getNickname());
@@ -697,7 +698,7 @@
 			find.setWxUnionId(weiXinUser.getUnionid());
 			String wxHeadImg = COSManager.getInstance()
 					.uploadFile(HttpUtil.getAsInputStream(weiXinUser.getHeadimgurl()),
-							Constant.WXHEADURL + UUID.randomUUID().toString())
+							FilePathEnum.userPortrait.getPath() + UUID.randomUUID().toString())
 					.getUrl();
 			find.setWxPic(wxHeadImg);
 		} else { // 缁戝畾娣樺疂
@@ -2127,7 +2128,7 @@
 			}
 			data.put("moduleState", mySettings);
 
-			int tailor = 0;
+			boolean tailor = false;
 			int welfareCenterNews = 0;
 			String invitCode = null;
 			UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(uid);
@@ -2137,10 +2138,9 @@
 				}
 				// vip閭�璇风爜浼樺厛
 				if (!StringUtil.isNullOrEmpty(userInfoExtra.getInviteCodeVip())) {
-					tailor = 1;
 					invitCode = userInfoExtra.getInviteCodeVip();
 				} else if (!StringUtil.isNullOrEmpty(userInfoExtra.getInviteCode())) {
-					tailor = 2;
+					tailor = true;
 					invitCode = userInfoExtra.getInviteCode();
 				}
 				
@@ -2163,15 +2163,22 @@
 						userInfo.setWeiXin(userInfoExtra.getWeiXin());
 				}
 				
-				data.put("erCode", userInfoExtra.getErCode());
+				// 浜岀淮鐮�
+				userInfo.setErCode(userInfoExtra.getErCode());
 			}
+			// 鏄剧ず閭�璇风爜鐗瑰埗鍏ュ彛
+			data.put("tailor", tailor);
+			
 			// 1.6.5 涔嬪悗杩斿洖 寰俊鍙锋彁绀�
 			if (VersionUtil.greaterThan_1_6_5(acceptData.getPlatform(), acceptData.getVersion()))
-				userInfo.setWeiXinTip("娣诲姞寰俊鍙峰悗锛屼綘鐨勯個璇蜂汉鍜屼竴绾ч槦鍛樺彲浠ラ�氳繃寰俊涓庝綘寤虹珛鑱旂郴銆�");
+				userInfo.setWeiXinTip("娣诲姞寰俊鍙峰悗锛屼綘鐨勯個璇蜂汉鍜岀洿鎺ョ矇涓濆彲浠ラ�氳繃寰俊涓庝綘寤虹珛鑱旂郴銆�");
 
 			// 鏌ヨ鏄惁涓篤IP
-			if (VersionUtil.greaterThan_2_1(acceptData.getPlatform(), acceptData.getVersion())) {
+			if (VersionUtil.greaterThan_2_0_5(acceptData.getPlatform(), acceptData.getVersion())) {
 				userInfo.setVip(userVIPInfoService.isVIP(uid));
+				
+				boolean verifyForbid = redPackForbidService.verifyForbid(uid);
+				data.put("redPackLock", verifyForbid);
 			}
 
 			data.put("user", JsonUtil.getConvertBigDecimalToStringBuilder(gsonBuilder).create().toJson(userInfo));
@@ -2190,13 +2197,7 @@
 					bindPhone = bindRemindService.bindRemind(uid, BindRemind.TYPE_PHONE);
 				data.put("bindPhone", bindPhone);
 			}
-
-			// 2.0.2 鐗堟湰
-			if (VersionUtil.greaterThan_2_1(acceptData.getPlatform(), acceptData.getVersion())) {
-				boolean verifyForbid = redPackForbidService.verifyForbid(uid);
-				data.put("redPackLock", verifyForbid);
-			}
-
+			
 			if  (!StringUtil.isNullOrEmpty(invitCode)) {
 				// 2.0.6 杩斿洖閭�璇蜂汉
 				if (VersionUtil.greaterThan_2_0_6(acceptData.getPlatform(), acceptData.getVersion())) {
@@ -2206,15 +2207,6 @@
 						bossName = threeSale.getBoss().getNickName();
 					}
 					data.put("bossName", bossName);
-					
-					if(tailor == 2) {
-						long firstTeam = threeSaleSerivce.countFirstTeam(uid, 1);
-						if (firstTeam >= 2) {
-							data.put("tailor", true);
-						}
-					} else {
-						data.put("tailor", false);
-					}
 				}
 			}
 			
@@ -2331,7 +2323,7 @@
 	 */
 	@RequestMapping(value = "saveInfo")
 	public void saveInfo(AcceptData acceptData, String nickName, String weiXin, Integer sex, Long uid,
-			String inviteCode, MultipartFile qrCodeFile, PrintWriter out) {
+			String inviteCode, MultipartFile qrCodeFile, HttpServletRequest request, PrintWriter out) {
 		try {
 			if (uid == null) {
 				out.print(JsonUtil.loadFalseResult("鐢ㄦ埛鏈櫥褰�"));
@@ -2388,12 +2380,6 @@
 			if (!StringUtil.isNullOrEmpty(inviteCode)) {// 閭�璇风爜涓嶄负绌�
 				inviteCode = inviteCode.trim();
 				if (inviteCode.length() >= 4 && inviteCode.length() <= 12) {
-
-					if (!userVIPInfoService.isVIP(uid)) {
-						out.print(JsonUtil.loadFalseResult(20, "鍙湁瓒呯骇浼氬憳鎵嶈兘淇敼"));
-						return;
-					}
-
 					try {
 						userInfoExtraService.updateInviteCodeVip(inviteCode, uid);
 						out.print(JsonUtil.loadTrueResult("淇濆瓨鎴愬姛"));

--
Gitblit v1.8.0