From e97b71caed03d1f1aa3ae21b1ea0deac4dd9ffe0 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期五, 16 八月 2019 14:28:38 +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/v2/InviteControllerV2.java | 27 ++++++++++++++++++++-------
1 files changed, 20 insertions(+), 7 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 00861ef..1f8daca 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
@@ -122,6 +122,18 @@
// 缁勭粐鏁版嵁
JSONObject resultData = organizeTeam(count, listTeam, uid, type);
+
+ // 绗竴椤靛垽鏂槸鍚︽縺娲� 鏄惁鏈夐槦鍛�
+ if (type == 1 && page == 1) {
+ boolean hasCode = false;
+ UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(uid);
+ if (userInfoExtra != null) {
+ if (!StringUtil.isNullOrEmpty(userInfoExtra.getInviteCode()))
+ hasCode = true;
+ }
+ resultData.put("hasCode", hasCode);
+ resultData.put("hasTeam", count > 0? true:false);
+ }
out.print(JsonUtil.loadTrueResult(resultData));
}
@@ -272,6 +284,7 @@
tipWeiXin.add("浣犱篃鍙互鍚戦個璇蜂汉瀛︿範鎴栧悜涓�绾ч槦鍛樻暀鎺堣禋閽辨妧宸с��");
}
resultData.put("tipWeiXin", tipWeiXin);
+ resultData.put("tipWeiXinAdd", "娣诲姞寰俊鍙峰悗锛屼綘鐨勯個璇蜂汉鍜屼竴绾ч槦鍛樺彲浠ラ�氳繃寰俊涓庝綘寤虹珛鑱旂郴銆�");
resultData.put("bdWeiXin", bdWeiXin);
out.print(JsonUtil.loadTrueResult(resultData));
@@ -311,7 +324,6 @@
}
}
bossData.put("inviteTime", "浣犱簬 " + sdf.format(inviteTime) + "鎺ュ彈浜員A鐨勯個璇�");
-
} else {
bossData.put("hasBoss", false);
bossData.put("helpLink", configService.get("invite_code_hlep_link"));
@@ -355,12 +367,13 @@
}
try {
- List<String> listIOS = new ArrayList<String>();
- List<String> listAndroid = new ArrayList<String>();
- pushService.pushZNX(remindId, "", "", listIOS, listAndroid);
-
- userSystemMsgService.addUserSystemMsg(remindId, UserSystemMsgTypeEnum.question,
- "", "", UserSystemMsg.TIME_TAG_EMERGENT, null);
+ // TODO鐗堟湰鍖哄垎
+
+// List<String> listIOS = new ArrayList<String>();
+// List<String> listAndroid = new ArrayList<String>();
+// pushService.pushZNX(remindId, "", "", listIOS, listAndroid);
+// userSystemMsgService.addUserSystemMsg(remindId, UserSystemMsgTypeEnum.question,
+// "", "", UserSystemMsg.TIME_TAG_EMERGENT, null);
JSONObject data = new JSONObject();
data.put("weiXinState", 2);
--
Gitblit v1.8.0