From 10ee47b2668374436f4ce0ab1665818a573e3f87 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@Admin>
Date: 星期二, 20 十一月 2018 13:15:13 +0800
Subject: [PATCH] Merge branch 'master' into dev1
---
fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java | 140 +++++++++++++++++++++++-----------------------
1 files changed, 69 insertions(+), 71 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 baa4411..4ac2d75 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
@@ -20,7 +20,7 @@
import org.springframework.web.bind.annotation.RequestMethod;
import org.yeshi.utils.IPUtil;
import org.yeshi.utils.JsonUtil;
-import org.yeshi.utils.NumberUtil;
+import org.yeshi.utils.NumberUtil;
import org.yeshi.utils.taobao.TbImgUtil;
import com.google.gson.Gson;
@@ -197,13 +197,12 @@
@Resource
private ShamUserService shamUserService;
-
+
@Resource
private SpecialService specialService;
-
+
@Resource
private SwiperPictureService swiperPictureService;
-
@Resource
private MonitorService monitorService;
@@ -622,18 +621,58 @@
out.print(JsonUtil.loadFalseResult(1, "绯荤粺涓嶅瓨鍦�"));
return;
}
- // TaoBaoGoodsBrief alimama = TaoBaoUtil.isAlimama(id);
+ // 鑾峰彇娣樺鍙傛暟
+ ClientTBPid clientTBPid = null;
+ // 鐢ㄦ埛宸茬粡鐧诲綍
+ if (!StringUtil.isNullOrEmpty(uid) && Long.parseLong(uid) > 0) {
+ TBPid tbPid = null;
+ if (acceptData.getPlatform().equalsIgnoreCase("android")) {
+ tbPid = tbPidService.getTBPid(Long.parseLong(uid), PidUser.TYPE_FANLI_ANDROID);
+ if (tbPid != null) {
+ String siteId = tbPid.getPid().split("_")[2];
+ String adzoneId = tbPid.getPid().split("_")[3];
+ TaoBaoUnionConfig config = taoBaoUnionConfigService.getConfigByAppIdCache(siteId);
+ clientTBPid = new ClientTBPid(config.getAppKey(), tbPid.getPid(), siteId, adzoneId);
+ } else {
+ clientTBPid = tbPidService.getAndroidDefault();
+ }
+
+ } else {
+ tbPid = tbPidService.getTBPid(Long.parseLong(uid), PidUser.TYPE_FANLI_IOS);
+ if (tbPid != null) {
+ String siteId = tbPid.getPid().split("_")[2];
+ String adzoneId = tbPid.getPid().split("_")[3];
+ TaoBaoUnionConfig config = taoBaoUnionConfigService.getConfigByAppIdCache(siteId);
+ clientTBPid = new ClientTBPid(config.getAppKey(), tbPid.getPid(), siteId, adzoneId);
+ } else {
+ clientTBPid = tbPidService.getIOSDefault();
+ }
+ }
+ } else {
+ if (acceptData.getPlatform().equalsIgnoreCase("android"))
+ clientTBPid = tbPidService.getAndroidDefault();
+ else
+ clientTBPid = tbPidService.getIOSDefault();
+ }
+
TaoBaoGoodsBrief tb = null;
try {
- tb = redisManager.getTaoBaoGoodsBrief(Long.parseLong(id));
+ TaoKeAppInfo app = new TaoKeAppInfo();
+ TaoBaoUnionConfig config = taoBaoUnionConfigService.getConfigByAppIdCache(clientTBPid.getSiteId());
+ app.setAdzoneId(clientTBPid.getAdZoneId());
+ app.setAppKey(clientTBPid.getAppKey());
+ app.setAppSecret(config.getAppSecret());
+ app.setPid(clientTBPid.getPid());
+ tb = TaoKeApiUtil.searchGoodsDetail(Long.parseLong(id), app);
} catch (NumberFormatException e1) {
e1.printStackTrace();
} catch (TaobaoGoodsDownException e1) {
- e1.printStackTrace();
+ out.print(JsonUtil.loadFalseResult(2, "鍟嗗搧宸蹭笅鏋�"));
+ return;
}
if (tb != null) {
- tb.setAuctionUrl(null);
+ // tb.setAuctionUrl(null);
tb.setId(null);
int type = 0;
if ("android".equalsIgnoreCase(acceptData.getPlatform()))
@@ -646,56 +685,18 @@
Gson gson = new GsonBuilder().excludeFieldsWithoutExposeAnnotation().create();
JSONObject data = new JSONObject();
TaoBaoGoodsBriefExtra taoBaoGoodsBriefExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(tb, configList.get(0));
-
+ if (!StringUtil.isNullOrEmpty(tb.getCouponLink()) && taoBaoGoodsBriefExtra.getTaoBaoQuanInfo() != null)
+ taoBaoGoodsBriefExtra.getTaoBaoQuanInfo().setCouponLink(tb.getCouponLink());
+ taoBaoGoodsBriefExtra.setAuctionUrl(tb.getAuctionUrl());
if (uid != null && !"".equals(uid.trim())) {
CollectionGoods collectionGoods = collectionGoodsService.findByUidAndAuctionId(Long.parseLong(uid),
Long.parseLong(id));
data.put("collection", collectionGoods != null ? true : false);
}
- // 鑾峰彇娣樺鍙傛暟
- ClientTBPid clientTBPid = null;
- // 鐢ㄦ埛宸茬粡鐧诲綍
- if (!StringUtil.isNullOrEmpty(uid) && Long.parseLong(uid) > 0) {
- TBPid tbPid = null;
- if (acceptData.getPlatform().equalsIgnoreCase("android")) {
- tbPid = tbPidService.getTBPid(Long.parseLong(uid), PidUser.TYPE_FANLI_ANDROID);
- if (tbPid != null) {
- String siteId = tbPid.getPid().split("_")[2];
- String adzoneId = tbPid.getPid().split("_")[3];
- TaoBaoUnionConfig config = taoBaoUnionConfigService.getConfigByAppIdCache(siteId);
- clientTBPid = new ClientTBPid(config.getAppKey(), tbPid.getPid(), siteId, adzoneId);
- } else {
- clientTBPid = tbPidService.getAndroidDefault();
- }
-
- } else {
- tbPid = tbPidService.getTBPid(Long.parseLong(uid), PidUser.TYPE_FANLI_IOS);
- if (tbPid != null) {
-
- String siteId = tbPid.getPid().split("_")[2];
- String adzoneId = tbPid.getPid().split("_")[3];
- TaoBaoUnionConfig config = taoBaoUnionConfigService.getConfigByAppIdCache(siteId);
- clientTBPid = new ClientTBPid(config.getAppKey(), tbPid.getPid(), siteId, adzoneId);
- } else {
- clientTBPid = tbPidService.getIOSDefault();
- }
- }
-
- if (!StringUtil.isNullOrEmpty(tb.getCouponLink()) && taoBaoGoodsBriefExtra.getTaoBaoQuanInfo() != null)
- taoBaoGoodsBriefExtra.getTaoBaoQuanInfo().setCouponLink(TaoBaoCouponUtil
- .getCoupleUrl(tb.getCouponActivityId(), tbPid.getPid(), tb.getAuctionId() + ""));
-
- } else {
- if (acceptData.getPlatform().equalsIgnoreCase("android"))
- clientTBPid = tbPidService.getAndroidDefault();
- else
- clientTBPid = tbPidService.getIOSDefault();
- }
-
data.put("tbPidInfo", clientTBPid);
- taoBaoGoodsBriefExtra.setAuctionUrl(null);
+ // taoBaoGoodsBriefExtra.setAuctionUrl(null);
data.put("taobao", gson.toJson(taoBaoGoodsBriefExtra));
String info = configService.get("detail_prompt");
data.put("info", info);
@@ -1481,7 +1482,7 @@
*/
@RequestMapping(value = "getRecommendInfo")
public void getRecommendHomeInfo(AcceptData acceptData, PrintWriter out) {
-
+
System system = systemService.getSystemCache(acceptData.getPlatform(), acceptData.getPackages());
if (system == null) {
out.print(JsonUtil.loadFalseResult(1, "绯荤粺涓嶅瓨鍦�"));
@@ -1579,7 +1580,6 @@
out.print(JsonUtil.loadTrueResult(root));
}
-
/**
* 鏂扮増鎺ㄨ崘涓撻绠＄悊(1.4.0)
*
@@ -1594,15 +1594,15 @@
out.print(JsonUtil.loadFalseResult(1, "绯荤粺涓嶅瓨鍦�"));
return;
}
-
- List<SwiperPicture> listswiper = null;
+
+ List<SwiperPicture> listswiper = null;
if (!StringUtil.isNullOrEmpty(specialCard)) {
try {
-
+
listswiper = swiperPictureService.getByBannerCard(swiperCard);
-
+
if (listswiper != null && listswiper.size() > 0) {
- for (SwiperPicture swiperPicture: listswiper) {
+ for (SwiperPicture swiperPicture : listswiper) {
swiperPicture.setBannerId(null);
swiperPicture.setCreatetime(null);
swiperPicture.setUpdatetime(null);
@@ -1610,34 +1610,34 @@
swiperPicture.setRemark(null);
}
}
-
+
} catch (Exception e) {
e.printStackTrace();
}
}
-
+
Special miaoShaSpecial = null;
- List<Special> honestList = new ArrayList<Special>();
+ List<Special> honestList = new ArrayList<Special>();
List<Special> specialList = new ArrayList<Special>();
if (!StringUtil.isNullOrEmpty(specialCard)) {
try {
List<Special> listSpecial = specialService.listBySystemAndCard(specialCard, system.getId());
-
+
if (listSpecial != null && listSpecial.size() > 0) {
- for (Special special: listSpecial) {
+ for (Special special : listSpecial) {
special.setCreatetime(null);
special.setUpdatetime(null);
special.setState(null);
special.setRemark(null);
special.setCard(null);
special.setCardId(null);
-
+
if ("闄愭椂绉掓潃".equals(special.getName())) {
miaoShaSpecial = special;
continue;
}
-
+
if ("arc".equals(special.getShowType())) {
// 鍚屼竴琛屼笓棰�
honestList.add(special);
@@ -1647,11 +1647,11 @@
}
}
}
-
+
} catch (Exception e) {
e.printStackTrace();
}
-
+
}
/* 闄愭椂绉掓潃 - 鏃堕棿澶勭悊 */
@@ -1669,7 +1669,7 @@
break;
}
}
-
+
if (hour < 0)
hour = 24;
long time = TimeUtil.convertToTimeTemp(TimeUtil.getGernalTime(calendar.getTimeInMillis(), "yyyy-MM-dd"),
@@ -1684,11 +1684,9 @@
root.put("miaoSha", msJSON);
out.print(JsonUtil.loadTrueResult(root));
-
+
}
-
-
-
+
/**
* 鍟嗗搧鍩烘湰璇︽儏 (1.4.0)
*
--
Gitblit v1.8.0