From 155913b57ad50126240bc3d5c1aef6ebfe12e3cf Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 12 九月 2019 16:43:15 +0800
Subject: [PATCH] 微信开放平台修改

---
 fanli/src/main/java/com/yeshi/fanli/controller/client/v1/InviteGetMoneyController.java |   24 +++++++++++-------------
 1 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/InviteGetMoneyController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/InviteGetMoneyController.java
index c01a507..19c2e9c 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/InviteGetMoneyController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/InviteGetMoneyController.java
@@ -137,7 +137,6 @@
 			data.put("topBanner", pictureJson);
 		}
 
-
 		data.put("desc", configService.get("invite_desc"));
 
 		boolean hasCode = false;
@@ -173,7 +172,7 @@
 	 * @throws IOException
 	 */
 	@RequestMapping(value = "/listInviteFriendImg", method = RequestMethod.POST)
-	public void listInviteFriendImg(AcceptData acceptData,  Long uid, PrintWriter out)
+	public void listInviteFriendImg(AcceptData acceptData, Long uid, PrintWriter out)
 			throws NotExistObjectException, IOException {
 		JSONObject data = new JSONObject();
 		if (uid != null && !uid.equals("0")) {
@@ -182,15 +181,15 @@
 		}
 
 		// 閭�璇烽摼鎺�
-		String shortLink = HttpUtil.getShortLink("http://" + Constant.wxGZConfig.getLoginHost() + "/" 
-				 + Constant.systemCommonConfig.getProjectName() + "/client/threeShareNew?uid=" + uid);
+		String shortLink = HttpUtil.getShortLink("http://" + Constant.wxGZConfig.getLoginHost() + "/"
+				+ Constant.systemCommonConfig.getProjectName() + "/client/threeShareNew?uid=" + uid);
 		data.put("inviteLink", shortLink);
-		
+
 		UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(uid);
 		if (userInfoExtra != null) {
 			data.put("inviteCode", userInfoExtra.getInviteCode());
 		}
-		
+
 		// 閭�璇疯鍒�
 		String key = "inviteRules"; // key鍊�
 		BusinessSystem system = new BusinessSystem();
@@ -203,7 +202,7 @@
 		String valueBr = valueN.replace("\n", "<br><br>");
 
 		data.put("helpLink", configService.get("invite_help_link"));
-		  
+
 		data.put("inviteRules", valueBr);
 		out.print(JsonUtil.loadTrue(0, JsonUtil.getSimpleGson().toJson(data), "鎴愬姛"));
 	}
@@ -244,7 +243,7 @@
 	 *            閭�璇峰槢
 	 * @param out
 	 */
-	@RequestSerializableByKey(key ="'activationInvite-'+#uid")
+	@RequestSerializableByKey(key = "'activationInvite-'+#uid")
 	@RequestMapping(value = "activationInvite")
 	public void activationInvite(AcceptData acceptData, String callback, Long uid, String inviteCode, PrintWriter out) {
 		try {
@@ -270,7 +269,6 @@
 		}
 	}
 
-	
 	/**
 	 * 婵�娲婚個璇�
 	 * 
@@ -281,11 +279,12 @@
 	 *            閭�璇峰槢
 	 * @param out
 	 */
-	@RequestSerializableByKey(key ="'activationInviteWX-'+#uid")
+	@RequestSerializableByKey(key = "'activationInviteWX-'+#uid")
 	@RequestMapping(value = "activationInviteWX")
-	public void activationInviteWX(AcceptData acceptData, Long uid, String  code, PrintWriter out) {
+	public void activationInviteWX(AcceptData acceptData, Long uid, String code, PrintWriter out) {
 		try {
-			userInfoExtraService.activationInviteWX(uid, code);
+			userInfoExtraService.activationInviteWX(
+					Constant.getWXAccount(acceptData.getPlatform(), acceptData.getVersion()), uid, code);
 			out.print(JsonUtil.loadTrueResult("閭�璇风爜婵�娲绘垚鍔�"));
 		} catch (UserInfoExtraException e) {
 			out.print(JsonUtil.loadFalseResult(e.getMsg()));
@@ -295,7 +294,6 @@
 		}
 	}
 
-	
 	/**
 	 * 鑾峰彇閭�璇风爜
 	 * 

--
Gitblit v1.8.0