From a980ade25b3dc1a7da482e37113f2935a2719c0b Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 05 十一月 2019 10:01:11 +0800
Subject: [PATCH] 红包表明修改
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/InviteGetMoneyController.java | 48 ++++++++++++++++++++++--------------------------
1 files changed, 22 insertions(+), 26 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 eb040be..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
@@ -23,21 +23,21 @@
import com.yeshi.fanli.entity.system.BusinessSystem;
import com.yeshi.fanli.entity.system.SystemClientParams;
import com.yeshi.fanli.exception.NotExistObjectException;
-import com.yeshi.fanli.exception.banner.SwiperPictureException;
import com.yeshi.fanli.exception.user.UserInfoExtraException;
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.RequestSerializableByKey;
import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
@@ -127,19 +127,14 @@
data.put("activityRules", valueBr);
data.put("inviteList", String.format("http://%s/%s/client/share/friends_new.html",
Constant.systemCommonConfig.getProjectHost(), Constant.systemCommonConfig.getProjectName()));
- try {
- List<SwiperPicture> pictureList = swiperPictureService.getByBannerCard("invite_top_banner");
- if (pictureList != null && pictureList.size() > 0) {
- SwiperPicture picture = pictureList.get(0);
- com.alibaba.fastjson.JSONObject pictureJson = new com.alibaba.fastjson.JSONObject();
- pictureJson.put("src", picture.getSrc());
- pictureJson.put("jumpDetail", picture.getJumpDetail());
- pictureJson.put("params", picture.getParams());
- data.put("topBanner", pictureJson);
- }
-
- } catch (SwiperPictureException e) {
- e.printStackTrace();
+ List<SwiperPicture> pictureList = swiperPictureService.getByBannerCard("invite_top_banner");
+ if (pictureList != null && pictureList.size() > 0) {
+ SwiperPicture picture = pictureList.get(0);
+ com.alibaba.fastjson.JSONObject pictureJson = new com.alibaba.fastjson.JSONObject();
+ pictureJson.put("src", picture.getSrc());
+ pictureJson.put("jumpDetail", picture.getJumpDetail());
+ pictureJson.put("params", picture.getParams());
+ data.put("topBanner", pictureJson);
}
data.put("desc", configService.get("invite_desc"));
@@ -177,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")) {
@@ -186,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();
@@ -207,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), "鎴愬姛"));
}
@@ -248,6 +243,7 @@
* 閭�璇峰槢
* @param out
*/
+ @RequestSerializableByKey(key = "'activationInvite-'+#uid")
@RequestMapping(value = "activationInvite")
public void activationInvite(AcceptData acceptData, String callback, Long uid, String inviteCode, PrintWriter out) {
try {
@@ -257,7 +253,7 @@
return;
}
- String newCode = userInfoExtraService.activateInviteCode(uid, inviteCode, acceptData.getPlatform(), acceptData.getVersion());
+ String newCode = userInfoExtraService.activateInviteCode(uid, inviteCode);
if (newCode == null || newCode.trim().length() == 0) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("婵�娲诲け璐�"));
return;
@@ -273,7 +269,6 @@
}
}
-
/**
* 婵�娲婚個璇�
*
@@ -284,10 +279,12 @@
* 閭�璇峰槢
* @param out
*/
+ @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, acceptData.getPlatform(), acceptData.getVersion());
+ userInfoExtraService.activationInviteWX(
+ Constant.getWXAccount(acceptData.getPlatform(), acceptData.getVersion()), uid, code);
out.print(JsonUtil.loadTrueResult("閭�璇风爜婵�娲绘垚鍔�"));
} catch (UserInfoExtraException e) {
out.print(JsonUtil.loadFalseResult(e.getMsg()));
@@ -297,7 +294,6 @@
}
}
-
/**
* 鑾峰彇閭�璇风爜
*
--
Gitblit v1.8.0