From eec7e789a87863c25d92c10ad5dfc22ad80c448d Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 14 七月 2020 12:36:48 +0800
Subject: [PATCH] 系统区分BUG修复
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/InviteGetMoneyController.java | 24 +++++++++++-------------
1 files changed, 11 insertions(+), 13 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 25dcd11..0c3fd57 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
@@ -39,6 +39,7 @@
import com.yeshi.fanli.util.VersionUtil;
import com.yeshi.fanli.util.account.UserUtil;
import com.yeshi.fanli.util.annotation.RequestSerializableByKey;
+import com.yeshi.fanli.vo.homemodule.BannerVO;
import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
@@ -104,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鍚庡凡缁忎笉浣跨敤姝ゅ瓧娈�
@@ -128,10 +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.getByBannerCardAndVersion("invite_top_banner",
- acceptData.getPlatform(), Integer.parseInt(acceptData.getVersion()));
+ List<BannerVO> pictureList = swiperPictureService.getByBannerCardAndVersion("invite_top_banner",
+ acceptData.getPlatform(), Integer.parseInt(acceptData.getVersion()),acceptData.getSystem());
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());
@@ -139,7 +140,7 @@
data.put("topBanner", pictureJson);
}
- data.put("desc", configService.get(ConfigKeyEnum.inviteDesc.getKey()));
+ data.put("desc", configService.getValue(ConfigKeyEnum.inviteDesc.getKey(),acceptData.getSystem()));
boolean hasCode = false;
if (uid != null && uid.trim().length() > 0) {
@@ -151,7 +152,7 @@
// 閭�璇锋縺娲婚摼鎺�
if (!hasCode) {
- data.put("activationlink", configService.get(ConfigKeyEnum.inviteActivationUrl.getKey()));
+ data.put("activationlink", configService.getValue(ConfigKeyEnum.inviteActivationUrl.getKey(),acceptData.getSystem()));
}
data.put("hasCode", hasCode);
@@ -167,7 +168,6 @@
* 鏂规硶璇存槑: 鍒嗕韩濂藉弸閭�璇峰浘鐗�
*
* @author mawurui createTime 2018骞�4鏈�3鏃� 涓嬪崍3:49:05
- * @param pageIndex
* @param out
* @param uid
* @throws NotExistObjectException
@@ -206,7 +206,7 @@
String valueN = values.getValue();
String valueBr = valueN.replace("\n", "<br><br>");
- data.put("helpLink", configService.get(ConfigKeyEnum.inviteHelpLink.getKey()));
+ data.put("helpLink", configService.getValue(ConfigKeyEnum.inviteHelpLink.getKey(),acceptData.getSystem()));
data.put("inviteRules", valueBr);
out.print(JsonUtil.loadTrue(0, JsonUtil.getSimpleGson().toJson(data), "鎴愬姛"));
@@ -221,7 +221,7 @@
@RequestMapping(value = "getActivationTip")
public void getActivationTip(AcceptData acceptData, String callback, PrintWriter out) {
try {
- String tip = configService.get(ConfigKeyEnum.inviteActivationTip.getKey());
+ String tip = configService.getValue(ConfigKeyEnum.inviteActivationTip.getKey(),acceptData.getSystem());
if (tip == null || tip.trim().length() == 0) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏆傛棤鎻愰啋"));
return;
@@ -282,10 +282,8 @@
/**
* 婵�娲婚個璇�
*
- * @param callback
* @param uid
* 鐢ㄦ埛id
- * @param inviteCode
* 閭�璇峰槢
* @param out
*/
@@ -333,7 +331,7 @@
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("閭�璇风爜涓嶅瓨鍦�"));
return;
}
- String tip = configService.get(ConfigKeyEnum.inviteActivationSuccessTip.getKey());
+ String tip = configService.getValue(ConfigKeyEnum.inviteActivationSuccessTip.getKey(),acceptData.getSystem());
JSONObject data = new JSONObject();
data.put("inviteCode", inviteCode);
--
Gitblit v1.8.0