From 388be9f734f5b80c348bcc956726c206002e832a Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@MS-20170306HGUF>
Date: 星期日, 23 二月 2020 12:55:01 +0800
Subject: [PATCH] 保存bug
---
fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/InviteController.java | 32 ++++++++++++++++++++++++++++----
1 files changed, 28 insertions(+), 4 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 32fecdd..b78f308 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
@@ -22,6 +22,7 @@
import com.yeshi.fanli.entity.bus.user.UserInfo;
import com.yeshi.fanli.entity.bus.user.UserInfoExtra;
import com.yeshi.fanli.entity.bus.user.UserInviteSeparate;
+import com.yeshi.fanli.entity.system.ConfigKeyEnum;
import com.yeshi.fanli.service.inter.config.ConfigService;
import com.yeshi.fanli.service.inter.user.UserInfoExtraService;
import com.yeshi.fanli.service.inter.user.UserInviteSeparateService;
@@ -58,7 +59,7 @@
private ThreeSaleExtraInfoSerivce threeSaleExtraInfoSerivce;
/**
- * 绔欏唴淇℃彁閱掗槦鍛樻坊鍔犲井淇″彿
+ * 涓撳睘閭�璇风爜鏉′欢
*
* @param acceptData
* @param uid
@@ -72,9 +73,32 @@
return;
}
+ JSONArray array1 = new JSONArray();
+ array1.add("1.閭�璇风爜鍙府鍔╁ソ鍙嬫縺娲婚個璇峰姛鑳斤紱");
+ array1.add("2.濂藉弸閫氳繃浣犵殑閭�璇风爜婵�娲婚個璇峰姛鑳藉悗锛屽皢鎴愪负浣犵殑鐩存帴绮変笣锛屾湭鏉ヤ骇鐢熺殑璁㈠崟浣犻兘鏈夊閲戯紱");
+ array1.add("3.閭�璇风爜鍏锋湁鍞竴鎬с��");
+
+ JSONObject desc1 = new JSONObject();
+ desc1.put("title", "閭�璇风爜鐨勪綔鐢�");
+ desc1.put("content",array1);
+
+ JSONArray array2 = new JSONArray();
+ array2.add("1.浣犲彲浠ヨ嚜鐢辫缃�4~12浣嶇畝鍗曟槗璁扮殑閭�璇风爜锛�");
+ array2.add("2.涓撳睘閭�璇风爜鏄浣犲拰浣犵殑鍥㈤槦灏婅吹韬唤鐨勫桨鏄俱��");
+
+ JSONObject desc2 = new JSONObject();
+ desc2.put("title", "涓撳睘閭�璇风爜浼樺娍");
+ desc2.put("content",array2);
+
+ JSONArray array = new JSONArray();
+ array.add(desc1);
+ array.add(desc2);
+
JSONObject data = new JSONObject();
+ data.put("desc", array);
data.put("num", threeSaleSerivce.countFirstTeam(uid, 1));
data.put("limit", Constant.INVITE_CODRE_TAILOR_LIMIT);
+
out.print(JsonUtil.loadTrueResult(data));
}
@@ -110,7 +134,7 @@
JSONObject resultData = new JSONObject();
- String helpLink = configService.get("team_help_url");
+ String helpLink = configService.get(ConfigKeyEnum.teamHelpUrl.getKey());
if (helpLink == null) {
helpLink = "";
}
@@ -127,7 +151,7 @@
hasCode = true; // 宸叉湁閭�璇风爜
} else {
// 閭�璇锋縺娲婚摼鎺�
- resultData.put("activationlink", configService.get("invite_activation_url"));
+ resultData.put("activationlink", configService.get(ConfigKeyEnum.inviteActivationUrl.getKey()));
}
resultData.put("hasCode", hasCode);
@@ -366,7 +390,7 @@
bossData.put("inviteTime", "浣犱簬 " + sdf.format(inviteTime) + "鎺ュ彈浜員A鐨勯個璇�");
} else {
bossData.put("hasBoss", false);
- bossData.put("helpLink", configService.get("invite_code_hlep_link"));
+ bossData.put("helpLink", configService.get(ConfigKeyEnum.inviteCodeHlepLink.getKey()));
bossData.put("weiXinTip", "鎭枩浣狅紝鎴戜滑鐨勪紭璐ㄧ敤鎴凤紱\r\n浣犲苟娌℃湁閭�璇蜂汉锛屼絾浣犵殑閭�璇锋縺娲诲姛鑳芥槸琚粯璁ゅ紑鍚殑锛沑r\n浣犳嫢鏈夌嫭鐗圭殑鏃犻個璇蜂汉婵�娲荤爜銆�");
}
return bossData;
--
Gitblit v1.8.0