From cf9f918e7af7481432cfc93eaac38bcb3d4cbfd8 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 11 九月 2019 15:23:10 +0800
Subject: [PATCH] 再返金额修改
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/InviteGetMoneyController.java | 30 ++++++++++++++----------------
1 files changed, 14 insertions(+), 16 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..c01a507 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,7 +23,6 @@
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;
@@ -38,6 +37,7 @@
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,20 +127,16 @@
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"));
@@ -248,6 +244,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 +254,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;
@@ -284,10 +281,11 @@
* 閭�璇峰槢
* @param out
*/
+ @RequestSerializableByKey(key ="'activationInviteWX-'+#uid")
@RequestMapping(value = "activationInviteWX")
public void activationInviteWX(AcceptData acceptData, Long uid, String code, PrintWriter out) {
try {
- userInfoExtraService.activationInviteWX(uid, code, acceptData.getPlatform(), acceptData.getVersion());
+ userInfoExtraService.activationInviteWX(uid, code);
out.print(JsonUtil.loadTrueResult("閭�璇风爜婵�娲绘垚鍔�"));
} catch (UserInfoExtraException e) {
out.print(JsonUtil.loadFalseResult(e.getMsg()));
--
Gitblit v1.8.0