From d92226ce9f81c44fd0e159662d928767ce423b83 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 29 四月 2019 08:57:02 +0800
Subject: [PATCH] 淘宝用于自购的渠道ID存储
---
fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java | 137 ++++++++++++++++++++++-----------------------
1 files changed, 67 insertions(+), 70 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 1696376..ffbf96e 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
@@ -107,6 +107,7 @@
import com.yeshi.fanli.util.taobao.TaoBaoCouponUtil;
import com.yeshi.fanli.util.taobao.TaoBaoUtil;
import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
+import com.yeshi.fanli.vo.msg.ClientTextStyleVO;
import com.yeshi.fanli.vo.user.UserSettingsVO;
import net.sf.json.JSONArray;
@@ -115,7 +116,6 @@
@Controller
@RequestMapping("api/v1/user")
public class RecommendController {
-
@Resource
private BusinessSystemService businessSystemService;
@@ -140,7 +140,6 @@
@Resource
private UserInfoService userInfoService;
-
@Resource
private TaoBaoCouponService taoBaoCouponService;
@@ -213,10 +212,9 @@
@Resource
private UserInfoExtraService userInfoExtraService;
-
+
@Resource
private QualityFlashSaleService qualityFlashSaleService;
-
@Resource
private TaoBaoGoodsCacheUtil taoBaoGoodsCacheUtil;
@@ -1561,7 +1559,6 @@
out.print(JsonUtil.loadTrueResult(root));
}
-
/**
* 鏂扮増鎺ㄨ崘涓撻绠＄悊(1.5.3)
*
@@ -1571,7 +1568,7 @@
@RequestMapping(value = "getRecommendIndex")
public void getRecommendIndex(AcceptData acceptData, Long uid, PrintWriter out) {
try {
- // 1銆佷笓棰樻ā鍧�
+ // 1銆佷笓棰樻ā鍧�
JSONObject root = specialService.listCacheSpecialToIndex(acceptData);
// 2銆侀《閮ㄨ疆鎾浘
@@ -1580,29 +1577,27 @@
topPicList = new ArrayList<SwiperPicture>();
}
root.put("topPicList", JsonUtil.getApiCommonGson().toJson(topPicList));
-
-
+
// 3銆侀個璇锋湁濂�
List<SwiperPicture> invitePicList = null;
if ("ios".equalsIgnoreCase(acceptData.getPlatform())
&& configService.iosOnLining(Integer.parseInt(acceptData.getVersion()))) {
// 濡傛灉IOS褰撳墠鐗堟湰澶勪簬瀹℃牳鐘舵�佸氨涓嶈繑鍥�
} else {
- invitePicList = getSwiperByCard("index_invite");
+ invitePicList = getSwiperByCard("index_invite");
}
-
+
if (invitePicList == null) {
invitePicList = new ArrayList<SwiperPicture>();
- }
+ }
root.put("invitePicList", JsonUtil.getApiCommonGson().toJson(invitePicList));
-
-
+
// 4銆両OS鐨勫簳閮ㄧ綉椤甸摼鎺�
String platform = acceptData.getPlatform();
if ("ios".equalsIgnoreCase(platform)) {
root.put("htmlLink", configService.get("index_html_link_ios"));
- }
-
+ }
+
out.print(JsonUtil.loadTrueResult(root));
} catch (Exception e) {
out.print(JsonUtil.loadFalseResult(1, "鑾峰彇鏁版嵁澶辫触"));
@@ -1610,32 +1605,30 @@
LogHelper.errorDetailInfo(e);
} catch (Exception e1) {
e1.printStackTrace();
- }
+ }
}
}
-
+
/**
* 閭�璇锋湁濂栨槸鍚﹂渶瑕佽繑鍥�
+ *
* @param uid
* @param acceptData
* @return
*/
- public List<SwiperPicture> getInvitePicList(Long uid, AcceptData acceptData) {
+ 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");
-
-
-
+ }
+
+ List<SwiperPicture> invitePicList = getSwiperByCard("index_invite");
+
return invitePicList;
}
-
-
- public List<SwiperPicture> getSwiperByCard(String card){
+
+ public List<SwiperPicture> getSwiperByCard(String card) {
List<SwiperPicture> swiperList = null;
try {
swiperList = swiperPictureService.getByBannerCard(card);
@@ -1649,8 +1642,7 @@
}
return swiperList;
}
-
-
+
/**
* 闄愭椂绉掓潃 1.5.3
*
@@ -1659,91 +1651,90 @@
*/
@RequestMapping(value = "getSpikeGoods")
public void getSpikeGoods(AcceptData acceptData, PrintWriter out) {
-
+
// 涓嬩竴娆″�掕鏃剁殑鏃堕棿
int type = qualityFlashSaleService.getNowType() + 1;
int hour = 0;
- switch(type) {
- case 1:
- hour = 0;
- break;
- case 2:
- hour = 9;
- break;
- case 3:
- hour = 12;
- break;
- case 4:
- hour = 14;
- break;
- case 5:
- hour = 16;
- break;
- case 6:
- hour = 20;
- break;
- case 7:
- hour = 22;
- break;
- default:
- break;
+ switch (type) {
+ case 1:
+ hour = 0;
+ break;
+ case 2:
+ hour = 9;
+ break;
+ case 3:
+ hour = 12;
+ break;
+ case 4:
+ hour = 14;
+ break;
+ case 5:
+ hour = 16;
+ break;
+ case 6:
+ hour = 20;
+ break;
+ case 7:
+ hour = 22;
+ break;
+ default:
+ break;
}
-
+
Calendar nextTime = Calendar.getInstance();
nextTime.set(Calendar.HOUR_OF_DAY, hour);
nextTime.set(Calendar.MINUTE, 0);
nextTime.set(Calendar.SECOND, 0);
nextTime.set(Calendar.MILLISECOND, 0);
-
-
+
JSONArray array = null;
String timekey = "spikeGoods_hour";
String cachekey = "spikeGoodsList";
-
+
String timeValue = redisManager.getCommonString(timekey);
- if (timeValue == null || !timeValue.equals(hour+"")) {
- redisManager.cacheCommonString(timekey, hour+"", 60 * 30);
+ if (timeValue == null || !timeValue.equals(hour + "")) {
+ redisManager.cacheCommonString(timekey, hour + "", 60 * 30);
} else {
String cacheValue = redisManager.getCommonString(cachekey);
if (!StringUtil.isNullOrEmpty(cacheValue)) {
array = JSONArray.fromObject(cacheValue);
}
}
-
+
if (array == null) {
array = new JSONArray();
-
+
BigDecimal proportion = manageService.getFanLiRate();
Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())
.excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();
-
+
// 缂撳瓨涓笉瀛樺湪
List<QualityFactory> listGoods = qualityGoodsService.listFlashSaleRandGoods();
if (listGoods == null) {
listGoods = new ArrayList<QualityFactory>();
}
-
+
/* 閬嶅巻鍒楄〃鏁版嵁 */
for (QualityFactory qualityFactory : listGoods) {
-
+
TaoBaoGoodsBrief taoBaoGoodsBrief = qualityFactory.getTaoBaoGoodsBrief();
if (taoBaoGoodsBrief == null) {
continue;
}
- array.add(gson.toJson(TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion.toString(), null)));
+ array.add(gson
+ .toJson(TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion.toString(), null)));
}
-
+
// 缂撳瓨鍗婁釜灏忔椂
redisManager.cacheCommonString(cachekey, array.toString(), 60 * 30);
}
-
+
JSONObject root = new JSONObject();
root.put("time", nextTime.getTimeInMillis());
root.put("listgoods", array);
out.print(JsonUtil.loadTrueResult(root));
}
-
-
+
/**
* 鍟嗗搧鍩烘湰璇︽儏 (1.4.0)
*
@@ -2013,6 +2004,11 @@
}
goodsJson.put("hongBao", hongBao);
+ List<ClientTextStyleVO> labels = new ArrayList<>();
+ labels.add(new ClientTextStyleVO("鏍囩娴嬭瘯鍐呭1", "#FF0000"));
+ labels.add(new ClientTextStyleVO("鏍囩娴嬭瘯鍐呭2", "#00FF00"));
+ goodsJson.put("labels", labels);
+
data.put("tbPidInfo", clientTBPid);
String jumpUrl = "https://item.taobao.com/item.htm?id=" + tb.getAuctionId();
@@ -2042,6 +2038,7 @@
}
// 搴楅摵
goodsJson.put("shopInfo", tbShopInfo);
+ goodsJson.put("fanliValid", true);// 鏄惁鏈夎繑鍒�
// 鍒嗕韩璺緞
String shareUrl = String.format("%s?id=" + tb.getAuctionId(), Constant.systemCommonConfig.getAppShareInfoUrl());
--
Gitblit v1.8.0