From 8cb7ec4a35a38ae91d0eed17cde711e81d2b2bbf Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期二, 14 五月 2019 11:37:49 +0800
Subject: [PATCH] 合并
---
fanli/src/main/java/com/yeshi/fanli/controller/client/InviteGetMoneyController.java | 45 +++++++++++++++++++++++++++++++++++++++++----
1 files changed, 41 insertions(+), 4 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 44541e7..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;
@@ -35,6 +36,7 @@
import com.yeshi.fanli.tag.PageEntity;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.RedisManager;
+import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.account.UserUtil;
import net.sf.json.JSONArray;
@@ -94,7 +96,7 @@
data.put("everyDayTaskList", new JSONArray());
data.put("inviteGetMoneyList",
JSONArray.fromObject(JsonUtil.getSimpleGsonWithDate().toJson(inviteGetMoneyList)));
- if (uid.equals("0") || uid == null) {
+ if (StringUtil.isNullOrEmpty(uid) || uid.equalsIgnoreCase("0")) {
data.put("myTeam", "---");
data.put("moneyToday", "---");
data.put("moneyMonth", "---");
@@ -175,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")) {
@@ -183,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);
@@ -249,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()));
@@ -259,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