From 4f7ce4b7d2ad52f118c13e0f9f6fb2efd5b296ff Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期四, 31 十月 2019 16:10:45 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/InviteGetMoneyController.java | 28 +++++++++++++---------------
1 files changed, 13 insertions(+), 15 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 202116e..5cb24be 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
@@ -27,17 +27,17 @@
import com.yeshi.fanli.service.inter.config.ConfigService;
import com.yeshi.fanli.service.inter.config.SystemClientParamsService;
import com.yeshi.fanli.service.inter.homemodule.SwiperPictureService;
-import com.yeshi.fanli.service.inter.hongbao.ThreeSaleSerivce;
import com.yeshi.fanli.service.inter.user.SpreadUserImgService;
import com.yeshi.fanli.service.inter.user.UserInfoExtraService;
import com.yeshi.fanli.service.inter.user.UserInfoService;
import com.yeshi.fanli.service.inter.user.UserRankingsService;
+import com.yeshi.fanli.service.inter.user.invite.ThreeSaleSerivce;
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 com.yeshi.fanli.util.annotation.integral.IntegralGetFrequencyLimit;
+import com.yeshi.fanli.util.annotation.RequestSerializableByKey;
import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
@@ -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
*/
- @IntegralGetFrequencyLimit(key = "'activationInvite-'+#uid+'-'+#inviteCode", time = 30)
+ @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")
@RequestMapping(value = "activationInviteWX")
- @IntegralGetFrequencyLimit(key = "'activationInviteWX-'+#uid+'-'+#code", time = 30)
- 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