From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 五月 2020 17:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/InviteGetMoneyController.java | 90 +++++++++++++++++++++++++++------------------
1 files changed, 54 insertions(+), 36 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 c31a371..777c35a 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,11 +7,11 @@
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;
import org.springframework.web.bind.annotation.RequestMethod;
-import org.yeshi.utils.HttpUtil;
import org.yeshi.utils.JsonUtil;
import com.yeshi.fanli.dto.money.InviteGetMoney;
@@ -19,25 +19,27 @@
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;
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.VersionUtil;
import com.yeshi.fanli.util.account.UserUtil;
-import com.yeshi.fanli.util.annotation.integral.IntegralGetFrequencyLimit;
+import com.yeshi.fanli.util.annotation.RequestSerializableByKey;
+import com.yeshi.fanli.vo.homemodule.BannerVO;
import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
@@ -103,8 +105,8 @@
data.put("moneyLastMonth", "---");
} else {
// 鎴戠殑闃熷憳
- long myFirstTeamCount = threeSaleSerivce.getFirstUsersCount(Long.parseLong(uid));
- long mySecondTeamCount = threeSaleSerivce.getSecondUsersCount(Long.parseLong(uid));
+ long myFirstTeamCount = threeSaleSerivce.countFirstTeam(Long.parseLong(uid));
+ long mySecondTeamCount = threeSaleSerivce.countSecondTeam(Long.parseLong(uid));
long myTeamCount = myFirstTeamCount + mySecondTeamCount;
data.put("myTeam", myTeamCount);
// 1.5.0鍚庡凡缁忎笉浣跨敤姝ゅ瓧娈�
@@ -127,9 +129,10 @@
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<BannerVO> pictureList = swiperPictureService.getByBannerCardAndVersion("invite_top_banner",
+ acceptData.getPlatform(), Integer.parseInt(acceptData.getVersion()));
if (pictureList != null && pictureList.size() > 0) {
- SwiperPicture picture = pictureList.get(0);
+ BannerVO picture = pictureList.get(0);
com.alibaba.fastjson.JSONObject pictureJson = new com.alibaba.fastjson.JSONObject();
pictureJson.put("src", picture.getSrc());
pictureJson.put("jumpDetail", picture.getJumpDetail());
@@ -137,12 +140,11 @@
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) {
- String inviteCode = userInfoExtraService.getUserInviteCode(Long.parseLong(uid));
+ String inviteCode = userInfoExtraService.getInviteCodeByUid(Long.parseLong(uid));
if (inviteCode != null && inviteCode.trim().length() > 0) {
hasCode = true; // 宸叉湁閭�璇风爜
}
@@ -150,7 +152,7 @@
// 閭�璇锋縺娲婚摼鎺�
if (!hasCode) {
- data.put("activationlink", configService.get("invite_activation_url"));
+ data.put("activationlink", configService.get(ConfigKeyEnum.inviteActivationUrl.getKey()));
}
data.put("hasCode", hasCode);
@@ -172,25 +174,28 @@
* @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));
}
// 閭�璇烽摼鎺�
- 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 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");
+
+ String inviteCode = userInfoExtraService.getInviteCodeByUid(uid);
+ if (!StringUtil.isNullOrEmpty(inviteCode)) {
+ data.put("inviteCode", inviteCode);
}
-
+
// 閭�璇疯鍒�
String key = "inviteRules"; // key鍊�
BusinessSystem system = new BusinessSystem();
@@ -202,8 +207,8 @@
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), "鎴愬姛"));
}
@@ -217,7 +222,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;
@@ -244,10 +249,10 @@
* 閭�璇峰槢
* @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;
@@ -258,8 +263,14 @@
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("婵�娲诲け璐�"));
return;
}
+ if (VersionUtil.greaterThan_2_0_7(acceptData.getPlatform(), acceptData.getVersion())) {
+ String myInviteCode = userInfoExtraService.getInviteCodeByUid(uid);
+ JSONObject data = new JSONObject();
+ data.put("inviteCode", myInviteCode);
+ JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
- JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("閭�璇风爜婵�娲绘垚鍔�"));
+ } else
+ JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("閭�璇风爜婵�娲绘垚鍔�"));
} catch (UserInfoExtraException e) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getMsg()));
@@ -269,7 +280,6 @@
}
}
-
/**
* 婵�娲婚個璇�
*
@@ -280,11 +290,20 @@
* 閭�璇峰槢
* @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);
- out.print(JsonUtil.loadTrueResult("閭�璇风爜婵�娲绘垚鍔�"));
+ userInfoExtraService.activationInviteWX(
+ Constant.getWXAccount(acceptData.getPlatform(), acceptData.getVersion()), uid, code);
+
+ if (VersionUtil.greaterThan_2_0_7(acceptData.getPlatform(), acceptData.getVersion())) {
+ String myInviteCode = userInfoExtraService.getInviteCodeByUid(uid);
+ JSONObject data = new JSONObject();
+ data.put("inviteCode", myInviteCode);
+ JsonUtil.printMode(out, "", JsonUtil.loadTrueResult(data));
+ } else
+ out.print(JsonUtil.loadTrueResult("閭�璇风爜婵�娲绘垚鍔�"));
} catch (UserInfoExtraException e) {
out.print(JsonUtil.loadFalseResult(e.getMsg()));
} catch (Exception e) {
@@ -293,7 +312,6 @@
}
}
-
/**
* 鑾峰彇閭�璇风爜
*
@@ -311,15 +329,15 @@
return;
}
- UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(uid);
- if (userInfoExtra == null || userInfoExtra.getInviteCode() == null) {
+ String inviteCode = userInfoExtraService.getInviteCodeByUid(uid);
+ if (StringUtil.isNullOrEmpty(inviteCode)) {
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", userInfoExtra.getInviteCode());
+ data.put("inviteCode", inviteCode);
data.put("tip", tip);
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
--
Gitblit v1.8.0