From beee6afac3f7d1b7fa30f768df91cd55e6c6d2db Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 24 六月 2019 11:28:18 +0800
Subject: [PATCH] 增加汽车户外，增加拼多多常量
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/RecommendController.java | 61 +++++++++++++++++++++---------
1 files changed, 43 insertions(+), 18 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 7d51cff..994164a 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
@@ -80,6 +80,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.RecommendGoodsDeleteHistoryService;
import com.yeshi.fanli.service.inter.homemodule.SpecialService;
import com.yeshi.fanli.service.inter.homemodule.SuperSpecialService;
import com.yeshi.fanli.service.inter.homemodule.SwiperPictureService;
@@ -100,6 +101,7 @@
import com.yeshi.fanli.service.inter.user.UserInfoExtraService;
import com.yeshi.fanli.service.inter.user.UserInfoService;
import com.yeshi.fanli.util.Constant;
+import com.yeshi.fanli.util.MoneyBigDecimalUtil;
import com.yeshi.fanli.util.RedisManager;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.TaoBaoConstant;
@@ -228,6 +230,9 @@
@Resource
private DaTaoKeGoodsDetailService daTaoKeGoodsDetailService;
+
+ @Resource
+ private RecommendGoodsDeleteHistoryService recommendGoodsDeleteHistoryService;
@RequestMapping(value = "getHonestList")
public void getHonestList(AcceptData acceptData, PrintWriter out) {
@@ -1308,14 +1313,24 @@
if (result != null && result.getTaoBaoGoodsBriefs() != null) {
// 绛涢��
- List<TaoBaoGoodsBrief> goodsList = new ArrayList<>();
+ List<TaoBaoGoodsBriefExtra> goodsList = new ArrayList<>();
- for (TaoBaoGoodsBrief goods : result.getTaoBaoGoodsBriefs()) {
- if (!StringUtil.isNullOrEmpty(goods.getCouponInfo()) && goods.getCouponAmount() != null
- && goods.getCouponAmount().compareTo(new BigDecimal("5")) >= 0
- && goods.getBiz30day() > 1000 && !StringUtil.isNullOrEmpty(goods.getPictUrlWhite()))
- goodsList.add(goods);
- }
+ List<TaoBaoGoodsBrief> gList = recommendGoodsDeleteHistoryService
+ .filterGoods(acceptData.getDevice(), result.getTaoBaoGoodsBriefs());
+ // 璁惧鎺ㄨ崘
+ if (gList != null)
+ for (TaoBaoGoodsBrief goods : gList) {
+ if (!StringUtil.isNullOrEmpty(goods.getCouponInfo()) && goods.getCouponAmount() != null
+ && goods.getCouponAmount().compareTo(new BigDecimal("5")) >= 0
+ && goods.getBiz30day() > 1000
+ && !StringUtil.isNullOrEmpty(goods.getPictUrlWhite())) {
+
+ TaoBaoGoodsBriefExtra extra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(goods,
+ proportion.toString(), "");
+ extra.setRecommend(true);
+ goodsList.add(extra);
+ }
+ }
try {
monitorService.addClientAPIMonitor(MonitorFactory.createClientAPI(request, 0,
(int) (java.lang.System.currentTimeMillis() - startTime), "鎺ㄨ崘鏁伴噺:" + goodsList.size()));
@@ -1325,8 +1340,8 @@
Collections.shuffle(goodsList);
goodsList = goodsList.size() > 20 ? goodsList.subList(0, 20) : goodsList;
- for (TaoBaoGoodsBrief goods : goodsList) {
- array.add(gson.toJson(TaoBaoUtil.getTaoBaoGoodsBriefExtra(goods, proportion.toString(), "")));
+ for (TaoBaoGoodsBriefExtra goods : goodsList) {
+ array.add(gson.toJson(goods));
}
} else {
try {
@@ -1941,15 +1956,18 @@
finalImgList.add(0, tb.getPictUrlWhite());
// 澶ф窐瀹㈠晢鍝佽繃婊�
- goods = daTaoKeGoodsDetailService.filterTaoBaoGoods(goods);
-
+ try {
+ goods = daTaoKeGoodsDetailService.filterTaoBaoGoods(goods);
+ } catch (Exception e) {
+ LogHelper.errorDetailInfo(e);
+ }
JSONObject goodsJson = new JSONObject();
goodsJson.put("auctionId", tb.getAuctionId());
goodsJson.put("imgList", finalImgList);
goodsJson.put("title", tb.getTitle());
goodsJson.put("userType", tb.getUserType() == 1 ? 2 : 1);
goodsJson.put("price", tb.getReservePrice().toString());
- goodsJson.put("zkPrice", tb.getZkPrice().toString());
+ goodsJson.put("zkPrice", MoneyBigDecimalUtil.getWithNoZera(tb.getZkPrice()).toString());
// 30澶╅攢閲�
goodsJson.put("saleCount", TaoBaoUtil.getSaleCount(tb.getBiz30day()));
@@ -1995,10 +2013,12 @@
String hongBao = null;
// 鑾峰彇鍒镐俊鎭�
- if (!StringUtil.isNullOrEmpty(tb.getCouponInfo())) {
+ if (!StringUtil.isNullOrEmpty(tb.getCouponInfo()) && tb.getCouponAmount() != null
+ && tb.getCouponAmount().compareTo(new BigDecimal(0)) > 0 && tb.getCouponEffectiveStartTime() != null
+ && tb.getCouponEffectiveEndTime() != null) {
BigDecimal quanPrice = TaoBaoUtil.getAfterUseCouplePrice(tb);
JSONObject couponInfo = new JSONObject();
- couponInfo.put("couponPrice", quanPrice.toString());
+ couponInfo.put("couponPrice", MoneyBigDecimalUtil.getWithNoZera(quanPrice).toString());
if (from != null && from.equals("miandan")) {
// 鍏嶅崟鍟嗗搧
@@ -2013,7 +2033,9 @@
redisManager.saveCommonTaoToken(tb.getAuctionId(), token);
}
}
- tb.setCouponLinkTaoToken(token);
+ // 娴嬭瘯
+ if (!Constant.IS_TEST)
+ tb.setCouponLinkTaoToken(token);
// 鏈嶅姟绔浆閾�
// if (convertInServer &&
@@ -2025,11 +2047,14 @@
// tb.getAuctionId() + ""));
// }
- couponInfo.put("couponAmount", NumberUtil.subZeroAndDot(tb.getCouponAmount().toString()));
+ couponInfo.put("couponAmount", MoneyBigDecimalUtil.getWithNoZera(tb.getCouponAmount()).toString());
couponInfo.put("couponTime", "浣跨敤鏈熼檺锛�" + tb.getCouponEffectiveStartTime().replace("-", ".") + "-"
+ tb.getCouponEffectiveEndTime().replace("-", "."));
// 鍒哥殑鍙ｄ护
- couponInfo.put("couponToken", token);
+
+ // 娴嬭瘯
+ if (!Constant.IS_TEST)
+ couponInfo.put("couponToken", token);
goodsJson.put("couponInfo", couponInfo);
if (tb.getBiz30day() >= 1000) {
@@ -2254,7 +2279,7 @@
e1.printStackTrace();
}
- if (goodsList != null)
+ if (goodsList != null && goodsList.size() > 0)
goodsList.parallelStream().forEach(goods -> {
// 鑾峰彇璇︽儏
--
Gitblit v1.8.0