From 8e5fb7b57899c25ff0e5fe251f684691039f72e0 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期四, 15 八月 2019 09:34:13 +0800
Subject: [PATCH] 口令记录
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/InviteControllerV2.java | 79 +++++++++++++++++++++------------------
1 files changed, 43 insertions(+), 36 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/InviteControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/InviteControllerV2.java
index 0c45467..00861ef 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/InviteControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/InviteControllerV2.java
@@ -29,7 +29,6 @@
import com.yeshi.fanli.service.inter.user.UserInfoExtraService;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.StringUtil;
-import com.yeshi.fanli.util.VersionUtil;
import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
@@ -71,6 +70,7 @@
JSONObject data = new JSONObject();
data.put("nickName", userInfo.getNickName());
data.put("portrait", userInfo.getPortrait());
+ data.put("tips", "纭瑕佹垚涓篢A鐨勪竴绾ч槦鍛樺悧锛熼個璇峰叧绯讳竴鏃﹀缓绔嬩笉鍙洿鏀广��");
out.print(JsonUtil.loadTrueResult(data));
} catch (UserInfoExtraException e) {
out.print(JsonUtil.loadFalseResult(e.getMsg()));
@@ -89,6 +89,7 @@
JSONObject data = new JSONObject();
data.put("nickName", userInfo.getNickName());
data.put("portrait", userInfo.getPortrait());
+ data.put("tips", "纭瑕佹垚涓篢A鐨勪竴绾ч槦鍛樺悧锛熼個璇峰叧绯讳竴鏃﹀缓绔嬩笉鍙洿鏀广��");
out.print(JsonUtil.loadTrueResult(data));
} catch (UserInfoExtraException e) {
out.print(JsonUtil.loadFalseResult(e.getMsg()));
@@ -121,40 +122,6 @@
// 缁勭粐鏁版嵁
JSONObject resultData = organizeTeam(count, listTeam, uid, type);
- resultData.put("helpLink", configService.get("team_help_url"));
-
- boolean hasCode = false;
- boolean bdWeiXin = false;
- UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(uid);
- if (userInfoExtra != null) {
- if (!StringUtil.isNullOrEmpty(userInfoExtra.getInviteCode()))
- hasCode = true;
-
- if (!StringUtil.isNullOrEmpty(userInfoExtra.getWeiXin()))
- bdWeiXin = true;
- }
-
- // 鏈縺娲婚個璇风爜
- if (!hasCode) {
- resultData.put("helpLinkActivate", configService.get("team_help_url"));
- resultData.put("tipCode", "婵�娲婚個璇峰姛鑳藉悗鎵嶅彲浠ラ個璇烽槦鍛橈紝涓�绾ч槦鍛樻槸鐢变綘鐩存帴閭�璇凤紝浜岀骇闃熷憳鏄敱浣犵殑涓�绾ч槦鍛橀個璇枫�俓r\n閭�璇锋縺娲诲姛鑳斤紝蹇呴』瑕佹湁閭�璇风爜锛岄個璇风爜鍙互閫氳繃閲戝竵鍏戞崲锛屼篃鍙互鍏ㄧ綉鎼滅储銆�");
- }
- resultData.put("hasCode", hasCode);
-
- // 鏈坊鍔犲井淇″彿
- if (!bdWeiXin) {
- resultData.put("tipWeiXin", "娣诲姞寰俊鍙峰悗锛屼綘鐨勯個璇蜂汉鍜屼竴绾ч槦鍛樺彲閫氳繃寰俊鍙蜂笌浣犲缓绔嬭仈绯伙紱\r\n浣犱篃鍙互鍚戦個璇蜂汉瀛︿範鎴栧悜涓�绾ч槦鍛樻暀鎺堣禋閽辨妧宸с��");
- }
- resultData.put("bdWeiXin", bdWeiXin);
-
- // 瀹夊崜杩斿洖缁熻鏁版嵁
- String platform = acceptData.getPlatform();
- if ("android".equalsIgnoreCase(platform)) {
- JSONObject bossData = getBossInfo(acceptData, uid, threeSaleSerivce.getMyBoss(uid));
- resultData.put("boss", bossData);
- resultData.put("firstTeam", threeSaleSerivce.countFirstTeam(uid, 1));
- resultData.put("secondTeam", threeSaleSerivce.countSecondTeam(uid, 1));
- }
out.print(JsonUtil.loadTrueResult(resultData));
}
@@ -261,12 +228,52 @@
public void countMyTeam(AcceptData acceptData, long uid, PrintWriter out) {
JSONObject bossData = getBossInfo(acceptData, uid, threeSaleSerivce.getMyBoss(uid));
JSONObject resultData = new JSONObject();
+
+ long firstTeam = threeSaleSerivce.countFirstTeam(uid, 1);
resultData.put("boss", bossData);
resultData.put("helpLink", configService.get("team_help_url"));
- resultData.put("firstTeam", threeSaleSerivce.countFirstTeam(uid, 1));
+ resultData.put("firstTeam", firstTeam);
resultData.put("firstTeamTotal", threeSaleSerivce.countFirstTeam(uid, null));
resultData.put("secondTeam", threeSaleSerivce.countSecondTeam(uid, 1));
resultData.put("secondTeamTotal", threeSaleSerivce.countSecondTeam(uid, null));
+
+ boolean hasTeam = true;
+ if (firstTeam <= 0) {
+ hasTeam = false;
+ resultData.put("invitelink", configService.get("invite_activation_url"));
+ }
+ resultData.put("hasTeam", hasTeam);
+
+ boolean hasCode = false;
+ boolean bdWeiXin = false;
+ UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(uid);
+ if (userInfoExtra != null) {
+ if (!StringUtil.isNullOrEmpty(userInfoExtra.getInviteCode()))
+ hasCode = true;
+
+ if (!StringUtil.isNullOrEmpty(userInfoExtra.getWeiXin()))
+ bdWeiXin = true;
+ }
+
+ // 鏈縺娲婚個璇风爜
+ resultData.put("hasCode", hasCode);
+ if (!hasCode) {
+ List<String> tipCode = new ArrayList<String>();
+ resultData.put("helpLinkActivate", configService.get("team_help_url"));
+ tipCode.add("婵�娲婚個璇峰姛鑳藉悗鎵嶅彲浠ラ個璇烽槦鍛橈紝涓�绾ч槦鍛樻槸鐢变綘鐩存帴閭�璇凤紝浜岀骇闃熷憳鏄敱浣犵殑涓�绾ч槦鍛橀個璇枫��");
+ tipCode.add("閭�璇锋縺娲诲姛鑳斤紝蹇呴』瑕佹湁閭�璇风爜锛岄個璇风爜鍙互閫氳繃閲戝竵鍏戞崲锛屼篃鍙互鍏ㄧ綉鎼滅储銆�");
+ resultData.put("tipCode", tipCode);
+ }
+
+ // 鏈坊鍔犲井淇″彿
+ List<String> tipWeiXin = new ArrayList<String>();
+ if (!bdWeiXin) {
+ tipWeiXin.add("娣诲姞寰俊鍙峰悗锛屼綘鐨勯個璇蜂汉鍜屼竴绾ч槦鍛樺彲閫氳繃寰俊鍙蜂笌浣犲缓绔嬭仈绯伙紱");
+ tipWeiXin.add("浣犱篃鍙互鍚戦個璇蜂汉瀛︿範鎴栧悜涓�绾ч槦鍛樻暀鎺堣禋閽辨妧宸с��");
+ }
+ resultData.put("tipWeiXin", tipWeiXin);
+ resultData.put("bdWeiXin", bdWeiXin);
+
out.print(JsonUtil.loadTrueResult(resultData));
}
--
Gitblit v1.8.0