From ddf5db7d31af51fcf697eac0cee7dd46ff73bcc1 Mon Sep 17 00:00:00 2001
From: admin <2780501319@qq.com>
Date: 星期二, 18 二月 2020 12:50:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/InviteGetMoneyController.java | 20 +++++++++++---------
1 files changed, 11 insertions(+), 9 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 79b809b..2e14866 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
@@ -7,6 +7,7 @@
import java.util.List;
import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -18,8 +19,8 @@
import com.yeshi.fanli.entity.bus.homemodule.SwiperPicture;
import com.yeshi.fanli.entity.bus.user.ThreeSale;
import com.yeshi.fanli.entity.bus.user.UserInfo;
-import com.yeshi.fanli.entity.bus.user.UserInfoExtra;
import com.yeshi.fanli.entity.system.BusinessSystem;
+import com.yeshi.fanli.entity.system.ConfigKeyEnum;
import com.yeshi.fanli.entity.system.SystemClientParams;
import com.yeshi.fanli.exception.NotExistObjectException;
import com.yeshi.fanli.exception.user.UserInfoExtraException;
@@ -126,7 +127,7 @@
data.put("activityRules", valueBr);
data.put("inviteList", String.format("http://%s/%s/client/share/friends_new.html",
Constant.systemCommonConfig.getProjectHost(), Constant.systemCommonConfig.getProjectName()));
- List<SwiperPicture> pictureList = swiperPictureService.getByBannerCard("invite_top_banner");
+ List<SwiperPicture> pictureList = swiperPictureService.getByBannerCardAndVersion("invite_top_banner",acceptData.getPlatform(), Integer.parseInt(acceptData.getVersion()));
if (pictureList != null && pictureList.size() > 0) {
SwiperPicture picture = pictureList.get(0);
com.alibaba.fastjson.JSONObject pictureJson = new com.alibaba.fastjson.JSONObject();
@@ -136,7 +137,7 @@
data.put("topBanner", pictureJson);
}
- data.put("desc", configService.get("invite_desc"));
+ data.put("desc", configService.get(ConfigKeyEnum.inviteDesc.getKey()));
boolean hasCode = false;
if (uid != null && uid.trim().length() > 0) {
@@ -148,7 +149,7 @@
// 閭�璇锋縺娲婚摼鎺�
if (!hasCode) {
- data.put("activationlink", configService.get("invite_activation_url"));
+ data.put("activationlink", configService.get(ConfigKeyEnum.inviteActivationUrl.getKey()));
}
data.put("hasCode", hasCode);
@@ -170,12 +171,13 @@
* @throws NotExistObjectException
* @throws IOException
*/
+ @RequestSerializableByKey(key = "'listInviteFriendImg-'+#uid")
@RequestMapping(value = "/listInviteFriendImg", method = RequestMethod.POST)
- public void listInviteFriendImg(AcceptData acceptData, Long uid, PrintWriter out)
+ public void listInviteFriendImg(AcceptData acceptData, Long uid, PrintWriter out, HttpServletRequest request)
throws NotExistObjectException, IOException {
JSONObject data = new JSONObject();
if (uid != null && !uid.equals("0")) {
- List<String> imgList = spreadUserImgService.getUserSpreadImg(uid);
+ List<String> imgList = spreadUserImgService.getUserSpreadImg(uid, request);
data.put("imgUrlList", JsonUtil.getSimpleGsonWithDate().toJson(imgList));
}
@@ -200,7 +202,7 @@
String valueN = values.getValue();
String valueBr = valueN.replace("\n", "<br><br>");
- data.put("helpLink", configService.get("invite_help_link"));
+ data.put("helpLink", configService.get(ConfigKeyEnum.inviteHelpLink.getKey()));
data.put("inviteRules", valueBr);
out.print(JsonUtil.loadTrue(0, JsonUtil.getSimpleGson().toJson(data), "鎴愬姛"));
@@ -215,7 +217,7 @@
@RequestMapping(value = "getActivationTip")
public void getActivationTip(AcceptData acceptData, String callback, PrintWriter out) {
try {
- String tip = configService.get("invite_activation_tip");
+ String tip = configService.get(ConfigKeyEnum.inviteActivationTip.getKey());
if (tip == null || tip.trim().length() == 0) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏆傛棤鎻愰啋"));
return;
@@ -314,7 +316,7 @@
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("閭�璇风爜涓嶅瓨鍦�"));
return;
}
- String tip = configService.get("invite_activation_success_tip");
+ String tip = configService.get(ConfigKeyEnum.inviteActivationSuccessTip.getKey());
JSONObject data = new JSONObject();
data.put("inviteCode", inviteCode);
--
Gitblit v1.8.0