From 4114e871bcb3dce771b6aed64a1027d0bbb95ca6 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 16 五月 2019 15:28:37 +0800
Subject: [PATCH] 增加动态用户

---
 fanli/src/main/java/com/yeshi/fanli/controller/client/InviteGetMoneyController.java |   42 +++++++++++++++++++++++++++++++++++++++---
 1 files changed, 39 insertions(+), 3 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/InviteGetMoneyController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/InviteGetMoneyController.java
index f09adde..387b5e0 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/InviteGetMoneyController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/InviteGetMoneyController.java
@@ -11,6 +11,7 @@
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
+import org.yeshi.utils.HttpUtil;
 import org.yeshi.utils.JsonUtil;
 
 import com.yeshi.fanli.dto.money.InviteGetMoney;
@@ -176,7 +177,7 @@
 	 * @throws IOException
 	 */
 	@RequestMapping(value = "/listInviteFriendImg", method = RequestMethod.POST)
-	public void listInviteFriendImg(AcceptData acceptData, PrintWriter out, Long uid)
+	public void listInviteFriendImg(AcceptData acceptData,  Long uid, PrintWriter out)
 			throws NotExistObjectException, IOException {
 		JSONObject data = new JSONObject();
 		if (uid != null && !uid.equals("0")) {
@@ -184,9 +185,19 @@
 			data.put("imgUrlList", JsonUtil.getSimpleGsonWithDate().toJson(imgList));
 		}
 
+		// 閭�璇烽摼鎺�
+		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鍊�
-		com.yeshi.fanli.entity.system.BusinessSystem system = new BusinessSystem();
+		BusinessSystem system = new BusinessSystem();
 		system.setCreatetime(java.lang.System.currentTimeMillis());
 		system.setPlatform(1);
 		system.setId(4L);
@@ -250,7 +261,7 @@
 				return;
 			}
 
-			JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("婵�娲绘垚鍔�"));
+			JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("閭�璇风爜婵�娲绘垚鍔�"));
 
 		} catch (UserInfoExtraException e) {
 			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getMsg()));
@@ -260,6 +271,31 @@
 		}
 	}
 
+	
+	/**
+	 * 婵�娲婚個璇�
+	 * 
+	 * @param callback
+	 * @param uid
+	 *            鐢ㄦ埛id
+	 * @param inviteCode
+	 *            閭�璇峰槢
+	 * @param out
+	 */
+	@RequestMapping(value = "activationInviteWX")
+	public void activationInviteWX(AcceptData acceptData, Long uid, String  code, PrintWriter out) {
+		try {
+			userInfoExtraService.activationInviteWX(uid, code);
+			out.print(JsonUtil.loadTrueResult("閭�璇风爜婵�娲绘垚鍔�"));
+		} catch (UserInfoExtraException e) {
+			out.print(JsonUtil.loadFalseResult(e.getMsg()));
+		} catch (Exception e) {
+			out.print(JsonUtil.loadFalseResult("閭�璇风爜婵�娲诲け璐�"));
+			e.printStackTrace();
+		}
+	}
+
+	
 	/**
 	 * 鑾峰彇閭�璇风爜
 	 * 

--
Gitblit v1.8.0