From 651a15c78f668bef3859d9ed1bb7ad0b669d3600 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 03 七月 2020 17:52:07 +0800
Subject: [PATCH] 多APP优化
---
fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/InviteController.java | 16 ++++++----------
1 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/InviteController.java b/fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/InviteController.java
index 1ff6e9f..6fb676e 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/InviteController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/InviteController.java
@@ -9,6 +9,7 @@
import javax.annotation.Resource;
+import com.yeshi.fanli.entity.SystemEnum;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
@@ -69,7 +70,6 @@
*
* @param acceptData
* @param uid
- * @param inviteId
* @param out
*/
@RequestMapping(value = "tailorCode")
@@ -112,7 +112,6 @@
* 鐢ㄦ埛闃熷憳缁熻 1.4.1
*
* @param acceptData
- * @param id
* @param out
*/
@RequestMapping(value = "countMyTeam", method = RequestMethod.POST)
@@ -137,7 +136,7 @@
JSONObject resultData = new JSONObject();
- String helpLink = configService.get(ConfigKeyEnum.teamHelpUrl.getKey());
+ String helpLink = configService.getValue(ConfigKeyEnum.teamHelpUrl.getKey(),acceptData.getSystem());
if (helpLink == null) {
helpLink = "";
}
@@ -154,7 +153,7 @@
hasCode = true; // 宸叉湁閭�璇风爜
} else {
// 閭�璇锋縺娲婚摼鎺�
- resultData.put("activationlink", configService.get(ConfigKeyEnum.inviteActivationUrl.getKey()));
+ resultData.put("activationlink", configService.getValue(ConfigKeyEnum.inviteActivationUrl.getKey(),acceptData.getSystem()));
}
resultData.put("hasCode", hasCode);
@@ -169,7 +168,6 @@
/**
*
* @param acceptData
- * @param id
* @param out
*/
@RequestMapping(value = "listMyTeam")
@@ -321,7 +319,7 @@
out.print(JsonUtil.loadFalseResult("鐢ㄦ埛鏈櫥褰�"));
return;
}
- JSONObject bossData = getBossInfo(uid, threeSaleSerivce.getMyBoss(uid));
+ JSONObject bossData = getBossInfo(uid, threeSaleSerivce.getMyBoss(uid),acceptData.getSystem());
out.print(JsonUtil.loadTrueResult(bossData));
}
@@ -330,7 +328,6 @@
*
* @param acceptData
* @param uid
- * @param inviteId
* @param out
*/
@RequestMapping(value = "remindBossAddWX")
@@ -425,12 +422,11 @@
/**
* 涓婄骇淇℃伅缁勭粐
*
- * @param acceptData
* @param uid
* @param threeSale
* @return
*/
- private JSONObject getBossInfo(long uid, ThreeSale threeSale) {
+ private JSONObject getBossInfo(long uid, ThreeSale threeSale, SystemEnum system) {
JSONObject bossData = new JSONObject();
if (threeSale != null && threeSale.getBoss() != null) {
UserInfo boss = threeSale.getBoss();
@@ -459,7 +455,7 @@
bossData.put("inviteTime", "浣犱簬 " + sdf.format(inviteTime) + "鎺ュ彈浜員A鐨勯個璇�");
} else {
bossData.put("hasBoss", false);
- bossData.put("helpLink", configService.get(ConfigKeyEnum.inviteCodeHlepLink.getKey()));
+ bossData.put("helpLink", configService.getValue(ConfigKeyEnum.inviteCodeHlepLink.getKey(),system));
bossData.put("weiXinTip", "鎭枩浣狅紝鎴戜滑鐨勪紭璐ㄧ敤鎴凤紱\r\n浣犲苟娌℃湁閭�璇蜂汉锛屼絾浣犵殑閭�璇锋縺娲诲姛鑳芥槸琚粯璁ゅ紑鍚殑锛沑r\n浣犳嫢鏈夌嫭鐗圭殑鏃犻個璇蜂汉婵�娲荤爜銆�");
}
return bossData;
--
Gitblit v1.8.0