From f617136cba7f851a32f6091d5adc3e80f0e224c2 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 24 一月 2019 09:33:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/controller/client/InviteGetMoneyController.java | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/InviteGetMoneyController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/InviteGetMoneyController.java
index ab3f298..288e6df 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/InviteGetMoneyController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/InviteGetMoneyController.java
@@ -36,6 +36,7 @@
import com.yeshi.fanli.service.inter.user.UserRankingsService;
import com.yeshi.fanli.tag.PageEntity;
import com.yeshi.fanli.util.Constant;
+import com.yeshi.fanli.util.RedisManager;
import com.yeshi.fanli.util.account.UserUtil;
import net.sf.json.JSONArray;
@@ -80,6 +81,9 @@
@Resource
private ThreeSaleSerivce threeSaleSerivce;
+ @Resource
+ private RedisManager redisManager;
+
@RequestMapping(value = "/inviteGetMoney", method = RequestMethod.POST)
public void everyDayTaskList(AcceptData acceptData, int pageIndex, PrintWriter out, String uid)
@@ -317,7 +321,15 @@
return;
}
+ String inviteShortLink = redisManager.getInviteShortLink(uid);
+ if (inviteShortLink != null && inviteShortLink.trim().length() > 0) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璇�1鍒嗛挓鍚庡啀璇�"));
+ return;
+ }
+
String shortLink = UserUtil.getInviteShortLink(uid);
+ // 缂撳瓨1鍒嗛挓
+ redisManager.setInviteShortLink(uid, shortLink);
JSONObject data = new JSONObject();
data.put("shortLink", shortLink);
@@ -374,10 +386,9 @@
try {
ThreeSale threeSale = threeSaleSerivce.getMyBoss(uid);
if (threeSale == null) {
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏃犱笂绾ч個璇蜂汉"));
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(2, "鏃犱笂绾ч個璇蜂汉"));
return;
}
-
UserInfo boss = threeSale.getBoss();
if (boss == null) {
--
Gitblit v1.8.0