From 8c93d2e3b22ac543f8f94c2cf0eb982258fb708b Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 07 十二月 2019 15:33:00 +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 | 54 ++++++++++++++++++++++++------------------------------
1 files changed, 24 insertions(+), 30 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..8ffd2cf 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
@@ -11,7 +11,6 @@
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;
@@ -23,21 +22,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,26 +126,21 @@
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"));
boolean hasCode = false;
if (uid != null && uid.trim().length() > 0) {
- String inviteCode = userInfoExtraService.getUserInviteCode(Long.parseLong(uid));
+ String inviteCode = userInfoExtraService.getInviteCodeByUid(Long.parseLong(uid));
if (inviteCode != null && inviteCode.trim().length() > 0) {
hasCode = true; // 宸叉湁閭�璇风爜
}
@@ -177,7 +171,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 +180,15 @@
}
// 閭�璇烽摼鎺�
- String shortLink = HttpUtil.getShortLink("http://" + Constant.wxGZConfig.getLoginHost() + "/"
- + Constant.systemCommonConfig.getProjectName() + "/client/threeShareNew?uid=" + uid);
- data.put("inviteLink", shortLink);
-
+// String shortLink = HttpUtil.getShortLink("http://" + Constant.wxGZConfig.getLoginHost() + "/"
+// + Constant.systemCommonConfig.getProjectName() + "/client/threeShareNew?uid=" + uid);
+ data.put("inviteLink", "http://a.app.qq.com/o/simple.jsp?pkgname=com.yeshi.ec.rebate");
+
UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(uid);
if (userInfoExtra != null) {
data.put("inviteCode", userInfoExtra.getInviteCode());
}
-
+
// 閭�璇疯鍒�
String key = "inviteRules"; // key鍊�
BusinessSystem system = new BusinessSystem();
@@ -207,7 +201,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,16 +242,16 @@
* 閭�璇峰槢
* @param out
*/
+ @RequestSerializableByKey(key = "'activationInvite-'+#uid")
@RequestMapping(value = "activationInvite")
public void activationInvite(AcceptData acceptData, String callback, Long uid, String inviteCode, PrintWriter out) {
try {
-
if (uid == null || inviteCode == null) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("浼犻�掑弬鏁颁笉姝ｇ‘"));
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 +267,6 @@
}
}
-
/**
* 婵�娲婚個璇�
*
@@ -284,10 +277,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 +292,6 @@
}
}
-
/**
* 鑾峰彇閭�璇风爜
*
--
Gitblit v1.8.0