From a381a654833decf21cad316ffbda8b3e9c834118 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 26 二月 2019 19:01:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java | 24 ++++++++++++++++--------
1 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java
index 55654a9..6ede170 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java
@@ -46,6 +46,7 @@
import com.yeshi.fanli.entity.bus.user.Order;
import com.yeshi.fanli.entity.bus.user.ShamUser;
import com.yeshi.fanli.entity.bus.user.UserInfo;
+import com.yeshi.fanli.entity.bus.user.UserInfoExtra;
import com.yeshi.fanli.entity.common.ImageInfo;
import com.yeshi.fanli.entity.common.JumpDetail;
import com.yeshi.fanli.entity.common.JumpDetailV2;
@@ -237,6 +238,7 @@
@Resource
private UserInfoExtraService userInfoExtraService;
+
@RequestMapping(value = "getrecommendsection")
public void getRecommendSection(AcceptData acceptData, int index, PrintWriter out) {
@@ -2225,7 +2227,7 @@
* @param out
*/
@RequestMapping(value = "getSpecialActivities")
- public void getSpecialActivities(AcceptData acceptData, PrintWriter out) {
+ public void getSpecialActivities(AcceptData acceptData, Long uid, PrintWriter out) {
System system = systemService.getSystemCache(acceptData.getPlatform(), acceptData.getPackages());
if (system == null) {
@@ -2249,18 +2251,24 @@
special.setCard(null);
special.setCardId(null);
- // 鎵嬪姩鏇挎崲鍙傛暟
- if (special.getName() != null && special.getName().contains("閭�璇�")) {
-// userInfoExtraService
-
- }
-
JumpDetailV2 jumpDetail = special.getJumpDetail();
if (jumpDetail != null) {
jumpDetail.setId(null);
jumpDetail.setName(null);
}
-
+ // 閭�璇风櫥闄嗛獙璇�
+ if(jumpDetail.getType().equals("invite_web") && jumpDetail.getNeedLogin()
+ && uid != null) {
+
+ UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(uid);
+ if (userInfoExtra != null && userInfoExtra.getInviteCode() != null
+ && userInfoExtra.getInviteCode().trim().length() > 0) {
+
+ JSONObject params = new JSONObject();
+ params.put("url", configService.get("invite_activation_success_url"));
+ special.setParams(params.toString());
+ }
+ }
}
}
--
Gitblit v1.8.0