From 265e7fc98dfa0ac37bcc95a105e42546ffb3d094 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期三, 15 五月 2019 12:11:17 +0800
Subject: [PATCH] 品牌店铺优选查询大淘客商品
---
fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java | 61 +++++++++++++++++++++++-------
1 files changed, 46 insertions(+), 15 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 ffbf96e..a815927 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
@@ -55,6 +55,7 @@
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBriefExtra;
import com.yeshi.fanli.entity.taobao.TaoBaoSearchResult;
+import com.yeshi.fanli.entity.taobao.TaoBaoShop;
import com.yeshi.fanli.entity.taobao.TaoBaoShopInfo;
import com.yeshi.fanli.entity.taobao.TaoBaoUnionConfig;
import com.yeshi.fanli.entity.taobao.TaoKeAppInfo;
@@ -89,6 +90,7 @@
import com.yeshi.fanli.service.inter.order.OrderService;
import com.yeshi.fanli.service.inter.order.ShareGoodsActivityOrderService;
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.user.ShamUserService;
import com.yeshi.fanli.service.inter.user.TBPidService;
@@ -218,6 +220,9 @@
@Resource
private TaoBaoGoodsCacheUtil taoBaoGoodsCacheUtil;
+
+ @Resource
+ private TaoBaoShopService taoBaoShopService;
@RequestMapping(value = "getHonestList")
public void getHonestList(AcceptData acceptData, PrintWriter out) {
@@ -1597,6 +1602,8 @@
if ("ios".equalsIgnoreCase(platform)) {
root.put("htmlLink", configService.get("index_html_link_ios"));
}
+
+ root.put("spikeGoods", getSpikeGoodsContent(acceptData));
out.print(JsonUtil.loadTrueResult(root));
} catch (Exception e) {
@@ -1643,15 +1650,7 @@
return swiperList;
}
- /**
- * 闄愭椂绉掓潃 1.5.3
- *
- * @param acceptData
- * @param out
- */
- @RequestMapping(value = "getSpikeGoods")
- public void getSpikeGoods(AcceptData acceptData, PrintWriter out) {
-
+ private JSONObject getSpikeGoodsContent(AcceptData acceptData) {
// 涓嬩竴娆″�掕鏃剁殑鏃堕棿
int type = qualityFlashSaleService.getNowType() + 1;
int hour = 0;
@@ -1728,10 +1727,31 @@
// 缂撳瓨鍗婁釜灏忔椂
redisManager.cacheCommonString(cachekey, array.toString(), 60 * 30);
}
-
+ Long endTime = nextTime.getTimeInMillis() - java.lang.System.currentTimeMillis();
+
JSONObject root = new JSONObject();
root.put("time", nextTime.getTimeInMillis());
+ root.put("endTime", endTime > 0? endTime : 0);
root.put("listgoods", array);
+
+ return root;
+ }
+
+ /**
+ * 闄愭椂绉掓潃 1.5.3
+ *
+ * @param acceptData
+ * @param out
+ */
+ @RequestMapping(value = "getSpikeGoods")
+ public void getSpikeGoods(AcceptData acceptData, PrintWriter out) {
+ JSONObject params = new JSONObject();
+ params.put("url", configService.get("spike_goods_link"));
+ JumpDetailV2 jumpDetail = jumpDetailV2Service.getByTypeCache("web");
+
+ JSONObject root = getSpikeGoodsContent(acceptData);
+ root.put("params", params);
+ root.put("jumpDetail", jumpDetail);
out.print(JsonUtil.loadTrueResult(root));
}
@@ -1911,9 +1931,11 @@
goodsJson.put("price", tb.getReservePrice().toString());
goodsJson.put("zkPrice", tb.getZkPrice().toString());
+
// 30澶╅攢閲�
goodsJson.put("saleCount", TaoBaoUtil.getSaleCount(tb.getBiz30day()));
-
+ goodsJson.put("salesCount", TaoBaoUtil.getSaleCount(tb.getBiz30day()));
+
// 鍒嗕韩璧�
BigDecimal shareMoney = taoBaoGoodsBriefService.getShareGoodsUserHongBao(tb);
data.put("shareMoney", "楼" + shareMoney);
@@ -2005,8 +2027,8 @@
goodsJson.put("hongBao", hongBao);
List<ClientTextStyleVO> labels = new ArrayList<>();
- labels.add(new ClientTextStyleVO("鏍囩娴嬭瘯鍐呭1", "#FF0000"));
- labels.add(new ClientTextStyleVO("鏍囩娴嬭瘯鍐呭2", "#00FF00"));
+ labels.add(new ClientTextStyleVO("鏍囩鍐呭", "#F14242"));
+ labels.add(new ClientTextStyleVO("鏍囩鍐呭", "#00FF00"));
goodsJson.put("labels", labels);
data.put("tbPidInfo", clientTBPid);
@@ -2037,8 +2059,17 @@
}
}
// 搴楅摵
- goodsJson.put("shopInfo", tbShopInfo);
- goodsJson.put("fanliValid", true);// 鏄惁鏈夎繑鍒�
+ if (("android".equalsIgnoreCase(acceptData.getPlatform()) && Integer.parseInt(acceptData.getVersion()) >= 40)
+ || ("ios".equalsIgnoreCase(acceptData.getPlatform())
+ && Integer.parseInt(acceptData.getVersion()) >= 49)) {
+ TaoBaoShop shop = taoBaoShopService.getTaoBaoShop(goods.getAuctionId(), goods.getSellerId());
+ if (shop != null)
+ goodsJson.put("shopInfo", shop);
+ } else {
+ goodsJson.put("shopInfo", tbShopInfo);
+ }
+
+ goodsJson.put("fanliValid",Math.random()>0.5? true:false);// 鏄惁鏈夎繑鍒�
// 鍒嗕韩璺緞
String shareUrl = String.format("%s?id=" + tb.getAuctionId(), Constant.systemCommonConfig.getAppShareInfoUrl());
--
Gitblit v1.8.0