From bb3bdeae38ee40dbdd802634b2d4549790b9aa92 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期五, 12 四月 2019 11:39:06 +0800
Subject: [PATCH] 1.5.3 需求提交
---
fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java | 87 ++++++++++++++++++++++---------------------
1 files changed, 45 insertions(+), 42 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 aea9784..550ec02 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
@@ -7,8 +7,8 @@
import java.util.Calendar;
import java.util.Collections;
import java.util.Date;
+import java.util.Iterator;
import java.util.List;
-import java.util.Map;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
@@ -53,7 +53,6 @@
import com.yeshi.fanli.entity.taobao.ClientTBPid;
import com.yeshi.fanli.entity.taobao.PidUser;
import com.yeshi.fanli.entity.taobao.SearchFilter;
-import com.yeshi.fanli.entity.taobao.TBPid;
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBriefExtra;
import com.yeshi.fanli.entity.taobao.TaoBaoSearchResult;
@@ -220,8 +219,6 @@
@RequestMapping(value = "getHonestList")
public void getHonestList(AcceptData acceptData, PrintWriter out) {
- BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(),
- acceptData.getPackages());
List<Honest> honestList = null;
List<TaoBaoUnionConfig> configList = taoBaoUnionConfigService.getConfigByTypeCache(PidUser.TYPE_FANLI_ANDROID);
if ((Integer.parseInt(acceptData.getVersion()) >= 20 && "android".equalsIgnoreCase(acceptData.getPlatform()))
@@ -970,7 +967,6 @@
ClientTBPid clientTBPid = null;
// 鐢ㄦ埛宸茬粡鐧诲綍
if (!StringUtil.isNullOrEmpty(uid)) {
- TBPid tbPid = null;
if (acceptData.getPlatform().equalsIgnoreCase("android")) {
clientTBPid = tbPidService.getAndroidDefault();
} else {
@@ -1292,7 +1288,6 @@
// 浠庢帹鑽愭潵
if (page <= 1) {
array.clear();
- Map<String, String> map = hongBaoManageService.convertMap();
BigDecimal proportion = manageService.getFanLiRate();
if (!StringUtil.isNullOrEmpty(imei) || !StringUtil.isNullOrEmpty(idfa)) {
long startTime = java.lang.System.currentTimeMillis();
@@ -1334,14 +1329,12 @@
proportion.toString());
array.addAll(localArray);
} else {// 浠庣簿閫夊簱鏉�
- Map<String, String> map = hongBaoManageService.convertMap();
BigDecimal proportion = manageService.getFanLiRate();
array = qualityGoodsService.getRecommendToIndex((page - 1) * pageSize, pageSize, proportion.toString());
if (array == null) {
out.print(JsonUtil.loadFalseResult("娌℃湁鏇村浜�"));
return;
}
- long count = qualityGoodsService.countRecommendToIndex(proportion.toString());
}
JSONObject data = new JSONObject();
@@ -1561,9 +1554,7 @@
root.put("invite", invite);
}
}
-
out.print(JsonUtil.loadTrueResult(root));
-
}
@@ -1575,49 +1566,22 @@
*/
@RequestMapping(value = "getRecommendIndex")
public void getRecommendIndex(AcceptData acceptData, Long uid, PrintWriter out) {
-
try {
- BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(),
- acceptData.getPackages());
- if (system == null) {
- out.print(JsonUtil.loadFalseResult(1, "绯荤粺涓嶅瓨鍦�"));
- return;
- }
-
- JSONObject root = specialService.getSpecialListCache("native_index", system.getId());
+ // 涓撻妯″潡
+ JSONObject root = specialService.listCacheSpecialToIndex();
// 椤堕儴杞挱鍥�
- List<SwiperPicture> topPicList = getSwiperByCard("weex_index");
+ List<SwiperPicture> topPicList = getSwiperByCard("index_top");
if (topPicList == null) {
topPicList = new ArrayList<SwiperPicture>();
}
root.put("topPicList", JsonUtil.getApiCommonGson().toJson(topPicList));
- // 閭�璇锋湁濂栧浘鐗�
- List<SwiperPicture> invitePicList = null;
-// if ("ios".equalsIgnoreCase(acceptData.getPlatform())
-// && configService.iosOnLining(Integer.parseInt(acceptData.getVersion()))) {
-// // 濡傛灉IOS褰撳墠鐗堟湰澶勪簬瀹℃牳鐘舵�佸氨涓嶈繑鍥�
-// } else {
-// if (uid == null) {
-// invitePicList = getSwiperByCard("invitePrizes");
-// } else {
-// try {
-// UserSettingsVO vo = userCustomSettingsService.getMySettings(uid);
-// if (vo == null || vo.getNoInvitationBonus() == null || vo.getNoInvitationBonus() == 0) {
-// invitePicList = getSwiperByCard("invitePrizes"); // 娌℃湁鍏抽棴閭�璇�
-// }
-// } catch (UserCustomSettingsException e) {
-// e.printStackTrace();
-// }
-// }
-// }
-
- invitePicList = getSwiperByCard("invitePrizes");
+ // 閭�璇枫�佸垎浜疆鎾浘
+ List<SwiperPicture> invitePicList = getInvitePicList(uid, acceptData);
if (invitePicList == null) {
invitePicList = new ArrayList<SwiperPicture>();
}
-
root.put("invitePicList", JsonUtil.getApiCommonGson().toJson(invitePicList));
// 搴曢儴缃戦〉閾炬帴
@@ -1637,6 +1601,45 @@
}
}
+ /**
+ * 閭�璇锋湁濂栨槸鍚﹂渶瑕佽繑鍥�
+ * @param uid
+ * @param acceptData
+ * @return
+ */
+ public List<SwiperPicture> getInvitePicList(Long uid, AcceptData acceptData) {
+ // 濡傛灉IOS褰撳墠鐗堟湰澶勪簬瀹℃牳鐘舵�佸氨涓嶈繑鍥�
+ if ("ios".equalsIgnoreCase(acceptData.getPlatform())
+ && configService.iosOnLining(Integer.parseInt(acceptData.getVersion()))) {
+ return null;
+ }
+
+ List<SwiperPicture> invitePicList = getSwiperByCard("index_invite");
+
+ if (uid != null) {
+ try {
+ // 鐢ㄦ埛鑷畾涔夛細涓嶇湅閭�璇锋湁濂�
+ UserSettingsVO vo = userCustomSettingsService.getMySettings(uid);
+ if (vo != null && vo.getNoInvitationBonus() != null && vo.getNoInvitationBonus() == 1
+ && invitePicList != null && invitePicList.size() > 0) {
+ Iterator<SwiperPicture> iterator = invitePicList.iterator();
+ while (iterator.hasNext()) {
+ SwiperPicture swiperPicture = iterator.next();
+ JumpDetailV2 jumpDetail = swiperPicture.getJumpDetail();
+ if (jumpDetail != null && "invite".equals(jumpDetail.getType())) {
+ iterator.remove();
+ }
+ }
+ }
+ } catch (UserCustomSettingsException e) {
+ e.printStackTrace();
+ }
+ }
+
+ return invitePicList;
+ }
+
+
public List<SwiperPicture> getSwiperByCard(String card){
List<SwiperPicture> swiperList = null;
try {
--
Gitblit v1.8.0