From 573c491b4a1ba60e12a5678a01c1546c0077c1ee Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 30 七月 2019 09:07:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/RecommendController.java | 386 +++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 290 insertions(+), 96 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 e38d553..cf035d1 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
@@ -41,6 +41,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.UserMoneyExtra;
import com.yeshi.fanli.entity.common.ImageInfo;
import com.yeshi.fanli.entity.common.JumpDetail;
import com.yeshi.fanli.entity.common.JumpDetailV2;
@@ -52,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;
@@ -80,7 +82,9 @@
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;
import com.yeshi.fanli.service.inter.homemodule.SuperSpecialService;
import com.yeshi.fanli.service.inter.homemodule.SwiperPictureService;
@@ -90,16 +94,22 @@
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;
import com.yeshi.fanli.service.inter.taobao.dataoke.DaTaoKeGoodsDetailService;
+import com.yeshi.fanli.service.inter.tlj.ConfigTaoLiJinService;
+import com.yeshi.fanli.service.inter.tlj.DeviceTaoLiJinRecordService;
+import com.yeshi.fanli.service.inter.tlj.UserTaoLiJinOriginService;
+import com.yeshi.fanli.service.inter.tlj.UserTaoLiJinRecordService;
import com.yeshi.fanli.service.inter.user.ShamUserService;
import com.yeshi.fanli.service.inter.user.TBPidService;
import com.yeshi.fanli.service.inter.user.UserCustomSettingsService;
import com.yeshi.fanli.service.inter.user.UserGoodsStorageService;
import com.yeshi.fanli.service.inter.user.UserInfoExtraService;
import com.yeshi.fanli.service.inter.user.UserInfoService;
+import com.yeshi.fanli.service.inter.user.UserMoneyExtraService;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.MoneyBigDecimalUtil;
import com.yeshi.fanli.util.RedisManager;
@@ -113,7 +123,10 @@
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.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;
import net.sf.json.JSONArray;
@@ -232,7 +245,31 @@
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) {
@@ -1258,16 +1295,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));
@@ -1302,6 +1339,54 @@
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);
+
+ 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 = homeRecommendGoodsService.getZiGouLiJianHotGoods(acceptData.getDevice());
+ 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();
@@ -1317,6 +1402,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) {
@@ -1327,6 +1420,7 @@
TaoBaoGoodsBriefExtra extra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(goods,
proportion.toString(), "");
+
extra.setRecommend(true);
goodsList.add(extra);
}
@@ -1593,8 +1687,11 @@
@RequestMapping(value = "getRecommendIndex")
public void getRecommendIndex(AcceptData acceptData, Long uid, PrintWriter out) {
try {
+ // 鑾峰彇璁惧瀹氫箟鎬у埆
+ int deviceSex = deviceSexService.getDeviceSex(acceptData.getDevice());
+
// 1銆佷笓棰樻ā鍧�
- JSONObject root = specialService.listCacheSpecialToIndex(acceptData);
+ JSONObject root = specialService.listCacheSpecialToIndex(acceptData, deviceSex);
// 2銆侀《閮ㄨ疆鎾浘
List<SwiperPicture> topPicList = getSwiperByCard("index_top");
@@ -1798,13 +1895,9 @@
* @param out
*/
@RequestMapping(value = "getgoodsinfo", method = RequestMethod.POST)
- public void getGoodsInfo(AcceptData acceptData, String id, String uid, String from, PrintWriter out) {
+ public void getGoodsInfo(AcceptData acceptData, Long id, Long uid, String from, PrintWriter out) {
- if ("0".equalsIgnoreCase(uid)) {
- uid = "";
- }
-
- if (StringUtil.isNullOrEmpty(id)) {
+ if (id == null) {
out.print(JsonUtil.loadFalseResult(1, "璇蜂笂浼爄d"));
return;
}
@@ -1848,14 +1941,14 @@
if (!convertInServer) {
try {
- goods = taoBaoGoodsCacheUtil.getCommonTaoBaoGoodsInfo(Long.parseLong(id));
+ goods = taoBaoGoodsCacheUtil.getCommonTaoBaoGoodsInfo(id);
if (goods == null) {
TaoKeAppInfo app = new TaoKeAppInfo();
app.setAppKey(TaoBaoConstant.TAOBAO_COMMON_APPKEY);
app.setAppSecret(TaoBaoConstant.TAOBAO_COMMON_APPSECRET);
app.setPid(TaoBaoConstant.TAOBAO_COMMON_PID);
app.setAdzoneId(TaoBaoConstant.TAOBAO_COMMON_PID.split("_")[3]);
- goods = TaoKeApiUtil.searchGoodsDetail(Long.parseLong(id), app);
+ goods = TaoKeApiUtil.searchGoodsDetail(id, app);
final TaoBaoGoodsBrief finalGoods = goods;
if (goods != null) {
ThreadUtil.run(new Runnable() {
@@ -1870,7 +1963,7 @@
// 鍟嗗搧涓嬫灦
ThreadUtil.run(new Runnable() {
public void run() {
- taoBaoGoodsUpdateService.offlineTaoBaoGoods(Long.parseLong(id));
+ taoBaoGoodsUpdateService.offlineTaoBaoGoods(id);
}
});
@@ -1887,7 +1980,7 @@
app.setPid(clientPid);
try {
- goods = TaoKeApiUtil.searchGoodsDetail(Long.parseLong(id), app);
+ goods = TaoKeApiUtil.searchGoodsDetail(id, app);
if (goods != null) {
ticket.put("clickUrl", goods.getAuctionUrl());
// 娴嬭瘯浣跨敤
@@ -1909,7 +2002,7 @@
} catch (TaobaoGoodsDownException e) {
ThreadUtil.run(new Runnable() {
public void run() {
- taoBaoGoodsUpdateService.offlineTaoBaoGoods(Long.parseLong(id));
+ taoBaoGoodsUpdateService.offlineTaoBaoGoods(id);
}
});
}
@@ -1983,11 +2076,10 @@
}
// 鍒ゆ柇鏀惰棌
- if (StringUtil.isNullOrEmpty(uid)) {
+ if (uid == null) {
data.put("collected", false);
} else {
- CollectionGoodsV2 collectionGoods = collectionGoodsV2Service.findByUidAndAuctionId(Long.parseLong(uid),
- Long.parseLong(id));
+ CollectionGoodsV2 collectionGoods = collectionGoodsV2Service.findByUidAndAuctionId(uid, id);
data.put("collected", collectionGoods != null ? true : false);
}
@@ -2026,14 +2118,16 @@
}
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);
}
}
- tb.setCouponLinkTaoToken(token);
+ if (!VersionUtil.greaterThan_1_5_60(acceptData.getPlatform(), acceptData.getVersion()))
+ tb.setCouponLinkTaoToken(token);
// 鏈嶅姟绔浆閾�
// if (convertInServer &&
@@ -2049,7 +2143,11 @@
couponInfo.put("couponTime", "浣跨敤鏈熼檺锛�" + tb.getCouponEffectiveStartTime().replace("-", ".") + "-"
+ tb.getCouponEffectiveEndTime().replace("-", "."));
// 鍒哥殑鍙ｄ护
- couponInfo.put("couponToken", token);
+
+ if (VersionUtil.greaterThan_1_5_60(acceptData.getPlatform(), acceptData.getVersion()))
+ couponInfo.put("couponToken", "");
+ else
+ couponInfo.put("couponToken", token);
goodsJson.put("couponInfo", couponInfo);
if (tb.getBiz30day() >= 1000) {
@@ -2115,26 +2213,22 @@
goodsJson.put("shopInfo", tbShopInfo);
}
- goodsJson.put("fanliValid", true);// 鏄惁鏈夎繑鍒�
-
// 鍒嗕韩璺緞
String shareUrl = String.format("%s?id=" + tb.getAuctionId(), Constant.systemCommonConfig.getAppShareInfoUrl());
// 鏄惁鍔犲叆閫夊搧搴擄細 0鏈姞鍏� 1 宸插姞鍏�
boolean storageState = false;
- if (uid != null && uid.trim().length() > 0) {
- storageState = userGoodsStorageService.isExistStorage(Long.parseLong(uid), Long.parseLong(id));
+ if (uid != null) {
+ storageState = userGoodsStorageService.isExistStorage(uid, id);
}
data.put("storageState", storageState);
data.put("shareUrl", shareUrl);
-
- data.put("goods", goodsJson);
data.put("shareUsers", listShareUser);
data.put("couponUsers", listCouponUser);
data.put("detailWebUrl", "http://apph5.yeshitv.com/apppage/goods_img.html?id=" + id);
- data.put("noRebateHelpLink", configService.get("no_rebate_help_link"));
+ String noRebateHelpLink = null;
// 鍟嗗搧閾炬帴
String h5Url = String.format("http://%s%s?id=%s&appType=flq", configService.getH5Host(),
@@ -2143,6 +2237,117 @@
data.put("h5Url", HttpUtil.getShortLink(h5Url));
} catch (Exception e) {
data.put("h5Url", h5Url);
+ }
+
+ // 鏄惁鏈夎繑鍒�
+ boolean fanliValid = true;
+ // 璧勯噾绫诲瀷 1-杩� 2-濂�
+ int moneyType = 1;
+
+ // 鎺ㄥ箍绾㈠寘
+ if (from != null && from.equals("taolijin")) {
+ // 璁＄畻鎺ㄥ箍绾㈠寘
+ String warningRate = configTaoLiJinService.getValueByKey("warning_value");
+ 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) {
+ // 鍒ゅ畾涓鸿�佺敤鎴凤細 鏂颁汉鍙浣跨敤浜嗘柊浜虹孩鍖咃紝涔熷氨鏄偅1鍧楅挶锛岄偅涔堬紝浠栫湅鍒扮殑鍒嗕韩鐖嗘涓殑鍟嗗搧-灏卞彧鑳藉垎浜��
+ long countRecord = userTaoLiJinRecordService.countRecordByUid(uid);
+ if (countRecord > 0) {
+ isNewUser = false;
+ }
+ }
+
+ SpreadHongBao spreadHongBao = new SpreadHongBao();
+ if (isNewUser) {
+ spreadHongBao.setMoney("1");
+ } else {
+ spreadHongBao.setMoney(spreadMoney.toString());
+
+ moneyType = 2;
+ fanliValid = false;
+ ClientTextStyleVO textStyleVO1 = new ClientTextStyleVO();
+ textStyleVO1.setContent("鍒嗕韩");
+ textStyleVO1.setColor("#666666");
+ ClientTextStyleVO textStyleVO2 = new ClientTextStyleVO();
+ textStyleVO2.setContent("璧氬閲�");
+ textStyleVO2.setColor("#F14242");
+ ClientTextStyleVO textStyleVO3 = new ClientTextStyleVO();
+ textStyleVO3.setContent("锛屽ソ鍙�");
+ textStyleVO3.setColor("#666666");
+ 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("褰撴棩棰嗗彇锛屽綋鏃ュ唴浣跨敤锛岃繃鏈熷け鏁�");
+ goodsJson.put("spreadHongBao", spreadHongBao);
+
+ // 鐢ㄦ埛鍓╀綑鍙互娣樼ぜ閲戦獙璇�
+ UserMoneyExtra userMoneyExtra = userMoneyExtraService.selectByPrimaryKey(uid);
+ 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");
+
+ 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"));
}
// 鍙栨秷鍒嗕韩娲诲姩
@@ -2165,15 +2370,12 @@
out.print(JsonUtil.loadTrueResult(data));
- final String tempUid = uid;
final TaoBaoGoodsBrief goodsInfo = tb;
ThreadUtil.run(new Runnable() {
public void run() {
// 娣诲姞娴忚璁板綍
try {
- scanHistoryV2Service.addScanHistory(
- StringUtil.isNullOrEmpty(tempUid) ? null : Long.parseLong(tempUid), acceptData.getDevice(),
- goodsInfo);
+ scanHistoryV2Service.addScanHistory(uid, acceptData.getDevice(), goodsInfo);
} catch (Exception e) {
e.printStackTrace();
}
@@ -2276,67 +2478,30 @@
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();
+ }
- // 鑾峰彇璇︽儏
- 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(), ""));
+ }
}
-
- 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) {
@@ -2371,18 +2536,47 @@
}
try {
+
+ List<Special> list = new ArrayList<Special>();
// 涓撻娲诲姩
String specialCard = "special_activities";
List<Special> listSpecial = specialService.listPageBySystemAndCard(0, Integer.MAX_VALUE, specialCard,
system.getId());
- if (listSpecial == null) {
- listSpecial = new ArrayList<Special>();
+ 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 (!VersionUtil.greaterThan_1_5_60(acceptData.getPlatform(), acceptData.getVersion())) {
+ list.remove(i);
+ i--;
+ } else {
+ if (uid != null) {
+ special.setElastic(userTaoLiJinOriginService.hasRankHongBao(uid));
+ }
+ }
+ }
}
JSONObject root = new JSONObject();
- root.put("special", JsonUtil.getApiCommonGson().toJson(listSpecial));
+ root.put("special", JsonUtil.getApiCommonGson().toJson(list));
out.print(JsonUtil.loadTrueResult(root));
} catch (Exception e) {
--
Gitblit v1.8.0