From dee14e78ad573d7488975a990476e16990bb6376 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 26 八月 2019 10:14:51 +0800
Subject: [PATCH] Merge branch 'mater-1.6.0' into div
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/RecommendController.java | 483 +++++++++++++++++++++++++++++++----------------------
1 files changed, 283 insertions(+), 200 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/RecommendController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/RecommendController.java
index fe3032d..b2d98b7 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/RecommendController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/RecommendController.java
@@ -53,6 +53,7 @@
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.TLJBuyGoods;
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBriefExtra;
import com.yeshi.fanli.entity.taobao.TaoBaoSearchResult;
@@ -81,6 +82,7 @@
import com.yeshi.fanli.service.inter.goods.SuperRecommendSpecialService;
import com.yeshi.fanli.service.inter.goods.TaoBaoCouponService;
import com.yeshi.fanli.service.inter.goods.TaoBaoGoodsBriefService;
+import com.yeshi.fanli.service.inter.goods.recommend.HomeRecommendGoodsService;
import com.yeshi.fanli.service.inter.goods.recommend.RecommendGoodsDeleteHistoryService;
import com.yeshi.fanli.service.inter.homemodule.DeviceSexService;
import com.yeshi.fanli.service.inter.homemodule.SpecialService;
@@ -92,6 +94,7 @@
import com.yeshi.fanli.service.inter.monitor.MonitorService;
import com.yeshi.fanli.service.inter.order.OrderService;
import com.yeshi.fanli.service.inter.order.ShareGoodsActivityOrderService;
+import com.yeshi.fanli.service.inter.taobao.TLJBuyGoodsService;
import com.yeshi.fanli.service.inter.taobao.TaoBaoGoodsUpdateService;
import com.yeshi.fanli.service.inter.taobao.TaoBaoShopService;
import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService;
@@ -121,6 +124,7 @@
import com.yeshi.fanli.util.taobao.TaoBaoUtil;
import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
import com.yeshi.fanli.util.taobao.TaoLiJinUtil;
+import com.yeshi.fanli.vo.goods.taobao.TLJBuyHongBaoVO;
import com.yeshi.fanli.vo.msg.ClientTextStyleVO;
import com.yeshi.fanli.vo.tlj.SpreadHongBao;
import com.yeshi.fanli.vo.user.UserSettingsVO;
@@ -239,30 +243,33 @@
@Resource
private DaTaoKeGoodsDetailService daTaoKeGoodsDetailService;
-
+
@Resource
private UserMoneyExtraService userMoneyExtraService;
-
+
@Resource
private UserTaoLiJinOriginService userTaoLiJinOriginService;
-
+
@Resource
private ConfigTaoLiJinService configTaoLiJinService;
-
+
@Resource
private DeviceTaoLiJinRecordService deviceTaoLiJinRecordService;
-
+
@Resource
private DeviceSexService deviceSexService;
-
+
@Resource
private UserTaoLiJinRecordService userTaoLiJinRecordService;
-
-
-
@Resource
private RecommendGoodsDeleteHistoryService recommendGoodsDeleteHistoryService;
+
+ @Resource
+ private HomeRecommendGoodsService homeRecommendGoodsService;
+
+ @Resource
+ private TLJBuyGoodsService tljBuyGoodsService;
@RequestMapping(value = "getHonestList")
public void getHonestList(AcceptData acceptData, PrintWriter out) {
@@ -658,7 +665,7 @@
taoBaoGoodsBriefExtra.setAuctionUrl(tb.getAuctionUrl());
if (uid != null && !"".equals(uid.trim())) {
CollectionGoodsV2 collectionGoods = collectionGoodsV2Service.findByUidAndAuctionId(Long.parseLong(uid),
- Long.parseLong(id));
+ Long.parseLong(id), Constant.SOURCE_TYPE_TAOBAO);
data.put("collection", collectionGoods != null ? true : false);
}
@@ -918,7 +925,7 @@
// 鍒ゆ柇鏀惰棌
if (!StringUtil.isNullOrEmpty(uid)) {
CollectionGoodsV2 collectionGoods = collectionGoodsV2Service.findByUidAndAuctionId(Long.parseLong(uid),
- Long.parseLong(id));
+ Long.parseLong(id), Constant.SOURCE_TYPE_TAOBAO);
data.put("collected", collectionGoods != null ? true : false);
} else
data.put("collected", false);
@@ -1185,6 +1192,7 @@
// 鑾峰彇娴忚璁板綍
@RequestMapping(value = "getscanhistory", method = RequestMethod.POST)
public void getScanHistory(AcceptData acceptData, String uid, int page, PrintWriter out) {
+
if (page < 0) {
out.print(JsonUtil.loadFalseResult(1, "page涓嶅皬浜�0"));
return;
@@ -1196,49 +1204,61 @@
out.print(JsonUtil.loadFalseResult(1, "涓嶅瓨鍦ㄨ绯荤粺"));
return;
}
- List<ScanHistoryV2> list = scanHistoryV2Service.getScanHistoryByDeviceOrUid(
- StringUtil.isNullOrEmpty(uid) ? null : Long.parseLong(uid), acceptData.getDevice(), page, 20);
- long count = scanHistoryV2Service.getCountByDeviceOrUid(
- StringUtil.isNullOrEmpty(uid) ? null : Long.parseLong(uid), acceptData.getDevice());
- JSONObject data = new JSONObject();
- data.put("count", count);
- JSONArray array = new JSONArray();
+ try {
- GsonBuilder gsonBuilder = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder());
- gsonBuilder.excludeFieldsWithoutExposeAnnotation();
- gsonBuilder.registerTypeAdapter(Date.class, new JsonSerializer<Date>() {
- @Override
- public JsonElement serialize(Date value, Type theType, JsonSerializationContext context) {
- if (value == null) {
- return new JsonPrimitive("");
- } else {
- return new JsonPrimitive(value.getTime() + "");
+ List<ScanHistoryV2> list = scanHistoryV2Service.getScanHistoryByDeviceOrUid(
+ StringUtil.isNullOrEmpty(uid) ? null : Long.parseLong(uid), acceptData.getDevice(), page, 20,
+ Constant.SOURCE_TYPE_TAOBAO);
+ long count = scanHistoryV2Service.getCountByDeviceOrUid(
+ StringUtil.isNullOrEmpty(uid) ? null : Long.parseLong(uid), acceptData.getDevice(),
+ Constant.SOURCE_TYPE_TAOBAO);
+
+ JSONObject data = new JSONObject();
+ data.put("count", count);
+ JSONArray array = new JSONArray();
+
+ GsonBuilder gsonBuilder = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder());
+ gsonBuilder.excludeFieldsWithoutExposeAnnotation();
+ gsonBuilder.registerTypeAdapter(Date.class, new JsonSerializer<Date>() {
+ @Override
+ public JsonElement serialize(Date value, Type theType, JsonSerializationContext context) {
+ if (value == null) {
+ return new JsonPrimitive("");
+ } else {
+ return new JsonPrimitive(value.getTime() + "");
+ }
+ }
+ });
+
+ Gson gson = gsonBuilder.create();
+
+ if (list != null) {
+ BigDecimal proportion = manageService.getFanLiRate();
+ for (ScanHistoryV2 sh : list) {
+ TaoBaoGoodsBrief goods = TaoBaoUtil.convert(sh.getCommonGoods());
+ goods.setId(sh.getId());
+ TaoBaoGoodsBriefExtra extra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(goods, proportion.toString(), "");
+ extra.setCreatetime(sh.getCreateTime());
+ array.add(gson.toJson(extra));
}
}
- });
-
- Gson gson = gsonBuilder.create();
-
- if (list != null) {
- BigDecimal proportion = manageService.getFanLiRate();
- for (ScanHistoryV2 sh : list) {
- TaoBaoGoodsBrief goods = TaoBaoUtil.convert(sh.getCommonGoods());
- goods.setId(sh.getId());
- TaoBaoGoodsBriefExtra extra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(goods, proportion.toString(), "");
- extra.setCreatetime(sh.getCreateTime());
- array.add(gson.toJson(extra));
- }
+ data.put("data", array);
+ out.print(JsonUtil.loadTrueResult(data));
+ return;
+ } catch (Exception e) {
+ LogHelper.errorDetailInfo(e);
+ JSONObject data = new JSONObject();
+ data.put("data", new JSONArray());
+ data.put("count", 0);
+ out.print(JsonUtil.loadTrueResult(data));
}
- data.put("data", array);
- out.print(JsonUtil.loadTrueResult(data));
- return;
+
}
@RequestMapping(value = "deletescanhistory", method = RequestMethod.POST)
public void deleteScanHistory(AcceptData acceptData, String type, String uid, String ids, PrintWriter out) {
BusinessSystem sys = businessSystemService.getBusinessSystem(acceptData.getPlatform(),
acceptData.getPackages());
-
if (sys == null) {
out.print(JsonUtil.loadFalseResult(1, "绯荤粺涓嶅瓨鍦�"));
return;
@@ -1288,16 +1308,16 @@
* 闃叉璇锋眰棰戠巼杩囬珮
*
*/
- if (Constant.IS_OUTNET) {
- String key = "linkParse-" + acceptData.getDevice() + "-" + id;
+ // if (Constant.IS_OUTNET) {
+ String key = "linkParse-" + acceptData.getDevice() + "-" + id;
- String value = redisManager.getCommonString(key);
- if (!StringUtil.isNullOrEmpty(value)) {
- out.print(JsonUtil.loadFalseResult(11, "璇锋眰棰戠巼闄愬埗"));
- return;
- }
- redisManager.cacheCommonString(key, "1", 5);// 5s闂撮殧
+ String value = redisManager.getCommonString(key);
+ if (!StringUtil.isNullOrEmpty(value)) {
+ out.print(JsonUtil.loadFalseResult(11, "璇锋眰棰戠巼闄愬埗"));
+ return;
}
+ redisManager.cacheCommonString(key, "1", 5);// 5s闂撮殧
+ // }
TaoBaoGoodsBrief goods = null;
try {
goods = redisManager.getTaoBaoGoodsBrief(Long.parseLong(id));
@@ -1331,7 +1351,67 @@
HttpServletRequest request, PrintWriter out) {
int pageSize = Constant.PAGE_SIZE;
JSONArray array = new JSONArray();
+
Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder()).create();
+ if (VersionUtil.greaterThan_1_5_70(acceptData.getPlatform(), acceptData.getVersion())) {
+ List<TaoBaoGoodsBrief> goodsList = homeRecommendGoodsService.listGoodsByPage(null, acceptData.getDevice(),
+ imei, idfa, page);
+
+ if (page < 4) {// 鍓嶄笁椤靛姞鍏ユ洿鏂�
+ try {
+ taoBaoGoodsUpdateService.addUpdateQueueAsync(goodsList);
+ } catch (Exception e) {
+ }
+ }
+
+ BigDecimal rate = hongBaoManageService.getFanLiRate();
+ for (TaoBaoGoodsBrief goods : goodsList) {
+ TaoBaoGoodsBriefExtra extra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(goods, rate + "", null);
+ if (page < 3)
+ extra.setRecommend(true);
+
+ try {
+ array.add(gson.toJson(extra));
+ } catch (Exception e) {
+ e.printStackTrace();
+ System.out.println(new Gson().toJson(goods));
+ }
+ }
+
+ if (page == 1) {
+ List<TLJBuyGoods> list = null;
+ try {
+ list = homeRecommendGoodsService.getZiGouLiJianHotGoods(acceptData.getDevice());
+ } catch (Exception e) {
+ }
+ if (list != null && list.size() > 0)
+ for (int i = list.size() - 1; i >= 0; i--) {
+ TLJBuyGoods goods = list.get(i);
+ TaoBaoGoodsBriefExtra extra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(goods.getGoods(),
+ TaoBaoConstant.OWN_BUY_WITHOUT_FANLI_RATE + "", null);
+ String hongBao = TaoBaoUtil.getGoodsHongBaoInfo(goods.getGoods(),
+ TaoBaoConstant.OWN_BUY_WITHOUT_FANLI_RATE);
+ TLJBuyHongBaoVO vo = new TLJBuyHongBaoVO();
+ vo.setLeft(goods.getLeftHongBaoCount());
+ vo.setMoney(hongBao);
+ vo.setTagName("浠樻绔嬪噺 " + hongBao);
+ vo.setTip("");
+ vo.setTotal(goods.getTotalHongBaoCount());
+ extra.setTljBuyHongBao(vo);
+ extra.setPictureTag(new ClientTextStyleVO("绔嬪噺TOP" + (i + 1), "#E5005C", "#FCE431", null));
+ extra.setRecommend(true);
+ extra.setSpreadMoney(vo.getTagName());
+ array.add(0, gson.toJson(extra));
+ }
+ }
+
+ JSONObject data = new JSONObject();
+ data.put("data", array);
+ data.put("count", 1000);
+ out.print(JsonUtil.loadTrueResult(data));
+ return;
+ }
+
// 浠庢帹鑽愭潵
if (page <= 1) {
array.clear();
@@ -1347,6 +1427,14 @@
List<TaoBaoGoodsBrief> gList = recommendGoodsDeleteHistoryService
.filterGoods(acceptData.getDevice(), result.getTaoBaoGoodsBriefs());
+
+ // filter
+ try {
+
+ gList = daTaoKeGoodsDetailService.filterTaoBaoGoods(gList);
+ } catch (Exception e) {
+ }
+
// 璁惧鎺ㄨ崘
if (gList != null)
for (TaoBaoGoodsBrief goods : gList) {
@@ -1357,6 +1445,7 @@
TaoBaoGoodsBriefExtra extra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(goods,
proportion.toString(), "");
+
extra.setRecommend(true);
goodsList.add(extra);
}
@@ -1625,7 +1714,7 @@
try {
// 鑾峰彇璁惧瀹氫箟鎬у埆
int deviceSex = deviceSexService.getDeviceSex(acceptData.getDevice());
-
+
// 1銆佷笓棰樻ā鍧�
JSONObject root = specialService.listCacheSpecialToIndex(acceptData, deviceSex);
@@ -2015,7 +2104,8 @@
if (uid == null) {
data.put("collected", false);
} else {
- CollectionGoodsV2 collectionGoods = collectionGoodsV2Service.findByUidAndAuctionId(uid, id);
+ CollectionGoodsV2 collectionGoods = collectionGoodsV2Service.findByUidAndAuctionId(uid, id,
+ Constant.SOURCE_TYPE_TAOBAO);
data.put("collected", collectionGoods != null ? true : false);
}
@@ -2054,15 +2144,15 @@
}
String token = "";
- if (!StringUtil.isNullOrEmpty(tb.getCouponLink())) {
+ if (!StringUtil.isNullOrEmpty(tb.getCouponLink())
+ && VersionUtil.greaterThan_1_5_60(acceptData.getPlatform(), acceptData.getVersion())) {
token = redisManager.getCommonTaoToken(tb.getAuctionId());
if (StringUtil.isNullOrEmpty(token)) {
token = TaoKeApiUtil.getTKToken(tb.getPictUrl(), tb.getTitle(), tb.getCouponLink());
redisManager.saveCommonTaoToken(tb.getAuctionId(), token);
}
}
- // 娴嬭瘯
- if (!Constant.IS_TEST)
+ if (!VersionUtil.greaterThan_1_5_60(acceptData.getPlatform(), acceptData.getVersion()))
tb.setCouponLinkTaoToken(token);
// 鏈嶅姟绔浆閾�
@@ -2080,8 +2170,9 @@
+ tb.getCouponEffectiveEndTime().replace("-", "."));
// 鍒哥殑鍙ｄ护
- // 娴嬭瘯
- if (!Constant.IS_TEST)
+ if (VersionUtil.greaterThan_1_5_60(acceptData.getPlatform(), acceptData.getVersion()))
+ couponInfo.put("couponToken", "");
+ else
couponInfo.put("couponToken", token);
goodsJson.put("couponInfo", couponInfo);
@@ -2154,7 +2245,7 @@
// 鏄惁鍔犲叆閫夊搧搴擄細 0鏈姞鍏� 1 宸插姞鍏�
boolean storageState = false;
if (uid != null) {
- storageState = userGoodsStorageService.isExistStorage(uid, id);
+ storageState = userGoodsStorageService.isExistStorage(uid, id, Constant.SOURCE_TYPE_TAOBAO);
}
data.put("storageState", storageState);
@@ -2164,7 +2255,6 @@
data.put("detailWebUrl", "http://apph5.yeshitv.com/apppage/goods_img.html?id=" + id);
String noRebateHelpLink = null;
-
// 鍟嗗搧閾炬帴
String h5Url = String.format("http://%s%s?id=%s&appType=flq", configService.getH5Host(),
@@ -2174,24 +2264,24 @@
} catch (Exception e) {
data.put("h5Url", h5Url);
}
-
+
// 鏄惁鏈夎繑鍒�
boolean fanliValid = true;
- //璧勯噾绫诲瀷 1-杩� 2-濂�
+ // 璧勯噾绫诲瀷 1-杩� 2-濂�
int moneyType = 1;
-
+
// 鎺ㄥ箍绾㈠寘
if (from != null && from.equals("taolijin")) {
// 璁＄畻鎺ㄥ箍绾㈠寘
- String warningRate = configTaoLiJinService.getValueByKey("warning_value");
+ String warningRate = configTaoLiJinService.getValueByKey("warning_value",null);
BigDecimal spreadMoney = TaoLiJinUtil.getSpreadMoney(warningRate, goods);
-
+
// 鎺ㄥ箍绾㈠寘 涓嶈兘灏忎簬1
if (spreadMoney.compareTo(new BigDecimal(1.1)) < 0) {
out.print(JsonUtil.loadFalseResult(2, "鍟嗗搧涓嶅瓨鍦�"));
return;
}
-
+
// 鏄惁涓烘柊鐢ㄦ埛
boolean isNewUser = userInfoExtraService.isNewUser(uid);
if (isNewUser) {
@@ -2201,13 +2291,13 @@
isNewUser = false;
}
}
-
+
SpreadHongBao spreadHongBao = new SpreadHongBao();
if (isNewUser) {
spreadHongBao.setMoney("1");
} else {
spreadHongBao.setMoney(spreadMoney.toString());
-
+
moneyType = 2;
fanliValid = false;
ClientTextStyleVO textStyleVO1 = new ClientTextStyleVO();
@@ -2222,40 +2312,70 @@
ClientTextStyleVO textStyleVO4 = new ClientTextStyleVO();
textStyleVO4.setContent("棰嗙孩鍖咃紒");
textStyleVO4.setColor("#F14242");
-
+
List<ClientTextStyleVO> listText = new ArrayList<ClientTextStyleVO>();
listText.add(textStyleVO1);
listText.add(textStyleVO2);
listText.add(textStyleVO3);
listText.add(textStyleVO4);
-
+
data.put("listTip", listText);
- }
- spreadHongBao.setTip("褰撴棩棰嗗彇锛屼袱澶╁唴浣跨敤锛岃繃鏃舵棤鏁�");
+ }
+ spreadHongBao.setTip("褰撴棩棰嗗彇锛屽綋鏃ュ唴浣跨敤锛岃繃鏈熷け鏁�");
goodsJson.put("spreadHongBao", spreadHongBao);
-
+
// 鐢ㄦ埛鍓╀綑鍙互娣樼ぜ閲戦獙璇�
UserMoneyExtra userMoneyExtra = userMoneyExtraService.selectByPrimaryKey(uid);
- if (userMoneyExtra == null || userMoneyExtra.getTlj() == null) {
+ if (userMoneyExtra == null || userMoneyExtra.getTlj() == null) {
data.put("userHongbao", new BigDecimal(0).setScale(2).toString());
} else {
data.put("userHongbao", userMoneyExtra.getTlj().setScale(2).toString());
}
-
- noRebateHelpLink = configTaoLiJinService.getValueByKey("share_goods_help_link");
+
+ noRebateHelpLink = configTaoLiJinService.getValueByKey("share_goods_help_link",null);
+
+ if (Constant.IS_TEST) {
+ fanliValid = true;
+ goodsJson.put("shareValid", false);
+ JSONObject tljNum = new JSONObject();
+ tljNum.put("percent", "80");
+ tljNum.put("num", "8825");
+ goodsJson.put("tljNum", tljNum);
+ }
+
+ } else if (from != null && from.equals("taolijin_buy")) {
+ noRebateHelpLink = configService.get("zigoulijian_nofanli_help");
+ // 鏌ヨ鍒嗕韩搴�
+ TLJBuyGoods buyGoods = tljBuyGoodsService.selectByAuctionIdAndDay(goods.getAuctionId(),
+ TimeUtil.getGernalTime(System.currentTimeMillis(), "yyyy-MM-dd"));
+ if (buyGoods == null) {
+ out.print(JsonUtil.loadFalseResult(2, "鑷喘绔嬪噺绾㈠寘杩囨湡"));
+ return;
+ }
+
+ fanliValid = true;
+ goodsJson.put("shareValid", false);
+ String tljHongBao = TaoBaoUtil.getGoodsHongBaoMoney(goods, new BigDecimal(70)).toString();
+ TLJBuyHongBaoVO vo = new TLJBuyHongBaoVO();
+ vo.setLeft(buyGoods.getLeftHongBaoCount());
+ vo.setMoney(tljHongBao);
+ vo.setTagName("浠樻绔嬪噺 楼" + tljHongBao);
+ vo.setTip("褰撴棩棰嗗彇锛屽綋鏃ュ唴浣跨敤锛岃繃鏈熷け鏁�");
+ vo.setTotal(buyGoods.getTotalHongBaoCount());
+ goodsJson.put("tljBuyHongBao", vo);
+ moneyType = 2;
}
-
+
goodsJson.put("moneyType", moneyType);
goodsJson.put("fanliValid", fanliValid);
data.put("goods", goodsJson);
-
+
if (!StringUtil.isNullOrEmpty(noRebateHelpLink)) {
data.put("noRebateHelpLink", noRebateHelpLink);
} else {
data.put("noRebateHelpLink", configService.get("no_rebate_help_link"));
}
-
-
+
// 鍙栨秷鍒嗕韩娲诲姩
// if (!StringUtil.isNullOrEmpty(uid)
// &&
@@ -2281,7 +2401,7 @@
public void run() {
// 娣诲姞娴忚璁板綍
try {
- scanHistoryV2Service.addScanHistory(uid, acceptData.getDevice(),goodsInfo);
+ scanHistoryV2Service.addScanHistory(uid, acceptData.getDevice(), goodsInfo);
} catch (Exception e) {
e.printStackTrace();
}
@@ -2347,119 +2467,83 @@
@RequestMapping(value = "getgoodsderivation", method = RequestMethod.POST)
public void getRecommendGoods(AcceptData acceptData, long id, PrintWriter out) {
- BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(),
- acceptData.getPackages());
- if (system == null) {
- out.print(JsonUtil.loadFalseResult(1, "绯荤粺涓嶅瓨鍦�"));
- return;
- }
-
- List<TaoBaoGoodsBrief> goodsList = TaoKeApiUtil.getRelationGoodsRecommend(id, 10);
- // 鍒濆鍖�
- if (goodsList == null) {
- goodsList = new ArrayList<TaoBaoGoodsBrief>();
- }
-
- BigDecimal proportion = manageService.getFanLiRate();
-
- List<TaoBaoGoodsBriefExtra> listExtra = new ArrayList<TaoBaoGoodsBriefExtra>();
-
- TaoKeAppInfo app = new TaoKeAppInfo();
- app.setAppKey(TaoBaoConstant.TAOBAO_AUTH_APPKEY);
- app.setAppSecret(TaoBaoConstant.TAOBAO_AUTH_APPSECRET);
- app.setAdzoneId(TaoBaoConstant.TAOBAO_SPECIAL_PID_DEFAULT.split("_")[3]);
- app.setPid(TaoBaoConstant.TAOBAO_SPECIAL_PID_DEFAULT);
-
- List<Long> ids = new ArrayList<>();
- for (TaoBaoGoodsBrief goods : goodsList)
- ids.add(goods.getAuctionId());
-
try {
- goodsList = TaoKeApiUtil.getBatchGoodsInfo(ids);
- } catch (TaoKeApiException e1) {
- e1.printStackTrace();
- } catch (TaobaoGoodsDownException e1) {
- e1.printStackTrace();
+
+ List<TaoBaoGoodsBrief> goodsList = TaoKeApiUtil.getRelationGoodsRecommend(id, 10);
+ // 鍒濆鍖�
+ if (goodsList == null) {
+ goodsList = new ArrayList<TaoBaoGoodsBrief>();
+ }
+
+ BigDecimal proportion = manageService.getFanLiRate();
+
+ List<TaoBaoGoodsBriefExtra> listExtra = new ArrayList<TaoBaoGoodsBriefExtra>();
+
+ TaoKeAppInfo app = new TaoKeAppInfo();
+ app.setAppKey(TaoBaoConstant.TAOBAO_AUTH_APPKEY);
+ app.setAppSecret(TaoBaoConstant.TAOBAO_AUTH_APPSECRET);
+ app.setAdzoneId(TaoBaoConstant.TAOBAO_SPECIAL_PID_DEFAULT.split("_")[3]);
+ app.setPid(TaoBaoConstant.TAOBAO_SPECIAL_PID_DEFAULT);
+
+ List<Long> ids = new ArrayList<>();
+ for (TaoBaoGoodsBrief goods : goodsList)
+ ids.add(goods.getAuctionId());
+
+ try {
+ goodsList = TaoKeApiUtil.getBatchGoodsInfo(ids);
+ } catch (TaoKeApiException e1) {
+ e1.printStackTrace();
+ } catch (TaobaoGoodsDownException e1) {
+ e1.printStackTrace();
+ }
+
+ if (goodsList != null && goodsList.size() > 0)
+ goodsList.parallelStream().forEach(goods -> {
+ if (goods != null) {
+ // 鑾峰彇璇︽儏
+ TaoBaoGoodsBrief taoBaoGoodsBrief = null;
+ try {
+ taoBaoGoodsBrief = taoBaoGoodsCacheUtil.getCommonTaoBaoGoodsInfo(goods.getAuctionId());
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+
+ if (taoBaoGoodsBrief == null) {
+ TaoBaoGoodsBrief newGoods = TaoKeApiUtil.specialConvertCoupon(goods.getAuctionId(), app);
+ goods.setCouponInfo(newGoods.getCouponInfo());
+ goods.setCouponLink(newGoods.getCouponLink());
+ goods.setTkRate(newGoods.getTkRate());
+ taoBaoGoodsBrief = goods;
+ }
+
+ if (taoBaoGoodsBrief != null) {
+ listExtra.add(
+ TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion.toString(), ""));
+ }
+ }
+ });
+
+ List<TaoBaoGoodsBrief> listQuality = new ArrayList<TaoBaoGoodsBrief>();
+
+ // 鍙栧伓鏁颁釜鏁版嵁
+ if (listExtra.size() % 2 != 0) {
+ listExtra.remove(listExtra.size() - 1);
+ }
+
+ if (listQuality.size() % 2 != 0) {
+ listQuality.remove(listQuality.size() - 1);
+ }
+
+ JSONObject data = new JSONObject();
+ data.put("listQuality", JsonUtil.getApiCommonGson().toJson(listExtra));
+ data.put("listGuess", JsonUtil.getApiCommonGson().toJson(listQuality));
+ out.print(JsonUtil.loadTrueResult(data));
+ } catch (Exception e) {
+ JSONObject data = new JSONObject();
+ data.put("listQuality", new JSONArray());
+ data.put("listGuess", new JSONArray());
+ out.print(JsonUtil.loadTrueResult(data));
}
-
- if (goodsList != null && goodsList.size() > 0)
- goodsList.parallelStream().forEach(goods -> {
-
- // 鑾峰彇璇︽儏
- TaoBaoGoodsBrief taoBaoGoodsBrief = null;
- try {
- taoBaoGoodsBrief = taoBaoGoodsCacheUtil.getCommonTaoBaoGoodsInfo(goods.getAuctionId());
- } catch (Exception e) {
- e.printStackTrace();
- }
-
- if (taoBaoGoodsBrief == null) {
- TaoBaoGoodsBrief newGoods = TaoKeApiUtil.specialConvertCoupon(goods.getAuctionId(), app);
- goods.setCouponInfo(newGoods.getCouponInfo());
- goods.setCouponLink(newGoods.getCouponLink());
- goods.setTkRate(newGoods.getTkRate());
- taoBaoGoodsBrief = goods;
- }
-
- if (taoBaoGoodsBrief != null) {
- listExtra.add(TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion.toString(), ""));
- }
-
- });
-
- List<TaoBaoGoodsBrief> listQuality = new ArrayList<TaoBaoGoodsBrief>();
- // 鍒犻櫎鎺ㄨ崘
- //
- // try {
- // List<QualityFactory> listRecommend =
- // qualityGoodsService.recommendByAuctionId(id);
- //
- // if (listRecommend != null && listRecommend.size() > 1) {
- // for (QualityFactory quality : listRecommend) {
- //
- // TaoBaoGoodsBrief taoBaoGoodsBrief = quality.getTaoBaoGoodsBrief();
- // if (taoBaoGoodsBrief == null) {
- // continue;
- // }
- //
- // int biz30day = taoBaoGoodsBrief.getBiz30day();
- // if (biz30day >= 10000) {
- // double sales = biz30day;
- // String salesCountMidea = String.format("%.1f", sales / 10000);
- // taoBaoGoodsBrief.setSalesCount(salesCountMidea + "涓�");
- // } else {
- // taoBaoGoodsBrief.setSalesCount(biz30day + "");
- // }
- //
- // // 鏀瑰彉鍥剧墖灏哄
- // String pictUrl = taoBaoGoodsBrief.getPictUrl();
- // if (!StringUtil.isNullOrEmpty(pictUrl) &&
- // !pictUrl.contains("320x320")) {
- // taoBaoGoodsBrief.setPictUrl(TbImgUtil.getTBSize320Img(pictUrl));
- // }
- //
- // listQuality.add(TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief,
- // proportion.toString(), null));
- // }
- // }
- // } catch (Exception e2) {
- // e2.printStackTrace();
- // }
-
- // 鍙栧伓鏁颁釜鏁版嵁
- if (listExtra.size() % 2 != 0) {
- listExtra.remove(listExtra.size() - 1);
- }
-
- if (listQuality.size() % 2 != 0) {
- listQuality.remove(listQuality.size() - 1);
- }
-
- JSONObject data = new JSONObject();
- data.put("listQuality", JsonUtil.getApiCommonGson().toJson(listExtra));
- data.put("listGuess", JsonUtil.getApiCommonGson().toJson(listQuality));
-
- out.print(JsonUtil.loadTrueResult(data));
}
/**
@@ -2479,7 +2563,7 @@
}
try {
-
+
List<Special> list = new ArrayList<Special>();
// 涓撻娲诲姩
String specialCard = "special_activities";
@@ -2490,24 +2574,23 @@
if (listSpecial != null) {
list.addAll(listSpecial);
}
-
+
for (int i = 0; i < list.size(); i++) {
Special special = list.get(i);
-
+
JumpDetailV2 jumpDetail = special.getJumpDetail();
if (jumpDetail != null) {
jumpDetail.setNeedLogin(special.isJumpLogin());
special.setJumpDetail(jumpDetail);
}
-
-
+
String name = special.getName();
if (StringUtil.isNullOrEmpty(name)) {
continue;
}
-
+
// 鏄惁闇�瑕佸脊鍑烘
- if (name.equals("璐︽埛绛夌骇鐗规潈")) {
+ if (name.equals("璐︽埛绛夌骇鐗规潈")) {
if (!VersionUtil.greaterThan_1_5_60(acceptData.getPlatform(), acceptData.getVersion())) {
list.remove(i);
i--;
--
Gitblit v1.8.0